diff -Nru gnome-control-center-3.20.2/ChangeLog gnome-control-center-3.22.1/ChangeLog --- gnome-control-center-3.20.2/ChangeLog 2016-10-11 14:28:53.000000000 +0000 +++ gnome-control-center-3.22.1/ChangeLog 2016-10-11 13:53:25.000000000 +0000 @@ -1,25 +1,54 @@ # Generated by Makefile. Do not edit. -commit 0222f411405e76a033526358014200499d38ee1b +commit e87e0361b117f055ace2aa47cdddd0dc62a852f9 Author: Rui Matos -Date: Tue Oct 11 16:25:40 2016 +0200 +Date: Tue Oct 11 14:09:35 2016 +0200 - 3.20.2 + 3.22.1 - NEWS | 26 ++++++++++++++++++++++++++ + NEWS | 12 ++++++++++++ configure.ac | 2 +- - 2 files changed, 27 insertions(+), 1 deletion(-) + 2 files changed, 13 insertions(+), 1 deletion(-) -commit c4d42afb0c8e9da1c12999da8d7a42c9dd01da6e +commit acbbf70c7462f832dd206a58188378a833e5f522 Author: gogo -Date: Mon Oct 10 18:17:45 2016 +0000 +Date: Mon Oct 10 18:15:42 2016 +0000 Update Croatian translation - po/hr.po | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + po/hr.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit deb7dcbeed9219732aabb5770b244b6a7bb1ce45 +Author: Bastien Nocera +Date: Wed Oct 5 16:56:42 2016 +0200 + + keyboard: Fix capture of Alt+PrintScreen shortcuts + + Alt+PrintScreen gives you Alt+SysRq. Repair the key value to match user + expectations instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=772050 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit d1698a628292cb8340799a28b75dd59a74fe7118 +Author: Rui Matos +Date: Mon Oct 10 16:45:07 2016 +0200 + + display: Ensure the preselected resolution matches the current mode + + We need to check the interlaced flag too when preselecting the current + resolution in the combo box since we now have separate entries for + interlaced and regular resolutions of the same size. + + https://bugzilla.gnome.org/show_bug.cgi?id=772708 -commit 493479bf6ee0c2e6fbc21592f5c31f25daef4b96 + panels/display/cc-display-panel.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c06f2698135f3e76f2c305f15bcd20d833c78233 Author: Marius Gedminas Date: Mon Oct 10 11:40:47 2016 -0400 @@ -30,37 +59,115 @@ po/lt.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -commit 66a6f1d4725793333df3020d352088a39606799f +commit ee4738803baa2f8cc84c4d025af22bb4fca76088 +Author: Rūdolfs Mazurs +Date: Sun Oct 9 19:27:36 2016 +0300 + + Update Latvian translation + + po/lv.po | 430 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 191 insertions(+), 239 deletions(-) + +commit 32bc28913b4a50990c611fa129aea20490a1f06a Author: gogo -Date: Sun Oct 9 14:37:35 2016 +0000 +Date: Sun Oct 9 15:06:59 2016 +0000 Update Croatian translation - po/hr.po | 9199 ++++++++++++++++++++++++++++++++++++++++++++------------------ - 1 file changed, 6495 insertions(+), 2704 deletions(-) + po/hr.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) -commit f1e77f023726f40463ab6debac9a1c0796975857 -Author: Bastien Nocera -Date: Fri Sep 23 13:36:20 2016 +0200 +commit 3215190e2e2516abf19964b9724940e78ddef52e +Author: gogo +Date: Sun Oct 9 14:35:48 2016 +0000 - display: Fix possible crash on startup - - If no items are added to the GVariantBuilder, g_variant_builder_close() - would throw a critical, g_variant_builder_end() would throw a - segmentation fault. - - As this can only happen when there are no items added to the output_ids - hashtable, this should only happen if there are no displays known to - libgnome-desktop (and therefore mutter). - - See https://bugzilla.redhat.com/show_bug.cgi?id=1280075 - - https://bugzilla.gnome.org/show_bug.cgi?id=771875 + Update Croatian translation + + po/hr.po | 4184 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 2207 insertions(+), 1977 deletions(-) + +commit fa73f574b8219e214dc23cbb82a24353e2ae7820 +Author: Cheng-Chia Tseng +Date: Sun Oct 9 14:07:24 2016 +0000 + + Update Chinese (Taiwan) translation + + po/zh_TW.po | 747 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 401 insertions(+), 346 deletions(-) + +commit 4cd26abc6023b839a3df309cbb18972f3d9a4810 +Author: Andika Triwidada +Date: Wed Oct 5 21:16:18 2016 +0000 + + Updated Indonesian translation + + po/id.po | 418 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 204 insertions(+), 214 deletions(-) - panels/display/cc-display-panel.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) +commit 53c5e7488059cef13e83ce6eb3dbcdc95a35c732 +Author: Milo Casagrande +Date: Mon Oct 3 10:16:58 2016 +0000 + + Updated Italian translation + + po/it.po | 2090 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1189 insertions(+), 901 deletions(-) + +commit 5ced3153a6412379842e6a3c8a00e05d29c96148 +Author: Rafael Fontenelle +Date: Sat Oct 1 13:03:25 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 168 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 84 insertions(+), 84 deletions(-) + +commit d377562cc1734313bcac843b61f604a6cf1cbb84 +Author: Piotr Drąg +Date: Sun Sep 25 02:03:40 2016 +0200 + + Updated Polish translation + + po/pl.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a1bcbaba9ce7761a24b653126dee3cda89ae004f +Author: Piotr Drąg +Date: Sun Sep 25 01:54:10 2016 +0200 + + Updated Polish translation + + po/pl.po | 162 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 81 insertions(+), 81 deletions(-) + +commit 25e9dcb87c8392299cc5f230eeabcd876fcd89f8 +Author: gogo +Date: Sat Sep 24 10:16:35 2016 +0000 + + Updated Croatian translation + + po/hr.po | 8726 +++++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 6143 insertions(+), 2583 deletions(-) + +commit 961959251f47fbc916467c86f4f92554f2722aa9 +Author: Khaled Hosny +Date: Wed Sep 21 14:40:40 2016 +0200 + + Update Arabic translation -commit 201e696567cbbf9480e8fe862479416660770a72 + po/ar.po | 2180 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 1253 insertions(+), 927 deletions(-) + +commit f7e3590594b9c5ae144a2a97d4fb75160950287f +Author: Stas Solovey +Date: Tue Sep 20 19:16:42 2016 +0000 + + Updated Russian translation + + po/ru.po | 206 ++++++++++++++++++++++++++++----------------------------------- + 1 file changed, 90 insertions(+), 116 deletions(-) + +commit 77750c507615788d46ec66a25368fe4aa4a83966 Author: Marek Kasik Date: Tue Sep 20 12:29:09 2016 +0200 @@ -72,9 +179,30 @@ panels/printers/cc-printers-panel.c | 1 + 1 file changed, 1 insertion(+) -commit ed31adb4fc6984a4d1736438c9bce6219daa25d5 +commit 0947bd3615ab5b02c018c8de2aa53f4b27b1403b +Author: Kalev Lember +Date: Tue Sep 20 12:25:52 2016 +0200 + + Bump required GTK+ version + + https://bugzilla.gnome.org/show_bug.cgi?id=771696 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fd7cfe426fe02401226d75b90f6056afe15f718b +Author: Bastien Nocera +Date: Tue Sep 20 10:54:42 2016 +0200 + + 3.22.0 + + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit f4232a2e68c4530c00b044432fa6377a22782952 Author: Michael Catanzaro -Date: Fri Sep 16 19:47:23 2016 -0500 +Date: Fri Sep 16 19:35:44 2016 -0500 power: Fix wifi device state when opening power panel @@ -83,196 +211,4729 @@ only subscribed to changes, so we don't check the wifi state until it's toggled on or off after the panel has been opened the first time. - Alternate patch for gnome-3-20 branch. - https://bugzilla.gnome.org/show_bug.cgi?id=771564 panels/power/cc-power-panel.c | 1 + 1 file changed, 1 insertion(+) -commit 601164dec82300e1d0ef7ef9b82eba0ec05bd5d3 -Author: Michael Catanzaro -Date: Fri Sep 9 21:38:46 2016 -0500 +commit 4033a3dbca5bef880b0694c0cdad0ccd465b3e4a +Author: Bastien Nocera +Date: Fri Sep 16 17:36:02 2016 +0200 - power: Fix hiding wi-fi, mobile broadband toggles + power: Fix "automatic suspend" label not taking batteries into account - We check with NetworkManager whether a wireless device exists to decide - whether or not to display these toggles. NetworkManager says no, we hide - the toggles, then we call gtk_widget_show_all() and undo our work. Sad! - Actually pressing the toggles triggers the check again, and causes both - listbox rows to shockingly disappear. + Whether or not we have batteries was computed after we updated the + label. - This fix is not needed on the master branch because, since the port to - libnm 1.2, the check is now scheduled on the main loop, to run after - this function completes, inadvertantly fixing this bug. - - https://bugzilla.gnome.org/show_bug.cgi?id=771148 + https://bugzilla.gnome.org/show_bug.cgi?id=771532 - panels/power/cc-power-panel.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + panels/power/cc-power-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 2b911465c7f97ebdfe3e9e8a938cbb2c51a8f6be +commit 1abacd29706716edee2dd9b368ca75861ed5389d Author: Bastien Nocera -Date: Mon Aug 29 11:46:53 2016 +0200 +Date: Fri Sep 16 17:33:56 2016 +0200 - privacy: Fix quoting of distro name and privacy URL + power: Warn if automatic suspend timeouts are negative - Unquote the distribution name and the privacy policy url in - the Problem Reporting dialogue, as those can be shell-quoted (the format - used by /etc/os-release is "shell-compatible"). + They should probably have been unsigned integers, but they're not, so + warn if they are. The rest of the code handles negative values as if + they were 0. - https://bugzilla.gnome.org/show_bug.cgi?id=770260 + https://bugzilla.gnome.org/show_bug.cgi?id=771542 - panels/privacy/cc-privacy-panel.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) + panels/power/cc-power-panel.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) -commit 96d0ba4540e9a72bd72e29ce84e93debd170eff4 -Author: Matej Urbančič -Date: Fri Aug 26 22:58:37 2016 +0200 +commit cc4e1349e9e01b98d544d5808dd30266145204bb +Author: Bastien Nocera +Date: Fri Sep 16 17:31:53 2016 +0200 - Updated Slovenian translation + power: Simplify update_automatic_suspend_label() + + By replacing the magic 0 by its meaning ("never") as explained in the + gnome-settings-daemon GSettings schemas. + + https://bugzilla.gnome.org/show_bug.cgi?id=771542 - po/sl.po | 2697 +++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 1592 insertions(+), 1105 deletions(-) + panels/power/cc-power-panel.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) -commit 075893a2db799b14bfb79ee49d6b2974d1d816fd -Author: Sveinn í Felli -Date: Fri Aug 12 14:25:25 2016 +0000 +commit 7dfc6a6c23ef62e37b96207eff6626917bbe68f6 +Author: Bastien Nocera +Date: Fri Sep 16 17:01:36 2016 +0200 - Updated Icelandic translation + network: Fix application of the default gateway + + Now that we ensured that only the first address has a gateway entry, + read it and apply it. + + See https://bugzilla.gnome.org/show_bug.cgi?id=765969 + + https://bugzilla.gnome.org/show_bug.cgi?id=771515 - po/is.po | 1914 +++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 1082 insertions(+), 832 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) -commit 9264a9574173bc9d65963b85c285aaa949bc3e6c -Author: Zeeshan Ali (Khattak) -Date: Mon May 30 21:30:38 2016 +0100 +commit d28ffc99029d52f89c8b449b51992a0f9741abeb +Author: Bastien Nocera +Date: Fri Sep 16 16:57:10 2016 +0200 - privacy: Update for PermissionStore DBus API changes + network: Fix gateway entry visibility - As xdg-app has been renamed to Flatpak, the permission store's bus name - and interface name have been changes as well. + From https://bugzilla.gnome.org/show_bug.cgi?id=765969 as explained by + Dan Winship: + " + libnm-util/libnm-glib had a buggy data model, which nm-connection-editor + (and then gnome-control-center) copied, in which each manually-configured + IP address has an associated gateway address. In reality, NM always just + took the first non-empty gateway value from the address array, and + completely ignored any other gateway values. + libnm represents this more accurately, by having a single gateway + value which is separate from the address array. Ideally, the editors should + show it this way as well (eg, like nmtui does). Failing that, it would + be nice to at least make it so that only the first row in the address + table can have a non-empty gateway value. + " + + We went for the second option, only showing a gateway entry for the + first address in the list. - https://bugzilla.gnome.org/show_bug.cgi?id=766603 + This isn't related to route-specific gateway addresses. + + https://bugzilla.gnome.org/show_bug.cgi?id=765969 - panels/privacy/cc-privacy-panel.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 31 +++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) -commit f62ad5d0aaaf90c46337654e0660ca8318cc22f6 -Author: Zeeshan Ali (Khattak) -Date: Wed Apr 13 17:13:33 2016 +0100 +commit ab2b13cacd1e076541e425d879659dcd245820ba +Author: Bastien Nocera +Date: Fri Sep 16 16:51:14 2016 +0200 - privacy: React to changes in permissions store + network: Fix compilation warnings - Currently if control-center is already running with privacy panel in - foreground and user authorizes a new application to gain access to - location information from gnome-shell dialog, this change doesn't get - reflected in the privacy panel to user until they exit privacy panel. + Those come from the fixes made in commits 981c354 and 7f601cf. - This change fixes this by reacting to changes to permissions store. + https://bugzilla.gnome.org/show_bug.cgi?id=771538 + + panels/network/connection-editor/ce-page-ip4.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit da7be92093be4be359b33fd0dd3788c41ff89e4e +Author: Bastien Nocera +Date: Fri Sep 16 16:50:15 2016 +0200 + + network: Fix warning when opening IPv4 connection editor - https://bugzilla.gnome.org/show_bug.cgi?id=765006 + https://bugzilla.gnome.org/show_bug.cgi?id=771515 - panels/privacy/cc-privacy-panel.c | 110 ++++++++++++++++++++++++++++---------- - 1 file changed, 81 insertions(+), 29 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 165e3486d7d916fdd54bff6c621796364be9f098 -Author: Christian Kirbach -Date: Tue Jul 12 21:06:33 2016 +0000 +commit da59f06d7e455751d85da010f345a64a4e664d21 +Author: Inaki Larranaga Murgoitio +Date: Mon Sep 19 18:43:11 2016 +0200 - Updated German translation + Update Basque language - po/de.po | 354 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 177 insertions(+), 177 deletions(-) + po/eu.po | 2405 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1331 insertions(+), 1074 deletions(-) -commit 178d169d1f7edd20d0955200be728284a31741ef -Author: Dušan Kazik -Date: Sat Jul 9 07:39:08 2016 +0000 +commit 73d66b52356538185f0e17a4b756a851bdc5f7b6 +Author: Alexandre Franke +Date: Mon Sep 19 09:45:04 2016 +0000 - Updated Slovak translation + Updated French translation - po/sk.po | 358 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 179 insertions(+), 179 deletions(-) + po/fr.po | 207 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 114 insertions(+), 93 deletions(-) -commit a7801217d174553b9e6e023ea9d5e9cd92d8d068 -Author: Piotr Drąg -Date: Mon Jul 4 03:30:37 2016 +0200 +commit c3cd738bab1898ad7f8dd30ee1cb8fb89bc74141 +Author: David King +Date: Sun Sep 18 12:59:44 2016 +0200 - Updated Polish translation + Update British English translation - po/pl.po | 204 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 102 insertions(+), 102 deletions(-) + po/en_GB.po | 392 ++++++++++++++---------------------------------------------- + 1 file changed, 93 insertions(+), 299 deletions(-) -commit 8b224edf64352f71157c363686e2832a9bf6f5f6 -Author: Ondrej Holy -Date: Mon Mar 7 13:54:55 2016 +0100 +commit 0bd06ea88de66bcf055ff63c825eb8c3810b4402 +Author: Ask Hjorth Larsen +Date: Sat Sep 17 16:02:55 2016 +0200 - user-accounts: Fix missing records in the history dialog + Updated Danish translation + + po/da.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 47a24a09dfff97e72a15c0aeb0739e300925eb9f +Author: Tom Tryfonidis +Date: Fri Sep 16 11:50:58 2016 +0000 + + Updated Greek translation + + po/el.po | 2216 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1247 insertions(+), 969 deletions(-) + +commit 4b103b78d97e63229bf88a0548ed0afda604a678 +Author: Anders Jonsson +Date: Thu Sep 15 22:03:32 2016 +0000 + + Updated Swedish translation + + po/sv.po | 2223 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1252 insertions(+), 971 deletions(-) + +commit 2dd17aa84038c1dd5c55bdbc92af16169985b9fa +Author: Daniel Korostil +Date: Thu Sep 15 21:25:10 2016 +0300 + + Updated Ukrainian translation + + po/uk.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9d4b755ca256f8228f9a8b845ad7bb6eb2010c5b +Author: Daniel Korostil +Date: Thu Sep 15 21:22:52 2016 +0300 + + Updated Ukrainian translation + + po/uk.po | 2289 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 1317 insertions(+), 972 deletions(-) + +commit 67ee3533a8353d5a61bec29829e60c17fdee97f1 +Author: Stas Solovey +Date: Thu Sep 15 10:00:58 2016 +0000 + + Updated Russian translation + + po/ru.po | 2221 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1267 insertions(+), 954 deletions(-) + +commit 8cfa46bddfbdb3238910d49ee0dd017fc6429df1 +Author: Daniel Mustieles +Date: Wed Sep 14 20:41:48 2016 +0200 + + Updated Spanish translation + + po/es.po | 252 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 132 insertions(+), 120 deletions(-) + +commit 981c354ebb0536c869ef68a1671366332d25e5c4 +Author: Bastien Nocera +Date: Wed Sep 14 17:14:33 2016 +0200 + + network: Fix crash entering IPv4 routes - "Session Ended" record may miss if "Session Started" isn't in the - same week, which is caused by a wrong order of conditions. + The wrong destructor was used for a GPtrArray of NMIPRoute. - https://bugzilla.gnome.org/show_bug.cgi?id=762346 + See https://bugzilla.gnome.org/show_bug.cgi?id=771251 + See https://bugzilla.gnome.org/show_bug.cgi?id=771432 - panels/user-accounts/um-history-dialog.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit eadf4867385884cf2b453b490839702bdda50b01 -Author: Andika Triwidada -Date: Sun Jun 26 09:26:08 2016 +0000 +commit 7f601cfed4eb4a07d2a480b1b8ec89391925b7e8 +Author: Bastien Nocera +Date: Wed Sep 14 17:13:39 2016 +0200 - Updated Indonesian translation + network: Fix crash entering IPv4 Gateway + + The wrong destructor was used for a GPtrArray of NMIPAddress. + + https://bugzilla.gnome.org/show_bug.cgi?id=771432 - po/id.po | 2180 +++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 1165 insertions(+), 1015 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 8ca7aca07d7e9794439b4000a5a937e4f1b49877 -Author: Dan Williams -Date: Fri Jun 3 11:47:07 2016 -0500 +commit 7ba7c450d6a17fc81d5bae41a7998eaef755a67f +Author: Arash Mousavi +Date: Tue Sep 13 18:04:09 2016 +0430 - network: fix some SSID escaping issues + [l10n] update Persian translations + + po/fa.po | 2136 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1198 insertions(+), 938 deletions(-) + +commit 894784547b13f4cafd60361eb8c5878c2c7ebef0 +Author: Bastien Nocera +Date: Tue Sep 13 12:23:39 2016 +0200 + + 3.21.92 + + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 30 insertions(+), 1 deletion(-) + +commit 1ff213fd18fac566ff1001972a7d17a8c9854298 +Author: Bastien Nocera +Date: Tue Sep 13 12:34:13 2016 +0200 + + datetime: Fix timezone-gfx test with builddir != srcdir + + panels/datetime/Makefile.am | 2 +- + panels/datetime/test-timezone-gfx.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ca47ff295a1e45598068201633aa2bd0d8fd5b29 +Author: Bastien Nocera +Date: Tue Sep 13 11:45:20 2016 +0200 + + network: Fix crash when changing IPv4 DNS - nm_utils_escape_ssid() should only be used for debugging purposes, - but was used in one place for UI display and another place - for doing actual AP comparison. Instead, the comparison should - just operate on the SSID bytes, and the UI display should use - nm_utils_ssid_to_utf8() which tries to interpret non-ASCII - characters for better display. + The dns_servers GStrv was not NULL-terminated because we forgot to + append a NULL item to the GPtrArray that we used to construct it. - https://bugzilla.gnome.org/show_bug.cgi?id=767205 - https://bugzilla.redhat.com/show_bug.cgi?id=1336714 + https://bugzilla.gnome.org/show_bug.cgi?id=771251 - panels/network/net-device-wifi.c | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) + panels/network/connection-editor/ce-page-ip4.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) -commit 0bbbc8a8890878fdf262b87a70d9e97c79eb81f9 -Author: Reinout van Schouwen -Date: Wed Jun 1 23:15:55 2016 +0200 +commit 6168126a0382cc55a95d8e3e97e383b00cf69f2d +Author: Ask Hjorth Larsen +Date: Tue Sep 13 01:55:10 2016 +0200 - Updated Dutch translation by Justin van Steijn, Reinout van Schouwen + Updated Danish translation - po/nl.po | 5042 ++++++++++++-------------------------------------------------- - 1 file changed, 934 insertions(+), 4108 deletions(-) + po/da.po | 78 +++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 50 insertions(+), 28 deletions(-) -commit e060fcf05b5fb972cb14c950d66a13a6559c3696 -Author: Milo Casagrande -Date: Sun May 29 13:26:11 2016 +0000 +commit 2b7cb0a7db95a24a87164204e792417ff6383c67 +Author: Aurimas Černius +Date: Mon Sep 12 20:55:42 2016 +0300 - Updated Italian translation + Updated Lithuanian translation - po/it.po | 252 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 126 insertions(+), 126 deletions(-) + po/lt.po | 398 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 180 insertions(+), 218 deletions(-) + +commit 6129a6ac68806ca5de96bb7640848759954f3e0a +Author: Jiri Grönroos +Date: Mon Sep 12 17:32:57 2016 +0000 + + Updated Finnish translation + + po/fi.po | 51 ++++++++++++++++++++++++++++----------------------- + 1 file changed, 28 insertions(+), 23 deletions(-) + +commit 8b9815e5923a16c4dd99cf4f993bb4b5a0aeba7b +Author: Jordi Mas +Date: Sun Sep 11 09:51:22 2016 +0200 + + Update Catalan translation + + po/ca.po | 228 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 124 insertions(+), 104 deletions(-) + +commit c68786a417eb1b9d710ee8499fcc610c7be9d007 +Author: Мирослав Николић +Date: Sun Sep 11 09:15:54 2016 +0200 + + Updated Serbian translation + + po/sr.po | 263 +++++++++++++++++++++++---------------------------------- + po/sr@latin.po | 263 +++++++++++++++++++++++---------------------------------- + 2 files changed, 216 insertions(+), 310 deletions(-) + +commit 395bfe83fbde70bae79d3a9f75985dcbfa1d79a3 +Author: Yosef Or Boczko +Date: Sat Sep 10 22:45:41 2016 +0300 + + Updated Hebrew translation + + po/he.po | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 24f8f1d6300d0791c02885930b146840b4b039fa +Author: Balázs Meskó +Date: Sat Sep 10 19:21:25 2016 +0000 + + Updated Hungarian translation + + po/hu.po | 166 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 94 insertions(+), 72 deletions(-) + +commit f53674fc5ea10ec8a5d6885e1de49cedf841c82e +Author: Changwoo Ryu +Date: Sat Sep 10 18:17:16 2016 +0000 + + Updated Korean translation + + po/ko.po | 111 ++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 75 insertions(+), 36 deletions(-) + +commit cda0e273bdebe03e775b4b21f59f84cd69656233 +Author: Dušan Kazik +Date: Sat Sep 10 14:47:07 2016 +0000 + + Updated Slovak translation + + po/sk.po | 211 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 116 insertions(+), 95 deletions(-) + +commit 59e102e49d2fd46a3819e1a1543e5e52de8c4e82 +Author: Akom Chotiphantawanon +Date: Sat Sep 10 15:46:06 2016 +0700 + + Updated Thai translation + + po/th.po | 81 +++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 50 insertions(+), 31 deletions(-) + +commit e1b636f8ff53af64da2997aa772b37b64862ab51 +Author: Trần Ngọc Quân +Date: Sat Sep 10 07:52:14 2016 +0700 + + Updated Vietnamese translation + + Signed-off-by: Trần Ngọc Quân + + po/vi.po | 49 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 29 insertions(+), 20 deletions(-) + +commit fa9ea59ae4e3f9688b3b6d70864169eaf3b4a027 +Author: Michael Catanzaro +Date: Fri Sep 9 19:28:22 2016 -0500 + + common: fix parallel build race + + panels/common/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fe2376f5122c1165f11ba378fb8cd1d73284064e +Author: Fran Dieguez +Date: Sat Sep 10 01:06:50 2016 +0200 + + Updated Galician translations + + po/gl.po | 102 +++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 67 insertions(+), 35 deletions(-) + +commit 78e32affefa3796f5184070709bd29414b3c1557 +Author: Mario Blättermann +Date: Fri Sep 9 18:35:50 2016 +0000 + + Updated German translation + + po/de.po | 212 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 115 insertions(+), 97 deletions(-) + +commit 9bcaa2dececb333113740a9c798bea082358ee23 +Author: Baurzhan Muftakhidinov +Date: Fri Sep 9 16:13:46 2016 +0000 + + Updated Kazakh translation + + po/kk.po | 82 ++++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 52 insertions(+), 30 deletions(-) + +commit 8b3f5b1eadb60b4eb29ac29e22ff46b0613d6189 +Author: Piotr Drąg +Date: Fri Sep 9 18:13:05 2016 +0200 + + Updated Polish translation + + po/pl.po | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +commit 510d9804319436278cd3ce3c24908b5f83538589 +Author: Bastien Nocera +Date: Fri Sep 9 16:34:25 2016 +0200 + + keyboard: Fix shortcut label in RTL languages + + https://bugzilla.gnome.org/show_bug.cgi?id=771110 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1ef60c7f06fc0761faea6014c00789ad2b7e89ae +Author: Bastien Nocera +Date: Thu Sep 8 23:12:18 2016 +0200 + + keyboard: Fix typo in comment + + https://bugzilla.gnome.org/show_bug.cgi?id=771124 + + panels/keyboard/cc-keyboard-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fcd2953a0c1a2558f2d97658ad216ea12844167b +Author: Rafael Fontenelle +Date: Fri Sep 9 14:50:32 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 51 ++++++++++++++++++++++++++++----------------------- + 1 file changed, 28 insertions(+), 23 deletions(-) + +commit c5081aa3585047f39ae545aef3df04d3eb9ffd3c +Author: Fabio Tomat +Date: Fri Sep 9 14:44:41 2016 +0000 + + Updated Friulian translation + + po/fur.po | 80 ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 51 insertions(+), 29 deletions(-) + +commit 3742a1c1b2569b25456828f02940d6e1560b7005 +Author: Marek Černocký +Date: Fri Sep 9 16:28:45 2016 +0200 + + Updated Czech translation + + po/cs.po | 165 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 95 insertions(+), 70 deletions(-) + +commit 8aae1f1973924b7b839abd72b036a5ca7b251007 +Author: Yosef Or Boczko +Date: Fri Sep 9 12:49:45 2016 +0300 + + Mark another string as translatable + + panels/keyboard/shortcut-editor.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b98e4071740ad13a39dc963b376c33a55f32f57b +Author: Yosef Or Boczko +Date: Fri Sep 9 12:36:20 2016 +0300 + + Updated Hebrew translation + + po/he.po | 209 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 113 insertions(+), 96 deletions(-) + +commit 3d868c088800ca9049d5f7efb38c5115ccc53a84 +Author: Yosef Or Boczko +Date: Fri Sep 9 12:36:03 2016 +0300 + + Mark some strings as translatable + + panels/keyboard/shortcut-editor.ui | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4a6ad9b98c507b0ac9f16c6ce63189f90ac90c73 +Author: Akom Chotiphantawanon +Date: Fri Sep 9 15:40:22 2016 +0700 + + Updated Thai translation + + po/th.po | 2796 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1573 insertions(+), 1223 deletions(-) + +commit b1210be80726589ede7445fbd946d40948231cd6 +Author: Trần Ngọc Quân +Date: Fri Sep 9 08:00:53 2016 +0700 + + Updated Vietnamese translation + + Signed-off-by: Trần Ngọc Quân + + po/vi.po | 66 +++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 40 insertions(+), 26 deletions(-) + +commit 70ac6b170f98f48e41d144abc17a29e3de9bf940 +Author: Jiri Grönroos +Date: Thu Sep 8 17:28:55 2016 +0000 + + Updated Finnish translation + + po/fi.po | 72 ++++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 45 insertions(+), 27 deletions(-) + +commit b48eb6a49d450695a3a9a40b48b8dcec9887bf74 +Author: Rafael Fontenelle +Date: Thu Sep 8 16:11:37 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 163 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 86 insertions(+), 77 deletions(-) + +commit f956dd4d9dc91b47c206b1994f7cfc9f4995729f +Author: Piotr Drąg +Date: Thu Sep 8 17:54:07 2016 +0200 + + Updated Polish translation + + po/pl.po | 57 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 30 insertions(+), 27 deletions(-) + +commit 57f9b636be35d6b10b642473c73314b3277e5b73 +Author: Rūdolfs Mazurs +Date: Thu Sep 8 18:43:42 2016 +0300 + + Update Latvian translation + + po/lv.po | 2265 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1297 insertions(+), 968 deletions(-) + +commit 45fb0a4feb28645c35b336eefb914fc8cb4eb320 +Author: Bastien Nocera +Date: Thu Sep 8 17:36:38 2016 +0200 + + keyboard: Normalise Shift and Tab in shortcuts + + https://bugzilla.gnome.org/show_bug.cgi?id=771058 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 789639004fad1c45db4f8a43b5d2349663ec0d46 +Author: Florian Müllner +Date: Thu Sep 8 14:49:03 2016 +0200 + + keyboard: Remove additional filtering of default mod mask + + The mask returned by gtk_accelerator_get_default_mod_mask() should + work without additional filtering, in particular when it is overly + restrictive - a lot of shortcuts use the Super modifier nowadays, + so stop filtering it out. + + https://bugzilla.gnome.org/show_bug.cgi?id=771058 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +commit 4beb7cefd4024ce09c70b61783b244e6d38aad59 +Author: Florian Müllner +Date: Thu Sep 8 14:31:34 2016 +0200 + + keyboard: Allow Tab in accels + + gtk_accelerator_valid() doesn't accept Tab as keyval, so using it to + check whether a shortcut is valid breaks commonly used shortcuts like + Alt+Tab. Unbreak those by adding a small wrapper that special-cases + Tab-with-modifiers. + + https://bugzilla.gnome.org/show_bug.cgi?id=771058 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 2 +- + panels/keyboard/keyboard-shortcuts.c | 11 +++++++++++ + panels/keyboard/keyboard-shortcuts.h | 3 +++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit 784d8f89ded2472202594e41d62eb4596189182c +Author: Bastien Nocera +Date: Thu Sep 8 14:00:46 2016 +0200 + + keyboard: Don't apply "Backspace" straight away + + Before, when pressing "Backspace" in the editing dialogue, the + keybinding would be changed straight away, *behind* the dialogue, and + the dialogue would still be expecting a new shortcut. + + Instead, we should make it behave like other shortcuts, which means + special handling empty shortcuts as valid ones. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 69258a91a617175676cf4b6f29101e2afad586a0 +Author: Bastien Nocera +Date: Thu Sep 8 14:00:07 2016 +0200 + + keyboard: Add helper to detect empty keybindings + + We'll use this shortly. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/keyboard-shortcuts.c | 12 ++++++++++++ + panels/keyboard/keyboard-shortcuts.h | 4 ++++ + 2 files changed, 16 insertions(+) + +commit 58b175f351da1187218628609750fb637047b753 +Author: Bastien Nocera +Date: Thu Sep 8 13:43:00 2016 +0200 + + keyboard: Fix grabs not working when showing the dialog + + We couldn't override gnome-shell's keybindings without having a working + grab, but the grab was only started when clicking the "edit" button when + editing a custom shortcut, or *after* receiving the first key press event. + + To fix that problem, we need to grab the keyboard once we've shown the + dialog itself, but not in the ->map vfunc, otherwise it will block the + dialog from showing up. We set up a short timeout instead. Hopefully + this isn't too fragile. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 42 +++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +commit 141441eb714614d4f2d507cb3d27a2613f6ea82c +Author: Bastien Nocera +Date: Thu Sep 8 13:42:12 2016 +0200 + + keyboard: Don't regrab the keyboard after an event + + It was already grabbed if we received the event, so no need to grab it + again. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 3 --- + 1 file changed, 3 deletions(-) + +commit 6c7746abb33b31648816c07ee99624f52836c3b1 +Author: Bastien Nocera +Date: Thu Sep 8 13:39:47 2016 +0200 + + keyboard: Don't rely on events to grab keyboard + + Rather than relying on us being in the middle of processing an event to + grab the keyboard, get the keyboard for the first seat of the display. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit b10a1ac9351c47afed103ef3d671a12c6f851dde +Author: Bastien Nocera +Date: Thu Sep 8 11:43:44 2016 +0200 + + keyboard: Don't grab the mouse pointer + + In a0a15588, we starting using a separate shortcut editor window, which + was doing its own capture instead of using the GtkCellRendererAccel. But + this started grabbing both keyboard and pointer, making it impossible to + cancel captures using the pointer. + + We now only grab keyboard keys, making the pointer usable again. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b32f58ed006b41539f2d4fae23b9ce584e87c8fd +Author: Bastien Nocera +Date: Thu Sep 8 11:42:16 2016 +0200 + + keyboard: Remove unused variable + + grab_device was added in a0a15588 but unused there or since. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 778395f61b3af6c8aed8b241e0bddce4e9ed459c +Author: Georges Basile Stavracas Neto +Date: Wed Aug 31 21:14:34 2016 -0300 + + shortcut-editor: show custom page while waiting for input + + While waiting for keyboard input, as per the new proposed mockup, + the shortcut editor dialog should show a custom page with an icon + that indicates the required action. The current code, however, does + not expose this new customized page. + + Fix that by adding this new page and controlling the time when it + shows and hides. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 11 +++++++++- + panels/keyboard/shortcut-editor.ui | 31 +++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+), 1 deletion(-) + +commit 9c4b27309d17ae324c4af05f7a0902d17cb94127 +Author: Georges Basile Stavracas Neto +Date: Wed Aug 31 20:55:42 2016 -0300 + + shortcut-editor: move widgets into a stack + + The stack will be used by the next patches to show + an call for action page. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/shortcut-editor.ui | 80 ++++++++++++++++++++++++-------------- + 1 file changed, 50 insertions(+), 30 deletions(-) + +commit cbff1e7b0ac86cd8d9c384d0579587b52b8f673c +Author: Georges Basile Stavracas Neto +Date: Wed Aug 31 20:44:28 2016 -0300 + + shortcut-editor: update reset button position and style + + The Reset button, according to the mockups, should be placed + at the right side (left on rtl) of the shortcut label. Also, + rather than a plain string, the button should use a symbolic + icon for 'edit-clear' action. + + This patch moves and updates the Reset button to match the + mockups. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/shortcut-editor.ui | 42 ++++++++++++++++++++++++++------------ + 1 file changed, 29 insertions(+), 13 deletions(-) + +commit c5cd32f797d91b1559fb55d2c3b6fe88a138397a +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 15:41:27 2016 -0300 + + shortcut-editor: use a different page to edit custom shortcuts + + When adding a new keyboard shortcut, in accordance to the mockups, + the dialog should present a new page calling for an action from the + user. + + This patch adds this page, and adapts the code to show it whenever + the user wants to change the shortcut. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 49 ++++++++++++++++---- + panels/keyboard/shortcut-editor.ui | 67 +++++++++++++++++++++++++-- + 2 files changed, 102 insertions(+), 14 deletions(-) + +commit a0001b14b5e21365fca32e01e2baea734171a0d9 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 15:39:08 2016 -0300 + + keyboard: add enter-new-shortcut asset + + This is a stub icon shown whenever we want to tell + the user to start typing the new shortcut. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/enter-keyboard-shortcut.svg | 245 ++++++++++++++++++++++++++++ + panels/keyboard/keyboard.gresource.xml | 1 + + 2 files changed, 246 insertions(+) + +commit faef0353f333043d634509a5b1b2c7d467d4bed9 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 13:18:16 2016 -0300 + + shortcuts: remove bottom label + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/gnome-keyboard-panel.ui | 22 ---------------------- + 1 file changed, 22 deletions(-) + +commit 4db1337664d73bb5e2e726795f7c5bd98abe9dd7 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 11:56:16 2016 -0300 + + shortcut-editor: hide editing dialog on Escape + + When editing a standard shortcut, the current code only + cancels the editing on Escape, but doesn't hide the + dialog. + + Fix that by properly handling the canceling of shortcut + editing and making sure we always hide the dialog on + cancel. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +commit 40ee2253856bf1eb727206210f39f397045d2ba2 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 11:43:43 2016 -0300 + + shortcut-editor: use states to handle headerbar mode + + Instead of manually handling every button in the headerbar + individually, using states to switch between modes. It's clearer + and easier to maintain. + + This patch adds the headerbar mode handling code, and updates + the current code to use it rather than by updating each individual + button manually. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 68 +++++++++++++++++---------- + 1 file changed, 43 insertions(+), 25 deletions(-) + +commit 472959657b2e68995c0e599f9a0dff0239903b72 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 11:42:09 2016 -0300 + + shortcut-editor: add 'Set' button + + The Set button will be used to update a standard + shortcut. + + This patch adds it to the headerbar. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 10 ++++++++++ + panels/keyboard/shortcut-editor.ui | 16 ++++++++++++++++ + 2 files changed, 26 insertions(+) + +commit 5637d573a6b16a1521639ce5b5551d0d23c9ed73 +Author: Georges Basile Stavracas Neto +Date: Tue Aug 30 10:38:24 2016 -0300 + + shortcut-editor: update header title message + + Instead of showing the shortcut description, show an + action-oriented title, according to the mockups. Precisely, + "Set Shortcut" for standard shortcuts and "Set Custom + Shortcut" for custom shortcuts. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 199ba172589f0ca69049e5ac0971adcfac442b24 +Author: Georges Basile Stavracas Neto +Date: Wed Aug 3 09:58:25 2016 -0300 + + keyboard: use a better icon to represent "Reset Shortcut" + + The current button to reset shortcuts is represented by the + 'x' icon, which induces the user to think this is a remove + button rather then a reset button. + + Fix that by using edit-clear-symbolic icon to represent the + reset action. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d8d85bae12075d0342a066f6759ab16fef4a4907 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 29 16:05:26 2016 -0300 + + keyboard: make Add button insensitive after editing + + When creating a new keyboard shortcut, the Add button gets + sensitive when all the fields are valid. If the user tries + to create a new shortcut right after closing the shortcut + editor dialog, the Add button is still sensitive even with + invalid custom fields. + + Fix that by making the Add button sensitive whenever we + finish editing the new custom shortcut. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit cf3ff886ca00edfa141ee78a4b60fedff730afb7 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 29 14:48:56 2016 -0300 + + keyboard: change standard shortcut top label + + Per feedback, the current call-to-action label isn't very clear + and is too long. + + Fix that by rewording the label. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4b5cc100e5098bc4409207ca69c5e14be196f0cd +Author: Bruce Cowan +Date: Thu Sep 8 11:20:36 2016 +0000 + + Updated British English translation + + po/en_GB.po | 5779 ++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 3299 insertions(+), 2480 deletions(-) + +commit 5606f54f420ca216dc34e3db3244499e4f9510a9 +Author: Alexander Shopov +Date: Thu Sep 8 06:18:29 2016 +0300 + + Update Bulgarian translation + + po/bg.po | 1936 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1076 insertions(+), 860 deletions(-) + +commit 444e9db1db4497556415ab2bdf5aa636eebed1e1 +Author: Fran Dieguez +Date: Thu Sep 8 00:19:35 2016 +0200 + + Updated Galician translations + + po/gl.po | 2172 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1209 insertions(+), 963 deletions(-) + +commit b39bc9360027267b88fa0b66ade08f6c83f10432 +Author: Georges Basile Stavracas Neto +Date: Wed Aug 31 22:20:01 2016 -0300 + + keyboard: fix list sizes with latest Gtk+ + + Gtk+ changed again the behavior of the scrolled window, + fixing the weird height issue but introducing a new issue + where the keyboard shortcut list doesn't expand horizontally + nor allocates the correct size vertically. + + Fortunately, this is easily solvable with the newly introduced + GtkScrolledWindow:propagate-natural-width and -height + properties. + + Fix the misbehavior by setting the new properties to sane + values. + + https://bugzilla.gnome.org/show_bug.cgi?id=769314 + + panels/keyboard/gnome-keyboard-panel.ui | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2d28634314c53f5ad1cd9277c319c7600a737883 +Author: Marek Černocký +Date: Wed Sep 7 10:00:44 2016 +0200 + + Updated Czech translation + + po/cs.po | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 789af820239c0ba5b339938e39a1d68b82dbd3a1 +Author: Trần Ngọc Quân +Date: Wed Sep 7 14:27:33 2016 +0700 + + Updated Vietnamese translation + + Signed-off-by: Trần Ngọc Quân + + po/vi.po | 2132 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1197 insertions(+), 935 deletions(-) + +commit 4f48934b50eaf8ad0bd4735f04d46725544b18c4 +Author: Felipe Borges +Date: Tue Sep 6 16:54:29 2016 +0200 + + user-accounts: Revert "Fix history dialog height" + + This reverts commit 77c26aa16292f6a4ad1fed1d9c40e96a9cff8823. + + Since the changes in GtkScrolledWindow on Bug 766569, this patch + is no longer necessary. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9ab20089274c53368b93b33ebee15629fc5801be +Author: Piotr Drąg +Date: Tue Sep 6 02:40:36 2016 +0200 + + Updated Polish translation + + po/pl.po | 116 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 58 insertions(+), 58 deletions(-) + +commit ecd7a2fcc9fb1635bba972a5b3446d1f4e4abde6 +Author: A S Alam +Date: Mon Sep 5 07:25:29 2016 -0500 + + updated Punjabi Translation + + po/pa.po | 2702 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1472 insertions(+), 1230 deletions(-) + +commit 580aa24d064e2b5915ec9615249f3182d6d550f5 +Author: Ask Hjorth Larsen +Date: Mon Sep 5 02:37:09 2016 +0200 + + Updated Danish translation + + po/da.po | 2192 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1227 insertions(+), 965 deletions(-) + +commit d5ee1222c367b5152329b47d2900cdfc2f45c22c +Author: Muhammet Kara +Date: Sun Sep 4 19:08:35 2016 +0000 + + Updated Turkish translation + + po/tr.po | 613 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 324 insertions(+), 289 deletions(-) + +commit a42e670a34262aac762575039f84fb3ff3a82fb5 +Author: Baurzhan Muftakhidinov +Date: Sun Sep 4 04:51:59 2016 +0000 + + Updated Kazakh translation + + po/kk.po | 139 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 66 insertions(+), 73 deletions(-) + +commit 2ee4c38e166d1c99ed809afea0d90464d8fc82d6 +Author: Changwoo Ryu +Date: Sat Sep 3 14:06:51 2016 +0000 + + Updated Korean translation + + po/ko.po | 1993 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1038 insertions(+), 955 deletions(-) + +commit 901cebec55a6ea7c5413346caae543a945c70486 +Author: Alain Lojewski +Date: Sat Sep 3 13:09:12 2016 +0000 + + Updated French translation + + po/fr.po | 234 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 90 insertions(+), 144 deletions(-) + +commit e79b0a2ad9888f303584c830d45a623bba2b039f +Author: Jiri Grönroos +Date: Fri Sep 2 23:06:50 2016 +0000 + + Updated Finnish translation + + po/fi.po | 96 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 48 insertions(+), 48 deletions(-) + +commit 5a9122473f059a0cc1da50af358a2d2ecd3b7641 +Author: Baurzhan Muftakhidinov +Date: Thu Sep 1 15:48:38 2016 +0000 + + Updated Kazakh translation + + po/kk.po | 1297 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 747 insertions(+), 550 deletions(-) + +commit a3c29a28ccd2ab2ee81efe2bb49d303e72680892 +Author: Fabio Tomat +Date: Wed Aug 31 21:41:04 2016 +0000 + + Updated Friulian translation + + po/fur.po | 146 ++++++++++++++++++++++++++------------------------------------ + 1 file changed, 60 insertions(+), 86 deletions(-) + +commit e8248689762593c3efd03da239303f1aceb1f81a +Author: Bastien Nocera +Date: Fri Jun 10 16:56:03 2016 +0200 + + network: Re-set the SSID when enabling the Hotspot + + Instead of expecting the hostname to stay the same. + + https://bugzilla.gnome.org/show_bug.cgi?id=705546 + + panels/network/net-device-wifi.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit bbdcaaa039b2ec747d307293715900de1cbe88a6 +Author: Rui Matos +Date: Mon Aug 29 19:29:05 2016 +0200 + + region: Avoid a crash on panel destruction + + GtkListBox might emit the row-selected signal while being destroyed + and our row-selected handler accesses widgets owned by GtkBuilder so, + depending on the order on which the builder destroys its objects, we + could crash on the signal handler when destroying the builder. + + Using g_signal_connect_object() avoids this issue by disconnecting us + before our finalize() runs. + + https://bugzilla.gnome.org/show_bug.cgi?id=770563 + + panels/region/cc-region-panel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2a6706fe4cae955591a2f160639c1e0b05b86c34 +Author: Bastien Nocera +Date: Tue Jun 14 14:12:26 2016 +0200 + + network: Avoid setting a GError if already set + + If the wireless security is invalid, don't try to set the GError if the + ad-hoc mode is invalid as well. + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-security.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b0329f8ef6c025c9c20453132297c9772cb29efc +Author: Bastien Nocera +Date: Tue Jun 14 14:11:25 2016 +0200 + + network: Return better error when 8021x security is invalid + + Rather than the generic "Invalid 802.1x security". + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-8021x-security.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 73a8d38946ee09d790e87f19df45fc1c6174c043 +Author: Bastien Nocera +Date: Tue Jun 14 14:10:20 2016 +0200 + + network: Remove unused ->validate class implementations + + The implementation of ->validate in the parent class will return TRUE if + there's no implementation in the child class, so no need to implement + those. + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-details.c | 11 ----------- + panels/network/connection-editor/ce-page-reset.c | 11 ----------- + 2 files changed, 22 deletions(-) + +commit a90dc605d63c50fa8b640f2dcd743c261cf7599f +Author: Bastien Nocera +Date: Tue Jun 14 14:03:07 2016 +0200 + + network: Fix IPv6 settings not being applicable when method changes + + When changing the method from Manual to Automatic, we need to clear the + gateway setting, otherwise the settings verification will fail: + ipv6.gateway: gateway cannot be set if there are no addresses configured + + Another fallout of the libnm 1.2 port + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-ip6.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 94e2be8ff666492694b8177973d4b080aab3aa62 +Author: Bastien Nocera +Date: Tue Jun 14 13:46:16 2016 +0200 + + network: Fix warning if IPv6 gateway is empty + + GtkEntry doesn't like NULL text. + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-ip6.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc14602e5598addf1ce92d89d644b5b5d8b204ae +Author: Bastien Nocera +Date: Tue Jun 14 13:45:50 2016 +0200 + + network: Fix saving of IPv6 gateway + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/connection-editor/ce-page-ip6.c | 1 + + 1 file changed, 1 insertion(+) + +commit cdb6a6c68212415bc642d0edcaf5efdcefd641d7 +Author: Bastien Nocera +Date: Fri Jun 10 17:07:50 2016 +0200 + + network: Fix warning when enabling hotspot + + GLib-GObject-WARNING **: g_object_set_valist: object class 'NMSettingWireless' has no property named 'security' + + https://bugzilla.gnome.org/show_bug.cgi?id=769230 + + panels/network/net-device-wifi.c | 1 - + 1 file changed, 1 deletion(-) + +commit 2d8c7b375264df169c5ff9d134bdd1e106ef5d55 +Author: Kalev Lember +Date: Tue Aug 30 08:06:36 2016 +0200 + + Bump required GTK+ version + + Need 3.21.5 for GtkShortcutLabel API. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e185a8aec9841661c1db5713af932f6e4d5f62f +Author: Мирослав Николић +Date: Tue Aug 30 06:24:32 2016 +0200 + + Updated Serbian translation + + po/sr.po | 2297 ++++++++++++++++++++++++++++++++------------------------ + po/sr@latin.po | 2297 ++++++++++++++++++++++++++++++++------------------------ + 2 files changed, 2622 insertions(+), 1972 deletions(-) + +commit c6606554ba7c79059f338773265005329df9d37f +Author: Мирослав Николић +Date: Tue Aug 30 06:10:35 2016 +0200 + + Updated Serbian translation + + po/sr@latin.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 346f3609b7b35346a35758066a5ed7eb4420d10f +Author: Bastien Nocera +Date: Mon Aug 29 13:57:10 2016 +0200 + + privacy: Rename retval in get_privacy_policy_url() + + It's a URL, not a name. + + panels/privacy/cc-privacy-panel.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 398641370dce9d180f2f4b63b885c9036f580307 +Author: Bastien Nocera +Date: Mon Aug 29 11:46:53 2016 +0200 + + privacy: Fix quoting of distro name and privacy URL + + Unquote the distribution name and the privacy policy url in + the Problem Reporting dialogue, as those can be shell-quoted (the format + used by /etc/os-release is "shell-compatible"). + + https://bugzilla.gnome.org/show_bug.cgi?id=770260 + + panels/privacy/cc-privacy-panel.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit bbc1fb149e9892f761518f4299556c3f9c60ad50 +Author: Matej Urbančič +Date: Fri Aug 26 22:58:47 2016 +0200 + + Updated Slovenian translation + + po/sl.po | 2699 +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 1593 insertions(+), 1106 deletions(-) + +commit 70b57fa125c9c124c7201d10d08a1e97cd63571a +Author: Rui Matos +Date: Thu Aug 25 19:48:53 2016 +0200 + + 3.21.90 + + NEWS | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 86 insertions(+), 1 deletion(-) + +commit 563155b63fdb6eed5fe62fbe9de2d20e1a542ef2 +Author: Rui Matos +Date: Tue Aug 23 17:45:49 2016 +0200 + + privacy: Align location services label with switch + + The GtkSwitch was using 2 grid rows for no reason which made the label + not align with it vertically. + + https://bugzilla.gnome.org/show_bug.cgi?id=769426 + + panels/privacy/privacy.ui | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit bebaf47da1b501ba4a56e2544d7106e88ab6f155 +Author: Allan Day +Date: Tue Aug 2 14:30:38 2016 +0100 + + privacy: various layout and cosmetic issues + + The dialogs suffered from insufficient spacing, making them feel + cramped. There was also inconsistent use of the dim label style. + + https://bugzilla.gnome.org/show_bug.cgi?id=769426 + + panels/privacy/privacy.ui | 39 ++++++++++++++++++++++++++++++++++----- + 1 file changed, 34 insertions(+), 5 deletions(-) + +commit 4877b7a609e375bdbfbd49a15e4c6b014e77ae29 +Author: Allan Day +Date: Tue Aug 2 12:54:36 2016 +0100 + + privacy: location services layout issues + + There was way too much space above the description and the + padding around the switch wasn't even. + + https://bugzilla.gnome.org/show_bug.cgi?id=769426 + + panels/privacy/privacy.ui | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ed34cd7d045ec10f05621afa4eca8c2db4d9cc99 +Author: Allan Day +Date: Tue Aug 2 10:16:37 2016 +0100 + + region: improve spacing + + The layout of the panel felt constrained and wasn't consistent + with the other panels. More vertical spacing required. + + https://bugzilla.gnome.org/show_bug.cgi?id=764645 + + panels/region/cc-region-panel.c | 4 ++-- + panels/region/region.ui | 24 ++++++++++++------------ + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit ffb4d57edcd776458448fed59d4f39a9f77adbbb +Author: Balázs Meskó +Date: Tue Aug 23 11:50:11 2016 +0000 + + Updated Hungarian translation + + po/hu.po | 1876 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1040 insertions(+), 836 deletions(-) + +commit adefc76b97598c608711b3a0e6c015780fe82957 +Author: Piotr Drąg +Date: Tue Aug 23 13:10:59 2016 +0200 + + Updated Polish translation + + po/pl.po | 2190 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1144 insertions(+), 1046 deletions(-) + +commit cf50fae0bc466f6cd408a3ee61ceac8584d20a7e +Author: Alexandre Franke +Date: Mon Aug 22 20:29:14 2016 +0000 + + Updated French translation + + po/fr.po | 2153 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1212 insertions(+), 941 deletions(-) + +commit fedb2f9730bde28f9517ab2381f18579e62f28bb +Author: Rafael Fontenelle +Date: Mon Aug 22 05:09:25 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 578 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 313 insertions(+), 265 deletions(-) + +commit 092a735f98885eb5616678819d6fc230335bce13 +Author: Jiri Grönroos +Date: Sun Aug 21 09:44:09 2016 +0000 + + Updated Finnish translation + + po/fi.po | 213 ++++++++++++++++++++------------------------------------------- + 1 file changed, 68 insertions(+), 145 deletions(-) + +commit 1818fce8687d9f2b7084c3af3af9bf7d0d300387 +Author: Fabio Tomat +Date: Sat Aug 20 09:08:29 2016 +0000 + + Updated Friulian translation + + po/fur.po | 124 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 59 insertions(+), 65 deletions(-) + +commit 3e2f6a577109f364e87778a2fa021b76e0a95f26 +Author: Marek Černocký +Date: Wed Aug 17 12:46:39 2016 +0200 + + Updated Czech translation + + po/cs.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dfd0c8940b1b10e748c297de9a5c165b6a3cf831 +Author: Marek Černocký +Date: Tue Aug 16 22:58:36 2016 +0200 + + Updated Czech translation + + po/cs.po | 2025 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1063 insertions(+), 962 deletions(-) + +commit 2cb0f5e3a37b44eab6064a9416c078368d93f928 +Author: Debarshi Ray +Date: Tue Jul 26 17:41:06 2016 +0200 + + online-accounts: Let goa_provider_show_account create the full UI + + It is not ideal to have the UI split across a semi-stable, + cross-module interface boundary. Non-trivial changes to the UI require + changes to the goa_provider_show_account interface. In fact, we were + already not using it the way it was originally intended to be. + Moreover, it prevents us from having a sufficiently different UI for + certain account types. + + Instead, let's just pass a vertical GtkBox to the GoaProvider and let + it fill it up whichever way it wants to. + + Bump required GOA version for the new goa_provider_show_account + behaviour. + + https://bugzilla.gnome.org/show_bug.cgi?id=769213 + + configure.ac | 2 +- + panels/online-accounts/cc-online-accounts-panel.c | 112 +--------------------- + 2 files changed, 3 insertions(+), 111 deletions(-) + +commit 88501d4d1f1a8a667bc86726c60290d8f7045ea6 +Author: Sveinn í Felli +Date: Fri Aug 12 14:25:25 2016 +0000 + + Updated Icelandic translation + (cherry picked from commit 075893a2db799b14bfb79ee49d6b2974d1d816fd) + + po/is.po | 1914 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1082 insertions(+), 832 deletions(-) + +commit ef0914ac55f94901110b8eac1e6cf6b982928796 +Author: Jiri Grönroos +Date: Fri Aug 12 12:36:39 2016 +0000 + + Updated Finnish translation + + po/fi.po | 2233 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1271 insertions(+), 962 deletions(-) + +commit 7ad03df2b2531ca9a25459c41dbf54ccca3b44e9 +Author: Jordi Mas +Date: Tue Aug 9 20:06:26 2016 +0200 + + Update Catalan translation + + po/ca.po | 510 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 271 insertions(+), 239 deletions(-) + +commit 38181308f9674b7231b651e8dd6263905104db64 +Author: Yosef Or Boczko +Date: Tue Aug 9 20:26:05 2016 +0300 + + Updated Hebrew translation + + po/he.po | 541 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 293 insertions(+), 248 deletions(-) + +commit a6080afa3bc9a0cd3cef5a2ea0b7e9606950400a +Author: Andika Triwidada +Date: Mon Aug 8 08:19:57 2016 +0000 + + Updated Indonesian translation + + po/id.po | 508 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 249 insertions(+), 259 deletions(-) + +commit 5fa3a6be983a45d2b350e1c530f4b65ca66fa9b5 +Author: Fabio Tomat +Date: Sun Aug 7 16:55:56 2016 +0000 + + Updated Friulian translation + + po/fur.po | 480 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 257 insertions(+), 223 deletions(-) + +commit 01401c6fb860be2f6d2242888137c3f2ddc5c4db +Author: Christian Kirbach +Date: Fri Aug 5 18:12:08 2016 +0000 + + Updated German translation + + po/de.po | 674 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 362 insertions(+), 312 deletions(-) + +commit 77c26aa16292f6a4ad1fed1d9c40e96a9cff8823 +Author: Ondrej Holy +Date: Fri Jul 29 15:25:08 2016 +0200 + + user-accounts: Fix history dialog height + + History dialog changes its height depending on number of entries. It + is caused by the recent GtkScrolledWindow changes from Bug 766569. Set + fixed min and max content heights to avoid this behavioral. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 00f96ca50210a53d874ee01195af423121a0b0f1 +Author: Dušan Kazik +Date: Thu Aug 4 07:33:44 2016 +0000 + + Updated Slovak translation + + po/sk.po | 185 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 88 insertions(+), 97 deletions(-) + +commit 98ba6b3904903f479c9ef866d6938f31e41a81a2 +Author: Daniel Mustieles +Date: Wed Aug 3 12:29:16 2016 +0000 + + Updated Spanish translation + + po/es.po | 115 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 55 insertions(+), 60 deletions(-) + +commit cf4a542e5130d2a788990130d8dc57d83d76381e +Author: Dušan Kazik +Date: Wed Aug 3 11:11:00 2016 +0000 + + Updated Slovak translation + + po/sk.po | 970 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 522 insertions(+), 448 deletions(-) + +commit bbe6b6309d206bfe257bb142b8a24b0d60ddd9f3 +Author: Mario Sanchez Prada +Date: Sat Jul 9 12:41:48 2016 +0100 + + Migrate the remaining bits of PpMaintenanceCommand to GTask + + They were still using the deprecated GSimpleAsyncResult and throwing + a lot of warnings when building. + + https://bugzilla.gnome.org/show_bug.cgi?id=766861 + + panels/printers/pp-maintenance-command.c | 43 +++++++++++++------------------- + 1 file changed, 18 insertions(+), 25 deletions(-) + +commit c41bbfa7d0cd3c16e6ac144e8030bb60c6341053 +Author: Mario Sanchez Prada +Date: Mon Jun 13 14:56:01 2016 +0100 + + printers: Check all supported CUPS commands, not just the first one + + Use an array of strings to store every supported command and check + the desired command against the elements in that list, instead of + simply checking the first one. + + https://bugzilla.gnome.org/show_bug.cgi?id=766861 + + panels/printers/pp-maintenance-command.c | 34 +++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +commit 4b91972f2c54b7071b9a1603a73eda00685a2282 +Author: Mario Sanchez Prada +Date: Thu Apr 28 18:58:20 2016 +0100 + + printers: Added new async API to check availability of maintenance commands + + This cleans the code up a bit so that we can extract part of the logic + from _pp_maintenance_command_execute_thread() before getting into fixing + the problem in the logic checking whether a CUPS command is available. + + Besides, it will be useful to have this logic extracted as it will be used + later on from pp-printer-entry.c to know whether the "Clean" command is + available, in order to show a menu item "Clean Print Heads" (bug 764620). + + https://bugzilla.gnome.org/show_bug.cgi?id=766861 + + panels/printers/pp-maintenance-command.c | 213 +++++++++++++++++++------------ + panels/printers/pp-maintenance-command.h | 29 +++-- + 2 files changed, 152 insertions(+), 90 deletions(-) + +commit cbdc3562476e32e723fd8ec129118692cac14228 +Author: Daniel Mustieles +Date: Tue Aug 2 16:48:37 2016 +0200 + + Updated Spanish translation + + po/es.po | 519 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 280 insertions(+), 239 deletions(-) + +commit 5b101946b94e6fe4d31c796b4241c919ee9a3358 +Author: Felipe Borges +Date: Mon Aug 1 10:16:01 2016 +0200 + + user-accounts: Drop CcEditableEntry references from um-user-panel + + There is no need to use this type in the new user accounts panel. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-user-panel.c | 3 --- + 1 file changed, 3 deletions(-) + +commit 5c12abbe2f6b1a6bc33afe551f39f9f5f273737f +Author: Felipe Borges +Date: Mon Aug 1 10:13:47 2016 +0200 + + user-accounts: Fix horizontal alignment of "Account Type" buttons + + It makes "account-type-standard" and "account-type-admin" hexpand + properties to equal TRUE. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 2 ++ + 1 file changed, 2 insertions(+) + +commit e3148af358bf58382c27c3ddf599e58a45a44615 +Author: Felipe Borges +Date: Thu Jul 21 16:10:35 2016 +0200 + + user-accounts: Use sensitivity to denote changes in "Account Type" + + Instead of changing from "Account Type" buttons to label, set the + sensitivity of the buttons according to the current users' permission. + + Now we hide the "Account Type" for a single user account. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 53 ++++++----------------- + panels/user-accounts/um-user-panel.c | 34 +++++++-------- + 2 files changed, 30 insertions(+), 57 deletions(-) + +commit e36a3654a04c5961bc3d55eec0f3488b2731931a +Author: Felipe Borges +Date: Fri Jul 15 13:04:51 2016 +0200 + + user-accounts: Drop "Account Activity" button + + Now the "Account Activity" dialog is launched by clicking in the + "Last Login" option. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 39 ++++++----------------- + panels/user-accounts/um-user-panel.c | 32 +++---------------- + 2 files changed, 15 insertions(+), 56 deletions(-) + +commit 1039642d9370f7194651f528322536807131fa49 +Author: Felipe Borges +Date: Wed Jul 20 11:26:56 2016 +0200 + + user-accounts: Use GtkEntry instead of CcEditableEntry + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 6 ++---- + panels/user-accounts/um-user-panel.c | 21 +++++++++++++++------ + 2 files changed, 17 insertions(+), 10 deletions(-) + +commit a05375005b55d1498b240a93f62ab164fbe6940d +Author: Felipe Borges +Date: Wed Jul 20 10:31:55 2016 +0200 + + user-accounts: Remove UmEditableButton object + + To bring it back, revert this commit. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/Makefile.am | 2 - + panels/user-accounts/um-editable-button.c | 434 ------------------------------ + panels/user-accounts/um-editable-button.h | 72 ----- + 3 files changed, 508 deletions(-) + +commit e2d3b47a335369f4de82d5a7ba935148027c9716 +Author: Felipe Borges +Date: Wed Jul 20 10:28:06 2016 +0200 + + user-accounts: Drop usage of UmEditableButtons + + Now using GtkButtons instead. Since we are denoting the permission + to edit an option by setting the option sensitivity. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 24 ++++++++++++++-- + panels/user-accounts/um-fingerprint-dialog.c | 9 +++--- + panels/user-accounts/um-user-panel.c | 35 ++++++++++++----------- + 3 files changed, 43 insertions(+), 25 deletions(-) + +commit 09039ecefbc7069f236e50d43db4ca4a5874535d +Author: Aurimas Černius +Date: Sun Jul 31 20:26:33 2016 +0300 + + Updated Lithuanian translation + + po/lt.po | 1856 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1057 insertions(+), 799 deletions(-) + +commit 00f1b53abb2e7a80fdf37cbfb66a8c033747f4d4 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 29 14:23:27 2016 -0300 + + keyboard: make sure to retrieve the correct type from variants + + When comparing the keyboard shortcut's default and current + values, we double-check what kind of variant the default + value is, but don't check that for the user value. + + This ends up throwing lots of variant-related warnings, as + the user value may not be a plain string. + + Fix that by checking the variant types both for the user and + the default value of the shortcut's settings. + + https://bugzilla.gnome.org/show_bug.cgi?id=769310 + + panels/keyboard/cc-keyboard-item.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit 3aa7cf69184ba9b91abb09dee8f20f38c2785378 +Author: Piotr Drąg +Date: Fri Jul 29 19:27:28 2016 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 12 +++++++----- + po/POTFILES.skip | 2 ++ + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit 13b745aa3df77c347a98ae8b2ef137ed8bc20483 +Author: Bastien Nocera +Date: Fri Jul 29 19:01:32 2016 +0200 + + keyboard: Bump required GTK+ version + + As the newly public GtkShortcutLabel is needed for that panel. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab8721fc04bf2dc583a958ac4a8cf2d49cae8f30 +Author: Georges Basile Stavracas Neto +Date: Thu Jul 21 22:00:03 2016 -0300 + + keyboard: add search support + + Based on the latest mockups, the Keyboard panel would + benefit from a search functionality. + + This patch add all the necessary UI and functions to + make the search work. Worth noticing that the current + implementation still doesn't work with search-as-you-type, + which'll be addressed on a future fix. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-panel.c | 49 +++++++++++++++++++- + panels/keyboard/gnome-keyboard-panel.ui | 79 +++++++++++++++++++++++++++++++-- + 2 files changed, 124 insertions(+), 4 deletions(-) + +commit 7b877bc33f66bc55488dcf5d35715fd6f41f67f1 +Author: Georges Basile Stavracas Neto +Date: Thu Jul 21 18:32:28 2016 -0300 + + keyboard: bring back reverse item management + + In order to simplify the porting to the new UI, the + reverse item functionality was removed. Now that all + the necessary code landed, it is time to bring it back. + + This patch adds back the ability to manage reverse items. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-item.c | 52 +++++++++++++++++++++++-- + panels/keyboard/cc-keyboard-manager.c | 71 ++++++++++++++++++++++------------- + 2 files changed, 93 insertions(+), 30 deletions(-) + +commit d0c32c38a3013fdeac0dbaca092f9b1395136a38 +Author: Georges Basile Stavracas Neto +Date: Tue Jul 19 17:22:38 2016 -0300 + + keyboard: remove unused code + + CcKeyboardItem overrides GObject:constructor with an + empty function that only hooks up with the parent + constructor. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-item.c | 15 --------------- + 1 file changed, 15 deletions(-) + +commit 1c85479742aeb7f0fc19b94ea7f8f95dad452963 +Author: Georges Basile Stavracas Neto +Date: Mon Jul 18 21:48:47 2016 -0300 + + keyboard: add support to reset shortcuts to their default values + + Following the proposed mockups, the shortcut list must + have the ability to reset modified to non-default shortcuts + right from the listbox. + + After adding the necessary API in CcKeyboardItem, adding + the user-visible elements to enable that is easy. + + To make that happen, add a button that resets the + keyboard shortcut. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-manager.c | 61 +++++++++++++++++ + panels/keyboard/cc-keyboard-manager.h | 3 + + panels/keyboard/cc-keyboard-panel.c | 95 +++++++++++++++++++++++++-- + panels/keyboard/cc-keyboard-shortcut-editor.c | 27 ++++++++ + panels/keyboard/shortcut-editor.ui | 1 + + 5 files changed, 183 insertions(+), 4 deletions(-) + +commit 376459af4313b6141d553492cad36a318c845b6b +Author: Georges Basile Stavracas Neto +Date: Mon Jul 18 20:58:49 2016 -0300 + + keyboard: add API to track whether a shortcut is default + + The current keyboard item API does not track whether the + keyboard shortcut is the default value or not. In order to + properly implement the Reset operation, the keyboard item + must receive this API and ideally handle it internally. + + This patch adds the necessary API to CcKeyboardItem to track + whether the shortcut is the default value or not. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-item.c | 82 ++++++++++++++++++++++++++++++++++++++ + panels/keyboard/cc-keyboard-item.h | 4 ++ + 2 files changed, 86 insertions(+) + +commit 4e50c3c37564b0e68c86d1e7547d5e1a9a08c887 +Author: Georges Basile Stavracas Neto +Date: Wed Jul 13 20:09:17 2016 -0300 + + keyboard: bring back uniqueness check + + The collision detection code was removed in commit a0a155884ef66ca + as the cleanup was happening because the previous code was closely + tied to the user interface components. + + Because that code wasn't appliable to the new listbox UI, it was + temporarily removed. + + This patch re-adds this feature to work with the new code orgazination. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-manager.c | 122 ++++++++++++++++++++++++++ + panels/keyboard/cc-keyboard-manager.h | 9 ++ + panels/keyboard/cc-keyboard-shortcut-editor.c | 93 ++++++++++++++++++++ + panels/keyboard/shortcut-editor.ui | 13 +++ + 4 files changed, 237 insertions(+) + +commit 60b235754ea52bcbc71c90cbc56ca0ffdf297146 +Author: Georges Basile Stavracas Neto +Date: Thu Jul 21 18:38:37 2016 -0300 + + keyboard: move keyboard management code to custom class + + Instead of having CcKeyboardPanel managing both UI and backend code, + factor the backend code to a new CcKeyboardManager class and drop + backend management from the panel itself. + + The new backend class handles the loading, creation and removal and + search of keyboard shortcuts. It also resolves reversible shortcuts + when searching. + + This patch moves the code to this new class, and updates the rest of + the Keyboard panel to use it instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/Makefile.am | 2 + + panels/keyboard/cc-keyboard-manager.c | 817 ++++++++++++++++++++++++++ + panels/keyboard/cc-keyboard-manager.h | 51 ++ + panels/keyboard/cc-keyboard-panel.c | 817 +------------------------- + panels/keyboard/cc-keyboard-shortcut-editor.c | 66 +-- + panels/keyboard/cc-keyboard-shortcut-editor.h | 4 +- + 6 files changed, 906 insertions(+), 851 deletions(-) + +commit 70bba2bbcd65bc05f5ca6307a8d3ca0e6f86e9ef +Author: Georges Basile Stavracas Neto +Date: Thu Jul 28 13:29:20 2016 -0300 + + keyboard: avoid stray Meta modified + + While using the Keyboard shortcut editor dialog under + Wayland, the user receives a key even when this + key isn't present in the physical keyboard nor in the + keymap. + + This is probably the result of Wayland inheriting from + X's xkb. + + To work around that, simply filter out this modifier. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a0a155884ef66ca8830f1f6fbf2ca8f549239a48 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 8 00:35:38 2016 -0300 + + keyboard: introduce CcKeyboardShortcutEditor + + The current CcKeyboardPanel used to manage keyboard + editing through GtkCellRendererAccel, which was replaced + when we moved to use a GtkListBox. Because of that, + the ability to edit shortcuts is now missing. + + Re-add shortcut editing capabilities through a new dialog, + which is done according to the latest mockups available. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/Makefile.am | 2 + + panels/keyboard/cc-keyboard-panel.c | 898 ++++---------------------- + panels/keyboard/cc-keyboard-panel.h | 2 + + panels/keyboard/cc-keyboard-shortcut-editor.c | 716 ++++++++++++++++++++ + panels/keyboard/cc-keyboard-shortcut-editor.h | 56 ++ + panels/keyboard/gnome-keyboard-panel.ui | 144 ----- + panels/keyboard/keyboard.gresource.xml | 1 + + panels/keyboard/shortcut-editor.ui | 262 ++++++++ + po/POTFILES.in | 2 + + 9 files changed, 1157 insertions(+), 926 deletions(-) + +commit 847fe447da36b2dc7b245a06e2caa45346e78b2c +Author: Georges Basile Stavracas Neto +Date: Tue Jun 21 15:45:38 2016 -0300 + + keyboard: remove the shortcuts treeview + + After porting the shortcuts management entirely to + GtkListBox, the current treeview is not necessary + anymore. + + This patch removes the shortcuts treeview and all + the related functions, and separates the treeviews + from the underlying models. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-panel.c | 163 +++++----------------------- + panels/keyboard/gnome-keyboard-panel.ui | 184 +++++++------------------------- + 2 files changed, 62 insertions(+), 285 deletions(-) + +commit fd3044272ed441884dde9435d55a11e63510f539 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 22 16:10:15 2016 -0300 + + keyboard: show shortcuts in a listbox + + Replace the current treeview with the new listbox. This + patch simply adds the listbox, and does not remove the + treeview yet. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-panel.c | 273 ++++++++++++++++++++++++++++++-- + panels/keyboard/gnome-keyboard-panel.ui | 43 +++++ + 2 files changed, 307 insertions(+), 9 deletions(-) + +commit c1529c341729b2df26a607ab3330337e9b88eba3 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 22 16:06:18 2016 -0300 + + keyboard: add helper method for user-friendly accelerators + + The accelerator formatting method itself is copied from + GtkCellRendererAccel, and will be used throughout the code + to format the accelerators just like they used to be before + moving to the listbox. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/keyboard-shortcuts.c | 29 +++++++++++++++++++++++++++++ + panels/keyboard/keyboard-shortcuts.h | 4 ++++ + 2 files changed, 33 insertions(+) + +commit d85047d36e6358a98eb58fa5da4471b0133d2b80 +Author: Georges Basile Stavracas Neto +Date: Tue Jun 21 14:35:20 2016 -0300 + + keyboard: add a group field to CcKeyboardItem + + This group field will be consumed by the next patches + in order to provide the correct ordering of elements + in the listbox. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-item.h | 1 + + panels/keyboard/cc-keyboard-panel.c | 2 ++ + 2 files changed, 3 insertions(+) + +commit c4e1ca2ee0a70fd70dec288f9aa157f140386a2b +Author: Georges Basile Stavracas Neto +Date: Tue Jun 14 22:19:01 2016 -0300 + + keyboard: show all shortcuts in a single treeview + + Move away from the old sections sidebar, by merging all + the shortcuts in the treeview and removing the sections + treeview. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-panel.c | 228 +++++++------------------------- + panels/keyboard/gnome-keyboard-panel.ui | 26 ---- + 2 files changed, 47 insertions(+), 207 deletions(-) + +commit d940d7bb5d8f3a7aceb3d4e91d16cbf0bf366c41 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 22 15:26:10 2016 -0300 + + keyboard: make it a template class + + To allow a much easier porting to the new layout, the keyboard + panel is now a template class. That has various implications on + the code organization: + + - The keyboard-shortcuts.c was responsible for filling the shortcuts. + Because it relied on the GtkBuilder of the panel, most of its code + was moved to the CcKeyboardPanel class. + - The unused code from the keyboard panel class had to be removed in + order to make it work again. + - All the hash tables and widgets are now part of the CcKeyboardPanel + structure. + - The interface elements have a single entry point. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-item.h | 1 + + panels/keyboard/cc-keyboard-panel.c | 1876 ++++++++++++++++++++++++++-- + panels/keyboard/cc-keyboard-panel.h | 1 + + panels/keyboard/gnome-keyboard-panel.ui | 280 +++-- + panels/keyboard/keyboard-shortcuts.c | 2041 +++---------------------------- + panels/keyboard/keyboard-shortcuts.h | 14 +- + 6 files changed, 2085 insertions(+), 2128 deletions(-) + +commit dfa01baa9df71980b771f1fb0e22e6b7c14837f3 +Author: Georges Basile Stavracas Neto +Date: Tue Jul 26 11:02:09 2016 -0300 + + keyboard: expose structures in header + + These structures will be used in future commits when + moving to use a template class. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/keyboard-shortcuts.c | 57 ----------------------------------- + panels/keyboard/keyboard-shortcuts.h | 58 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+), 57 deletions(-) + +commit 7e1d57579801a44fe6a3d784fc2d83f6e66cf5da +Author: Ondrej Holy +Date: Thu Jul 28 12:34:55 2016 +0200 + + user-accounts: Remove unused variable + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-user-panel.c | 1 - + 1 file changed, 1 deletion(-) + +commit 8e8d00541b55a1f87956953d3ef14c4239b5c344 +Author: Ondrej Holy +Date: Wed Jul 27 14:36:50 2016 +0200 + + user-accounts: Do not access already removed toolbar + + Commit eb9c110 removed add-remove-toolbar, however, some leftovers are + in the code which causes the following errors: + Gtk-CRITICAL **: gtk_widget_get_style_context: assertion 'GTK_IS_WIDGET (widget)' failed + Gtk-CRITICAL **: gtk_style_context_set_junction_sides: assertion 'GTK_IS_STYLE_CONTEXT (context)' failed + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-user-panel.c | 5 ----- + 1 file changed, 5 deletions(-) + +commit 61e00d01726148e76ec5a0a4a9df4f27cb611f54 +Author: Bastien Nocera +Date: Thu Jun 30 13:42:28 2016 +0200 + + mouse: Don't allow two-finger and edge scrolling at the same time + + As done when changing the setting manually. + + https://bugzilla.gnome.org/show_bug.cgi?id=761461 + + panels/mouse/gnome-mouse-properties.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit f01277fb485ea84c16ab59e44f947a9b4936f21c +Author: Bastien Nocera +Date: Thu Jun 30 13:33:09 2016 +0200 + + mouse: Offer a separate option for edge scrolling + + When a touchpad supports it. When the option is set, it will + automatically disable two-finger scrolling. + + The scrolling method used by each individual touchpad is implemented in + mutter, not here. + + https://bugzilla.gnome.org/show_bug.cgi?id=761461 + + configure.ac | 2 +- + panels/mouse/gnome-mouse-properties.c | 34 ++++++++++++++++++++-- + panels/mouse/gnome-mouse-properties.ui | 53 ++++++++++++++++++++++++++++++++++ + 3 files changed, 86 insertions(+), 3 deletions(-) + +commit f7fad92c3ef00134e59f4cca5d38387e6784a0fc +Author: Florian Müllner +Date: Fri Jul 22 02:04:09 2016 +0200 + + keyboard: Add gettext support for keybinding descriptions + + gettext can extract strings from xml file formats with the help of + .its files. Provide appropriate rules so modules that install + keybinding descriptions don't need to depend on intltool to + extract translatable strings. + + https://bugzilla.gnome.org/show_bug.cgi?id=769066 + + panels/keyboard/Makefile.am | 10 +++++++++- + panels/keyboard/gnome-keybindings.its | 11 +++++++++++ + panels/keyboard/gnome-keybindings.loc | 6 ++++++ + 3 files changed, 26 insertions(+), 1 deletion(-) + +commit eb9c110646de07127b934c82a76c0f3265d6e207 +Author: Felipe Borges +Date: Wed Jul 20 14:20:34 2016 +0200 + + user-accounts: Move "Add User" button to header bar + + This also introduces a change to the Lock/Unlock logic. From now + on, Unlocking the panel causes the "Lock" button to turn into the + "Add User" button. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 55 +++++++++++------------ + panels/user-accounts/um-user-panel.c | 35 +++++++++++---- + 2 files changed, 53 insertions(+), 37 deletions(-) + +commit e18c0014f11d6ce6d7c5472e3e13f21104b0945c +Author: Felipe Borges +Date: Fri Jul 15 12:45:19 2016 +0200 + + user-accounts: Properly align option buttons + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 2 ++ + 1 file changed, 2 insertions(+) + +commit cbe31d53370d9992e774bc85a6fe017f5289973a +Author: Felipe Borges +Date: Fri Jul 15 14:37:39 2016 +0200 + + user-accounts: Reposition "Remove Account" button + + It used to be at the toolbar in the bottom of the treeview. Now it + is fixed in the bottom-right corner of the panel. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 27 +++++++++++++---------- + 1 file changed, 15 insertions(+), 12 deletions(-) + +commit ce0b9aa8551551a3a553e7270aa00d3cab2e53eb +Author: Tiago Santos +Date: Wed Jul 27 07:37:09 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 158 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 80 insertions(+), 78 deletions(-) + +commit 90d6f3b622165bbb868756704a9c22d894cdfa6c +Author: Ondrej Holy +Date: Thu Jul 21 13:15:57 2016 +0200 + + user-accounts: Unify size of headerbar buttons + + The headerbar buttons with arrows were moved sidebyside by the commit + a70888f. The buttons have a slightly different size, which looks pretty + weird currently. Fix this by setting valign on GtkButton and not on + GtkImage inside. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1f4ae1238dd3a52b99769ae0a59f5623f7097da9 +Author: Tiago Santos +Date: Wed Jul 27 06:58:21 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 72 +++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 40 insertions(+), 32 deletions(-) + +commit 4aee781ab62ae6774047f74385d8101f84d5bfdb +Author: Georges Basile Stavracas Neto +Date: Tue Jul 26 11:59:07 2016 -0300 + + shell: ensure valid data when loading the panel + + When loading a given panel, make sure we have a valid + panel before setting the sidelist. + + This is a follow-up fix per request in bug [1]. + + [1] https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + shell/alt/cc-panel-list.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit ce08134c2bb130b95b8efc2125403f93f8e4b150 +Author: Georges Basile Stavracas Neto +Date: Tue Jun 14 14:32:41 2016 -0300 + + keyboard: remove deprecated GtkHBox and GtkVBox + + These classes are deprecated by Gtk+ and should be replaced + by vertical and/or horizontal GtkBoxes. + + This commit replaces the usage of the deprecated box classes. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/gnome-keyboard-panel.ui | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit bca7c591afe6640cfdbff2b56a62f8e0bdda10ac +Author: Georges Basile Stavracas Neto +Date: Tue Jun 14 14:57:06 2016 -0300 + + keyboard: remove boilerplate code + + After introducing the autocleanup function to + CcPanel, it is now possible to remove a lot of + boilerplate code from the panels. + + This commit ports CcKeyboardPanel to be a final + type, removing all the old boilerplate code in + the proccess. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + panels/keyboard/cc-keyboard-panel.c | 38 ++++++++++++++--------------------- + panels/keyboard/cc-keyboard-panel.h | 40 ++----------------------------------- + 2 files changed, 17 insertions(+), 61 deletions(-) + +commit 61d7abe795b4434fd1ae3d28aed8b9d86180bba3 +Author: Georges Basile Stavracas Neto +Date: Tue Jun 14 14:54:03 2016 -0300 + + shell: add a autocleanup function to CcPanel + + CcPanel uses the old boilerplate code from GLib, + which does not set an autocleanup function. + + The lack of a cleanup function implies that panels + cannot use G_DECLARE_{FINAL,DERIVABLE}_TYPE, making + the code stick to the old boilerplate. + + This patch adds a cleanup function to CcPanel. It doesn't + move CcPanel to G_DECLARE_DERIVABLE_TYPE() because it'd + break the CcPanel's subclasses. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + shell/cc-panel.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 42a360eed682990b00c0b2d8d13c27c7496eb9ee +Author: Georges Basile Stavracas Neto +Date: Fri Jul 15 00:12:49 2016 -0300 + + shell: update sidebar when active panel is set externally + + When the active panel is not changed through sidebar navigation, + e.g. by calling the Control Center through command line and asking + to open a specific panel, the panel is correctly opened but the + sidebar is not updated to reflect that. + + Fix that by selecting the externally set panel row, and eventually + moving to the correct list. + + https://bugzilla.gnome.org/show_bug.cgi?id=769063 + + shell/alt/cc-panel-list.c | 30 ++++++++++++++++++++++++++++++ + shell/alt/cc-panel-list.h | 3 +++ + shell/alt/cc-window.c | 2 ++ + 3 files changed, 35 insertions(+) + +commit 1345cf36c5de360260e62109db84affdec6db079 +Author: Felipe Borges +Date: Thu Jul 21 16:47:18 2016 +0200 + + user-accounts: Remove UmEditableCombo class + + Revert this commit in order to bring the UmEditableCombo class back. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/Makefile.am | 2 - + panels/user-accounts/um-editable-combo.c | 452 ------------------------------- + panels/user-accounts/um-editable-combo.h | 76 ------ + panels/user-accounts/um-user-panel.c | 2 - + 4 files changed, 532 deletions(-) + +commit 790b2c319802d93aa363aa66c75134399e820328 +Author: Zeeshan Ali (Khattak) +Date: Mon May 30 21:30:38 2016 +0100 + + privacy: Update for PermissionStore DBus API changes + + As xdg-app has been renamed to Flatpak, the permission store's bus name + and interface name have been changes as well. + + https://bugzilla.gnome.org/show_bug.cgi?id=766603 + + panels/privacy/cc-privacy-panel.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 336851f997c07999107511924039f7bd532c7e00 +Author: Zeeshan Ali (Khattak) +Date: Wed Apr 13 17:13:33 2016 +0100 + + privacy: React to changes in permissions store + + Currently if control-center is already running with privacy panel in + foreground and user authorizes a new application to gain access to + location information from gnome-shell dialog, this change doesn't get + reflected in the privacy panel to user until they exit privacy panel. + + This change fixes this by reacting to changes to permissions store. + + https://bugzilla.gnome.org/show_bug.cgi?id=765006 + + panels/privacy/cc-privacy-panel.c | 110 ++++++++++++++++++++++++++++---------- + 1 file changed, 81 insertions(+), 29 deletions(-) + +commit 9208f61eb6f7ce6e081c04c8fab188444ee7b424 +Author: Fabio Tomat +Date: Mon Jul 25 09:54:47 2016 +0000 + + Updated Friulian translation + + po/fur.po | 56 ++++++++++++++++---------------------------------------- + 1 file changed, 16 insertions(+), 40 deletions(-) + +commit be4eb3805410f9c2c0e8641f7e70240a32f295b6 +Author: Fabio Tomat +Date: Mon Jul 25 05:36:06 2016 +0000 + + Updated Friulian translation + + po/fur.po | 115 ++++++++++++++++++-------------------------------------------- + 1 file changed, 33 insertions(+), 82 deletions(-) + +commit 51ef42c099fc3d7930aa3307412cb53b68bed080 +Author: Fabio Tomat +Date: Sat Jul 23 16:11:36 2016 +0000 + + Updated Friulian translation + + po/fur.po | 2291 ++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 1355 insertions(+), 936 deletions(-) + +commit 869f958c52635824debf669b7b7f61fb32885d8f +Author: Piotr Drąg +Date: Mon Jul 18 22:27:16 2016 +0200 + + Add Language headers to po files + + Future versions of gettext will fail if this header is missing. + + po/am.po | 1 + + po/as.po | 2 +- + po/az.po | 1 + + po/be@latin.po | 1 + + po/bn.po | 1 + + po/bn_IN.po | 2 +- + po/ca@valencia.po | 2 +- + po/crh.po | 2 +- + po/cy.po | 1 + + po/dz.po | 1 + + po/en.po | 2 +- + po/en@shaw.po | 1 + + po/en_CA.po | 1 + + po/es.po | 2 +- + po/fa.po | 2 +- + po/gu.po | 2 +- + po/hr.po | 1 + + po/hy.po | 1 + + po/ka.po | 33 +-------------------------------- + po/km.po | 2 +- + po/ko.po | 2 +- + po/mai.po | 1 + + po/mg.po | 1 + + po/mk.po | 1 + + po/mn.po | 1 + + po/nb.po | 2 +- + po/nds.po | 1 + + po/nso.po | 1 + + po/rw.po | 2 +- + po/si.po | 1 + + po/sl.po | 2 +- + po/sq.po | 1 + + po/sr@latin.po | 2 +- + po/tr.po | 2 +- + po/ug.po | 2 +- + po/uz.po | 1 + + po/uz@cyrillic.po | 1 + + po/wa.po | 1 + + po/xh.po | 1 + + po/zh_HK.po | 2 +- + po/zu.po | 1 + + 41 files changed, 41 insertions(+), 49 deletions(-) + +commit 80825b740d564ce8ece65329d090265826d879a5 +Author: Daniel Mustieles +Date: Mon Jul 18 16:46:47 2016 +0200 + + Updated Spanish translation + + po/es.po | 91 +++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 53 insertions(+), 38 deletions(-) + +commit 90632941255ab3e280b15aa61a6a957c9b0d8a1b +Author: Jordi Mas +Date: Sun Jul 17 23:14:46 2016 +0200 + + Update Catalan translation + + po/ca.po | 1777 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1004 insertions(+), 773 deletions(-) + +commit ff631c70dbfe486cce853a8ec5c8a066b9dca8cd +Author: Chao-Hsiung Liao +Date: Sat Jul 16 02:48:47 2016 +0000 + + Updated Chinese (Taiwan) translation + + po/zh_TW.po | 1729 +++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 969 insertions(+), 760 deletions(-) + +commit 079928d6931dd7f8bbbb01d4e35d5cb5528189bd +Author: Felipe Borges +Date: Wed Jul 13 18:57:54 2016 +0200 + + user-accounts: Make the "Account Activity" dialog wider + + Set it to 60% of the parent window. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-history-dialog.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 094447fdd32ad05ec9a27d202338fe7ddcfafd31 +Author: Felipe Borges +Date: Wed Jul 13 16:39:25 2016 +0200 + + user-accounts: Drop overwritten title of "Account Activity" dialog + + Since we are setting the "Account Activity" title by prepending + the user real name ("%s - Account Activity") in um-history-dialog.c, + there's no need to set the title property for the dialog elsewhere. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 2 -- + 1 file changed, 2 deletions(-) + +commit f029fc094707c89ad66d7d205ef93bed36269c32 +Author: Felipe Borges +Date: Tue Jun 21 13:48:05 2016 +0200 + + user-accounts: Prepend user real name to "Account Activity" dialog title + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-history-dialog.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit f56c90b91639529d162f4f0279fe23f61c07ce9a +Author: Felipe Borges +Date: Mon Jul 11 21:32:38 2016 +0200 + + user-accounts: Drop unused subtitle in "Account Activity" dialog + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 1 - + 1 file changed, 1 deletion(-) + +commit 843c126760de4649bce5b2084644695b29a5ade8 +Author: Felipe Borges +Date: Wed Jul 13 11:53:03 2016 +0200 + + user-accounts: Reposition fingerprint-login-button to correct position + + It was in the same position as the button below it. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 66cab8a23def4fe80bbeec15a819383ae132a47b +Author: Felipe Borges +Date: Tue Jul 12 14:20:00 2016 +0200 + + user-accounts: Properly align account type buttons + + These two buttons should have the same size. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 6052e469a957203f5e339c44f828349b417679b8 +Author: Georges Basile Stavracas Neto +Date: Mon Jul 11 14:39:05 2016 -0300 + + info: show build-id + + While developing, it's useful to show the build id of the + installed OS when available, which the info panel doesn't + handle for now. + + https://bugzilla.gnome.org/show_bug.cgi?id=768693 + + panels/info/cc-info-panel.c | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) + +commit 8b70c44b5a7868c0895e2b358323fc350f3ccba9 +Author: Georges Basile Stavracas Neto +Date: Mon Jul 11 14:25:59 2016 -0300 + + info: factor out os info retrieval function + + This code will be reused in the future to retrieve information + stored in /etc/os-release file and, as preparation for the next + patch that retrieves and displays the build-id of the OS. + + https://bugzilla.gnome.org/show_bug.cgi?id=768693 + + panels/info/cc-info-panel.c | 84 ++++++++++++++++++++++++++++++++++----------- + 1 file changed, 64 insertions(+), 20 deletions(-) + +commit a58f9dd3f8a998508e46be40c0c62ffad18d04d4 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 8 00:55:59 2016 -0300 + + mouse: remove arbitrary height request + + The test frame widget size is better handled by the + scrolled window's max-content-height property introduced + in commit 62f1f6b than an arbitrary height request. + + https://bugzilla.gnome.org/show_bug.cgi?id=768529 + + panels/mouse/gnome-mouse-test.ui | 1 - + 1 file changed, 1 deletion(-) + +commit 6c677bb0e9ac6330dfde17cf0ff1c5154a04b2c3 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 8 00:54:16 2016 -0300 + + mouse: center horizontally using halign property + + The Mouse & Touchpad panel has a horizontally centered + list, which is centered pixel-counting the list width and + hardcoded margins. + + This approach has various issues. It resizes the window + needlessly when e.g. the font changes the size, dpi or + family. This is specially visible when dealing with low + resolution screens, where the hardcoded margins are too + much to fit a 720x480 screen with the Large Font accessibility + setting on. + + Fix that by removing the margins and setting the horizontal + alignment of the list to center. Since the list itself doesn't + expand to fill the available space, there won't be any user- + visible changes except that the panel is now able to scale + down. + + https://bugzilla.gnome.org/show_bug.cgi?id=768529 + + panels/mouse/gnome-mouse-properties.ui | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 62f1f6bb23b23b59c5c5fa845953ff1b824bc0c2 +Author: Georges Basile Stavracas Neto +Date: Fri Jul 8 00:51:27 2016 -0300 + + mouse: set max-content-height on scrolledwindows + + Instead of using only hardcoded height requests, it's better + if we give more flexibility for the content to grow up to + a certain amount of pixels. + + Also, this patch slightly reduces the maximum size by 20px, so + that in the tested scenario (Adwaita with Large Font settings on) + the panel is still able to size down. + + https://bugzilla.gnome.org/show_bug.cgi?id=768529 + + panels/mouse/gnome-mouse-properties.ui | 2 +- + panels/mouse/gnome-mouse-test.ui | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit e198f708566550b64a74490f4b27fb8dc0a1873f +Author: Tiago Santos +Date: Mon Jul 4 14:56:59 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 1092 +++++++++++++++++++++++++++----------------------------------- + 1 file changed, 472 insertions(+), 620 deletions(-) + +commit a2698995a7d2b10524ce28c25a3631804c617727 +Author: Piotr Drąg +Date: Mon Jul 4 03:30:37 2016 +0200 + + Updated Polish translation + + po/pl.po | 204 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 102 insertions(+), 102 deletions(-) + +commit 83afdd39c8b9f1d28f911e222ab994b89bb67584 +Author: Ondrej Holy +Date: Mon Mar 7 13:54:55 2016 +0100 + + user-accounts: Fix missing records in the history dialog + + "Session Ended" record may miss if "Session Started" isn't in the + same week, which is caused by a wrong order of conditions. + + https://bugzilla.gnome.org/show_bug.cgi?id=762346 + + panels/user-accounts/um-history-dialog.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 26993a314ab0b695e2a6fa4522ae0f983e6cffc8 +Author: Daniel Mustieles +Date: Mon Jun 27 07:29:29 2016 +0000 + + Updated Spanish translation + + po/es.po | 170 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 81 insertions(+), 89 deletions(-) + +commit 26baf3f1a3b2768e95c834c5c6f4afb4c0e4bfce +Author: Rafael Fontenelle +Date: Sun Jun 26 21:23:31 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 235 ++++++++++++++++++++++++++---------------------------------- + 1 file changed, 100 insertions(+), 135 deletions(-) + +commit fca16ba81bf650c17ef40cd0f6bde54cc77b09a5 +Author: Andika Triwidada +Date: Sun Jun 26 17:03:45 2016 +0000 + + Updated Indonesian translation + + po/id.po | 1553 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 841 insertions(+), 712 deletions(-) + +commit bc479bb6b7006d6cb67801b1216eb0c9d4a0d0e3 +Author: Yosef Or Boczko +Date: Sun Jun 26 17:06:43 2016 +0300 + + Updated Hebrew translation + + po/he.po | 1917 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 1068 insertions(+), 849 deletions(-) + +commit bcde0ac74809cafe36791844e31f3f9aaa33ad65 +Author: Andika Triwidada +Date: Sun Jun 26 09:26:08 2016 +0000 + + Updated Indonesian translation + (cherry picked from commit eadf4867385884cf2b453b490839702bdda50b01) + + po/id.po | 2180 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1165 insertions(+), 1015 deletions(-) + +commit e90a7780a23ae3479f45ada5856729ad7471f858 +Author: Mario Blättermann +Date: Sun Jun 26 09:03:17 2016 +0000 + + Updated German translation + + po/de.po | 1268 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 717 insertions(+), 551 deletions(-) + +commit 4db427743be68e2eaf3b46edd6a329c7856a23c1 +Author: Muhammet Kara +Date: Sun Jun 26 04:38:26 2016 +0000 + + Updated Turkish translation + + po/tr.po | 459 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 214 insertions(+), 245 deletions(-) + +commit c6f1b3a2be3995d82b1fa7981dbf055782eb9e6b +Author: Bastien Nocera +Date: Mon Jun 13 23:06:24 2016 +0200 + + network: Simplify complete_connection_for_type() + + Now that there's only one type to be added (VPNs). + + https://bugzilla.gnome.org/show_bug.cgi?id=767614 + + .../connection-editor/net-connection-editor.c | 25 ++++++---------------- + 1 file changed, 6 insertions(+), 19 deletions(-) + +commit d0fcd5843c0092b9080cc430ba52dd2a821e853f +Author: Bastien Nocera +Date: Mon Jun 13 17:49:37 2016 +0200 + + network: Remove the first page of the "Add Connection" wizard + + We still offered to add Bond, Team, Bridge and VLAN connections even + though we don't support them any more. Remove the first page as we only + offer to add VPN connections. + + https://bugzilla.gnome.org/show_bug.cgi?id=767614 + + .../connection-editor/net-connection-editor.c | 41 ++-------------------- + 1 file changed, 2 insertions(+), 39 deletions(-) + +commit 7adfaf1ed95fe87e9b086ce890aea152efcc5e44 +Author: Bastien Nocera +Date: Mon Jun 13 18:36:41 2016 +0200 + + network: Fix VPN UI not showing up + + The VPN editor API changed as well. + + https://bugzilla.gnome.org/show_bug.cgi?id=767614 + + panels/network/connection-editor/ce-page-vpn.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 2a7b19202bfb017f1fdfe8f7e3c2f71d0f985093 +Author: Bastien Nocera +Date: Mon Jun 13 16:56:27 2016 +0200 + + network: Fix crash creating a VPN + + The listing of VPN plugins was done using the nm-glib API instead of the + new libnm 1.2 one. + + https://bugzilla.gnome.org/show_bug.cgi?id=767614 + + panels/network/connection-editor/net-connection-editor.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 7d21e69d659bf238f2ab652ff379c3b425ec5f65 +Author: Felipe Borges +Date: Tue Jun 21 16:19:07 2016 +0200 + + user-accounts: Reorder items in "Account Activity" entries + + According to the mockups at + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-history-dialog.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2693d412ef91c61caa151e56959f71402c7a403a +Author: Felipe Borges +Date: Tue Jun 21 13:12:55 2016 +0200 + + user-accounts: Rename "History" button label to "Account Activity" + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1d39194e558c483883f159c58d370870ad7091e +Author: Felipe Borges +Date: Mon Jun 20 21:17:11 2016 +0200 + + user-accounts: Drop unused account-type-model object + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 18 ------------------ + 1 file changed, 18 deletions(-) + +commit 98cbbeb2db65410d58daccfc4702c86a99626bc1 +Author: Martin Hatina +Date: Mon Jun 20 13:57:33 2016 +0200 + + printers: Use PpPrinter class for renaming + + Use PpPrinter class for renaming printer asynchronously. + + https://bugzilla.gnome.org/show_bug.cgi?id=761539 + + panels/printers/cc-printers-panel.c | 64 ++++++++++++++++++++++++++----------- + 1 file changed, 46 insertions(+), 18 deletions(-) + +commit a95bdb91bb79f72d8941226183d4c601ea1b1408 +Author: Martin Hatina +Date: Mon Jun 20 13:56:35 2016 +0200 + + printers: Introduce PpPrinter class + + Introduce new class that represents printer. + + https://bugzilla.gnome.org/show_bug.cgi?id=761539 + + panels/printers/Makefile.am | 2 + + panels/printers/pp-printer.c | 288 +++++++++++++++++++++++++++++++++++++++++++ + panels/printers/pp-printer.h | 49 ++++++++ + 3 files changed, 339 insertions(+) + +commit 2be260348c41fcff0ec90bc6ffd4968850476e46 +Author: Tiago Santos +Date: Sat Jun 18 12:25:26 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 228 +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 135 insertions(+), 93 deletions(-) + +commit 850a2fccef5c7976edd3bc090ef138169d956ba7 +Author: Daniel Mustieles +Date: Thu Jun 16 14:31:30 2016 +0000 + + Updated Spanish translation + + po/es.po | 254 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 133 insertions(+), 121 deletions(-) + +commit ebf13bd750fb3a9508544a373ad4d045faeb4045 +Author: Rafael Fontenelle +Date: Wed Jun 15 18:33:06 2016 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 2626 ++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 1711 insertions(+), 915 deletions(-) + +commit 93f71e5260f903527dde33dbcf1427a8dfc492ee +Author: Felipe Borges +Date: Fri Jun 10 14:44:28 2016 +0200 + + printers: present spinner while populating the panel + + https://bugzilla.gnome.org/show_bug.cgi?id=767600 + + panels/printers/printers.ui | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 8c71b0bc8b3d6840737ccfe5dd21e2e19875d0a9 +Author: Felipe Borges +Date: Wed Jun 8 16:36:57 2016 +0200 + + printers: enforce the empty-state patterns + + https://bugzilla.gnome.org/show_bug.cgi?id=767600 + + panels/printers/printers.ui | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit 11dd608f9488e4872e95b00b7174c21fddccc991 +Author: Felipe Borges +Date: Wed Jun 8 16:20:47 2016 +0200 + + printers: use panel-wide page for empty-state + + Instead of having the empty-state and no-cups-page states displayed + as tabs of the printer notebook, go for panel-wide pages, which + better highlight these states and doesn't unnecessarily shows the + empty printers list. + + This change is also part of the effort of the panel redesign, + according to the mockups at + https://wiki.gnome.org/Design/SystemSettings/Printers + + https://bugzilla.gnome.org/show_bug.cgi?id=767600 + + panels/printers/cc-printers-panel.c | 22 ++-- + panels/printers/printers.ui | 229 +++++++++++++++++------------------- + 2 files changed, 112 insertions(+), 139 deletions(-) + +commit da1d8f0d39e81d29cfce62cfe215e6113654ded7 +Author: Felipe Borges +Date: Wed Jun 15 11:35:02 2016 +0200 + + sharing: Update "Remote Login" dialog description + + To match the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/cc-sharing-panel.c | 2 +- + panels/sharing/sharing.ui | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit f3b7c16132ad5574f6fc2ae7bd0101a584c18014 +Author: Felipe Borges +Date: Thu May 26 15:13:37 2016 +0200 + + sharing: Drop the "Personal" from "Personal File Sharing" + + According to the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/sharing.ui | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 908f4832a4a402b251ab61069ef80028b264231f +Author: Piotr Drąg +Date: Wed Jun 15 02:11:24 2016 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 45d6073cd186a204b986f22cd32114d1d6eb7d4d +Author: Georges Basile Stavracas Neto +Date: Tue Jun 7 22:18:09 2016 -0300 + + window: remove the placeholder view + + Now that we always show a panel, this placeholder + view is not needed. + + This patch removes the placesholder view. + + https://bugzilla.gnome.org/show_bug.cgi?id=767301 + + shell/alt/cc-window.c | 5 +---- + shell/window.ui | 59 --------------------------------------------------- + 2 files changed, 1 insertion(+), 63 deletions(-) + +commit 11ce397d2af7fb7217589a6b0e12acbf6f740612 +Author: Georges Basile Stavracas Neto +Date: Mon Jun 6 14:16:10 2016 -0300 + + window: adapt to use CcPanelList + + After introducing the new sidelist class, the + next logical step is to make CcWindow use it. + + This patch, then, adapts CcWindow to use CcPanelList + instead of a plain GtkListBox. + + https://bugzilla.gnome.org/show_bug.cgi?id=767301 + + shell/alt/cc-window.c | 300 +++++++++++++++++--------------------------------- + shell/window.ui | 7 +- + 2 files changed, 100 insertions(+), 207 deletions(-) + +commit cb1e0c4a01d9893086fddb57f3068fa0f61e48cd +Author: Georges Basile Stavracas Neto +Date: Mon Jun 6 14:13:54 2016 -0300 + + panel-list: create a custom class to handle the sidelist + + As the sidelist gets more complex, managing it in CcWindow + would make it very confusing. + + This patch introduces the CcPanelList, a widget that manages + the sidelist. + + https://bugzilla.gnome.org/show_bug.cgi?id=767301 + + shell/Makefile.am | 7 + + shell/alt/Makefile.am | 3 + + shell/alt/cc-panel-list.c | 808 +++++++++++++++++++++++++++++++ + shell/alt/cc-panel-list.h | 67 +++ + shell/gnome-control-center.gresource.xml | 1 + + shell/panel-list.ui | 209 ++++++++ + 6 files changed, 1095 insertions(+) + +commit 2777fd583d150938beb8f2c110de50c55f3a3fbd +Author: Georges Basile Stavracas Neto +Date: Mon Jun 6 14:11:02 2016 -0300 + + panels: use the new categories + + Following the previous patch, this patch adds the new alternative + categories to the panels' Desktop files. These alternative categories + are only relevant for the alternative Shell, and do not break the + current Shell in any way. + + https://bugzilla.gnome.org/show_bug.cgi?id=767301 + + panels/background/gnome-background-panel.desktop.in.in | 2 +- + panels/bluetooth/gnome-bluetooth-panel.desktop.in.in | 2 +- + panels/color/gnome-color-panel.desktop.in.in | 2 +- + panels/datetime/gnome-datetime-panel.desktop.in.in | 2 +- + panels/display/gnome-display-panel.desktop.in.in | 2 +- + panels/info/gnome-info-panel.desktop.in.in | 2 +- + panels/keyboard/gnome-keyboard-panel.desktop.in.in | 2 +- + panels/mouse/gnome-mouse-panel.desktop.in.in | 2 +- + panels/network/gnome-network-panel.desktop.in.in | 2 +- + panels/notifications/gnome-notifications-panel.desktop.in.in | 2 +- + panels/online-accounts/gnome-online-accounts-panel.desktop.in.in | 2 +- + panels/printers/gnome-printers-panel.desktop.in.in | 2 +- + panels/privacy/gnome-privacy-panel.desktop.in.in | 2 +- + panels/region/gnome-region-panel.desktop.in.in | 2 +- + panels/search/gnome-search-panel.desktop.in.in | 2 +- + panels/sharing/gnome-sharing-panel.desktop.in.in | 2 +- + panels/universal-access/gnome-universal-access-panel.desktop.in.in | 2 +- + panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in | 2 +- + panels/wacom/gnome-wacom-panel.desktop.in.in | 2 +- + 19 files changed, 19 insertions(+), 19 deletions(-) + +commit 27ce5b388f7ebd7e7b8a10b7de42d1a3e48e6e6e +Author: Georges Basile Stavracas Neto +Date: Mon Jun 6 14:07:25 2016 -0300 + + shell-model: introduce new categories + + Following the previous set of patches for implementing + the next generation Shell, a new set of categories must + be added. + + These new categories will reflect on the ordering of the + panels and subpages in the sidelist. + + This patch adds these new categories and conditionally + compiles them, to not break the current icon-based Shell. + + https://bugzilla.gnome.org/show_bug.cgi?id=767301 + + shell/cc-panel-loader.c | 35 +++++++++++++++++++++++++---------- + shell/cc-shell-model.h | 12 +++++++++++- + 2 files changed, 36 insertions(+), 11 deletions(-) + +commit 8e414f88b198dc36c91740280a88697aad8849ae +Author: Felipe Borges +Date: Thu May 26 12:19:08 2016 +0200 + + sharing: Move "Remote Login" switch to headerbar + + According to the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/sharing.ui | 48 ++++++++++++++++------------------------------- + 1 file changed, 16 insertions(+), 32 deletions(-) + +commit 8b689614315089781e604b8e76521c1e926bbdac +Author: Felipe Borges +Date: Thu May 26 11:54:54 2016 +0200 + + sharing: Use a checkbutton in the "Screen Sharing" dialog + + According to the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + We should use a checkbutton instead of a switch for + the "Allow connections to control the screen" option. + Also, this commit changes this option label accordingly. + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/cc-sharing-panel.c | 2 +- + panels/sharing/sharing.ui | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 612ac49205b5ab401cda6981779586e8933df1ff +Author: Felipe Borges +Date: Thu May 26 11:47:19 2016 +0200 + + sharing: Update "Screen Sharing" dialog description + + To match the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/cc-sharing-panel.c | 2 +- + panels/sharing/sharing.ui | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4d001f79891d1d7ac397a8ed9fea70d8f21afadb +Author: Felipe Borges +Date: Thu May 26 11:41:40 2016 +0200 + + sharing: Update "Media Sharing" dialog description + + To match the new designs at + https://wiki.gnome.org/Design/SystemSettings/Sharing + + https://bugzilla.gnome.org/show_bug.cgi?id=767646 + + panels/sharing/sharing.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af1355632fee9a6f4fb84a2a93b85b1e4f9e7049 +Author: Felipe Borges +Date: Fri Jun 10 13:23:05 2016 +0200 + + user-accounts: move spinner to header in Add User dialog + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 09cbc05608b16fadad3c5d11a38282c6515fabe7 +Author: Felipe Borges +Date: Fri Jun 10 13:12:12 2016 +0200 + + user-accounts: move Add User dialog buttons to ui file + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 57 +++++++++++++++++++++++++++++ + panels/user-accounts/um-account-dialog.c | 10 ----- + 2 files changed, 57 insertions(+), 10 deletions(-) + +commit 1db970eccac93d51906f726afff31e48968df597 +Author: Felipe Borges +Date: Fri Jun 10 11:34:05 2016 +0200 + + user-accounts: port "Add User" dialog to gtk+ composite widget templates + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 86 ++++++++------ + panels/user-accounts/um-account-dialog.c | 172 ++++++++++------------------ + 2 files changed, 109 insertions(+), 149 deletions(-) + +commit de0de514060b6a7870c6cc0cc3e8010c578917a1 +Author: Felipe Borges +Date: Fri Jun 10 11:46:23 2016 +0200 + + user-accounts: split join-dialog from account-dialog + + The UmAccountDialog class will be ported to gtk widget templates, + in doing so, we are decoupling here the gtkbuilder dependend ui + code from what will be the class code in the port. + + Nothing changed in the join-dialog ui code itself. + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 234 ---------------------- + panels/user-accounts/data/join-dialog.ui | 238 +++++++++++++++++++++++ + panels/user-accounts/um-account-dialog.c | 20 +- + panels/user-accounts/user-accounts.gresource.xml | 1 + + 4 files changed, 256 insertions(+), 237 deletions(-) + +commit 5e2ed8e7a7daa0b45ab5cbae681ee90301998b40 +Author: Felipe Borges +Date: Mon Jun 13 14:27:30 2016 +0200 + + user-accounts: hide language settings for current user + + Language settings should not be shown. That's what the Region & + Language panel settings are for. See: + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/um-user-panel.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit d1329f13ad64c55de4708d795a67623da277b223 +Author: Felipe Borges +Date: Mon Jun 13 14:48:57 2016 +0200 + + user-accounts: add space between rows in um-user-panel + + According to the mockups at + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 1 + + 1 file changed, 1 insertion(+) + +commit b756290fb159b4dbe15b66bc2ba86fc5c5058345 +Author: Daniel Mustieles +Date: Mon Jun 13 13:27:30 2016 +0000 + + Updated Spanish translation + + po/es.po | 143 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 79 insertions(+), 64 deletions(-) + +commit ac6c7b1ded251710f96389b26d39f2de1c17c643 +Author: Dušan Kazik +Date: Sun Jun 12 10:55:04 2016 +0000 + + Updated Slovak translation + + po/sk.po | 1169 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 669 insertions(+), 500 deletions(-) + +commit 89f6aa9efcc02fabd6dd729a902e0405a763d601 +Author: Muhammet Kara +Date: Sun Jun 12 09:35:32 2016 +0000 + + Updated Turkish translation + + po/tr.po | 1756 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 977 insertions(+), 779 deletions(-) + +commit 94de8041077aacbf29ba787d5f838d825d4efa79 +Author: GNOME Translation Robot +Date: Sat Jun 11 07:22:43 2016 +0000 + + Updated Scottish Gaelic translation + + po/gd.po | 1196 +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 706 insertions(+), 490 deletions(-) + +commit 44c16fc6ff31bfc593a5fccf8683ebeb5f96ec88 +Author: Bastien Nocera +Date: Fri Jun 10 16:55:08 2016 +0200 + + network: Use the correct type for the "ssid" property + + Set the Hotspot SSID property correctly for libnm 1.2. + + panels/network/net-device-wifi.c | 38 ++++++++++++++------------------------ + 1 file changed, 14 insertions(+), 24 deletions(-) + +commit e66941753b3e1586cfe9bad4df11da68ee34ca21 +Author: Bastien Nocera +Date: Fri Jun 10 16:19:46 2016 +0200 + + network: Fix hotspot silently failing with long hostname + + By truncating the SSID to 32 bytes. + + network-cc-panel-WARNING **: Failed to add new connection: (32) 802-11-wireless.ssid: SSID length is out of range <1-32> bytes + + See https://bugzilla.redhat.com/show_bug.cgi?id=1309331 + + panels/network/net-device-wifi.c | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 1ce4af426763fdbd09873f68636afaf248ffd69e +Author: Bastien Nocera +Date: Fri Jun 10 16:15:52 2016 +0200 + + shell: Add PrettyHostname to SSID helper + + For use in the network panel. Comes with tests! + + po/POTFILES.in | 1 + + shell/Makefile.am | 3 ++- + shell/hostname-helper.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + shell/hostname-helper.h | 1 + + shell/ssids-test.txt | 3 +++ + shell/test-hostname.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 96 insertions(+), 1 deletion(-) + +commit cf3da38691b3d309be3c641c7151268dbd91983a +Author: Bastien Nocera +Date: Fri Jun 10 15:31:00 2016 +0200 + + po: Add an unused source to the skip file + + po/POTFILES.skip | 1 + + 1 file changed, 1 insertion(+) + +commit af5f2f3d7375c9a14bf91ddd45978ae47fca497d +Author: Bastien Nocera +Date: Fri Jun 10 15:02:57 2016 +0200 + + shell: Port tests to GTest + + shell/Makefile.am | 6 +++-- + shell/alt/Makefile.am | 2 ++ + shell/appdata/Makefile.am | 2 ++ + shell/test-hostname.c | 66 +++++++++++++++++++++++++++++------------------ + 4 files changed, 49 insertions(+), 27 deletions(-) + +commit e48b3cc061d3ee717248e738dc94985f907793be +Author: Bastien Nocera +Date: Fri Jun 10 14:57:04 2016 +0200 + + printers: Port tests to GTest + + panels/printers/Makefile.am | 11 ++--- + panels/printers/test-canonicalization.c | 71 +++++++++++++++++++-------------- + panels/printers/test-shift.c | 71 +++++++++++++++++++-------------- + 3 files changed, 88 insertions(+), 65 deletions(-) + +commit 1428b52fdc0e240d65ecd9408612fe1eaffe52d9 +Author: Bastien Nocera +Date: Fri Jun 10 14:33:32 2016 +0200 + + datetime: Port tests to GTest + + test-timezone is still disabled though, as it is too noisy still. + + panels/datetime/Makefile.am | 14 ++++------- + panels/datetime/po-timezones/Makefile.am | 2 ++ + panels/datetime/test-endianess.c | 38 +++++++++++++++++----------- + panels/datetime/test-timezone-gfx.c | 43 +++++++++++++++++++------------- + panels/datetime/test-timezone.c | 23 ++++++++++++----- + 5 files changed, 74 insertions(+), 46 deletions(-) + +commit d18411dbe25bea7f71408dbffb20845e363bd158 +Author: Bastien Nocera +Date: Fri Jun 10 14:32:11 2016 +0200 + + build: Add GTest Makefile snippet + + Makefile.decl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit 1af73218fc3f97a3e0617c3c16605351c3a6332b +Author: Cosimo Cecchi +Date: Thu Jun 9 17:02:47 2016 -0700 + + display: fix accidentally commented out code + + Not sure why I commented this out before pushing 47dcfee8 -- whoops! + + panels/display/cc-display-panel.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 9067983174b25dc64ccc1a46cdf69491e40dc5a1 +Author: Debarshi Ray +Date: Wed Jun 8 17:09:13 2016 +0200 + + online-accounts: Add a Calendar group + + This will be useful when we add a CalDAV provider. + + https://bugzilla.gnome.org/show_bug.cgi?id=767401 + + .../online-accounts/cc-online-accounts-add-account-dialog.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 0129d8a6ae8bdd93ddca49b5ffde3bf2f00e72dd +Author: Debarshi Ray +Date: Wed Jun 8 17:07:47 2016 +0200 + + online-accounts: Don't use deprecated GoaProviderGroup API + + https://bugzilla.gnome.org/show_bug.cgi?id=767401 + + .../cc-online-accounts-add-account-dialog.c | 37 ++++++++++++---------- + 1 file changed, 20 insertions(+), 17 deletions(-) + +commit ec1f4a0210c9f88c52ac23d2ca53534eb39e462b +Author: Daniel Mustieles +Date: Thu Jun 9 11:49:57 2016 +0000 + + Updated Spanish translation + + po/es.po | 398 +++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 273 insertions(+), 125 deletions(-) + +commit 118503f248bbc10850f9cb56e18bf3e92e7d29b0 +Author: Piotr Drąg +Date: Wed Jun 8 14:58:06 2016 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8f359fbe5e8551f64319e28d7e8fe6747bccbae1 +Author: Bastien Nocera +Date: Tue Jun 7 18:42:31 2016 +0200 + + network: Remember "Ignore CA certificate" + + The CA certificate, when not needed, is saved somewhere in the same + GSettings schema used by nm-connection-editor. + + panels/network/connection-editor/net-connection-editor.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9d4800b5b263cdab4c6f6eb76e2c6aaec5b47176 +Author: Bastien Nocera +Date: Tue Jun 7 17:26:41 2016 +0200 + + network: Fix warning when BSSID is empty + + libnm-CRITICAL **: _nm_utils_hwaddr_to_dbus: assertion 'len > 0 && len + <= NM_UTILS_HWADDR_LEN_MAX' failed + + panels/network/connection-editor/ce-page-wifi.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8386631dcdcf2eb62ca1de726ccfb15e6322a5e1 +Author: Bastien Nocera +Date: Tue Jun 7 16:53:04 2016 +0200 + + network: Update wireless-security from network-manager-applet + + To replace the WIP code that landed earlier. + + panels/network/wireless-security/eap-method-fast.c | 12 +++++------ + panels/network/wireless-security/eap-method-leap.c | 11 +++++----- + .../network/wireless-security/eap-method-simple.c | 15 ++++++------- + panels/network/wireless-security/eap-method-tls.c | 25 +++++++++++++--------- + panels/network/wireless-security/eap-method.c | 11 +++++----- + panels/network/wireless-security/ws-leap.c | 11 +++++----- + 6 files changed, 42 insertions(+), 43 deletions(-) + +commit b9d619fb547a982d3a7159d56b53416295293ac8 +Author: Bastien Nocera +Date: Tue Jun 7 16:52:24 2016 +0200 + + network: Update the script to update from nm-applet again + + Separating out the UI from the backend code. + + panels/network/wireless-security/Makefile.am | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit f5bcb2ed83ba420a3d5845a3857a062b50976601 +Author: Bastien Nocera +Date: Tue Jun 7 15:39:36 2016 +0200 + + network: Fix crash in VPN when removing Wi-Fi connection + + Wrong number of arguments to the callback. + + panels/network/net-vpn.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7250d49513193ea78abe5c5f71c50ef742a45b73 +Author: Bastien Nocera +Date: Tue Jun 7 15:38:32 2016 +0200 + + network: Fix warning when Wi-Fi connections are removed + + Bug introduced with the fix from 199bd2c. For Wi-Fi, a row might not + have an associated connection. + + panels/network/net-device-wifi.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 1428912da0cc3cb6aea65d41105c35672d2112c3 +Author: Dan Williams +Date: Fri Jun 3 12:08:31 2016 -0500 + + network: fix some SSID escaping issues + + nm_utils_escape_ssid() should only be used for debugging purposes, + but was used in one place for UI display and another place + for doing actual AP comparison. Instead, the comparison should + just operate on the SSID bytes, and the UI display should use + nm_utils_ssid_to_utf8() which tries to interpret non-ASCII + characters for better display. + + https://bugzilla.gnome.org/show_bug.cgi?id=767205 + https://bugzilla.redhat.com/show_bug.cgi?id=1336714 + + panels/network/net-device-wifi.c | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit 764208d8e9fe9374dcbc813cc36e1bbef3dbe58d +Author: Bastien Nocera +Date: Tue Jun 7 14:34:37 2016 +0200 + + network: Add missing nm-default.h file + + panels/network/wireless-security/Makefile.am | 3 +- + panels/network/wireless-security/nm-default.h | 47 +++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+), 1 deletion(-) + +commit c316e301ce48a5a066142ae57ae4c14e0c568591 +Author: Bastien Nocera +Date: Tue Jun 7 14:24:56 2016 +0200 + + network: Separate UI changes from code changes + + panels/network/wireless-security/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 27c9aff3af4e5b5d9ae396fa2ac4f2fed82c761e +Author: Bastien Nocera +Date: Tue Jun 7 13:09:44 2016 +0200 + + network: Update wireless-security UI from network-manager-applet + + The list of changes compared to the nm-connection-editor code is: + - Remove ":" from the control labels + - Right-justify the control labels + - Shrink the column spacing to 6 + + panels/network/wireless-security/Makefile.am | 3 +- + .../network/wireless-security/eap-method-fast.ui | 14 +- + .../network/wireless-security/eap-method-leap.ui | 10 +- + .../network/wireless-security/eap-method-peap.ui | 18 +- + .../network/wireless-security/eap-method-simple.ui | 10 +- + panels/network/wireless-security/eap-method-tls.ui | 22 +- + .../network/wireless-security/eap-method-ttls.ui | 14 +- + .../nm-connection-editor-ui-to-network-panel.patch | 495 +++++++++++++++++++++ + panels/network/wireless-security/ws-dynamic-wep.ui | 6 +- + panels/network/wireless-security/ws-leap.ui | 10 +- + panels/network/wireless-security/ws-wep-key.ui | 14 +- + panels/network/wireless-security/ws-wpa-eap.ui | 6 +- + panels/network/wireless-security/ws-wpa-psk.ui | 10 +- + 13 files changed, 564 insertions(+), 68 deletions(-) + +commit 92b044ba7fe438cb707ebba4bbc893d271a2e7c0 +Author: Bastien Nocera +Date: Tue Jun 7 12:03:22 2016 +0200 + + network: Update wireless-security from network-manager-applet + + panels/network/wireless-security/eap-method-fast.c | 42 +- + .../network/wireless-security/eap-method-fast.ui | 73 +-- + panels/network/wireless-security/eap-method-leap.c | 176 +++++-- + .../network/wireless-security/eap-method-leap.ui | 12 +- + panels/network/wireless-security/eap-method-peap.c | 82 +++- + .../network/wireless-security/eap-method-peap.ui | 56 ++- + .../network/wireless-security/eap-method-simple.c | 352 ++++++++------ + .../network/wireless-security/eap-method-simple.h | 23 +- + .../network/wireless-security/eap-method-simple.ui | 63 +-- + panels/network/wireless-security/eap-method-tls.c | 122 +++-- + panels/network/wireless-security/eap-method-tls.ui | 62 ++- + panels/network/wireless-security/eap-method-ttls.c | 117 ++++- + .../network/wireless-security/eap-method-ttls.ui | 44 +- + panels/network/wireless-security/eap-method.c | 518 +++++++++++---------- + panels/network/wireless-security/eap-method.h | 52 ++- + panels/network/wireless-security/helpers.c | 5 +- + panels/network/wireless-security/helpers.h | 13 +- + .../network/wireless-security/wireless-security.c | 174 ++++--- + .../network/wireless-security/wireless-security.h | 39 +- + panels/network/wireless-security/ws-dynamic-wep.c | 23 +- + panels/network/wireless-security/ws-dynamic-wep.h | 8 +- + panels/network/wireless-security/ws-dynamic-wep.ui | 6 +- + panels/network/wireless-security/ws-leap.c | 45 +- + panels/network/wireless-security/ws-leap.h | 8 +- + panels/network/wireless-security/ws-leap.ui | 12 +- + panels/network/wireless-security/ws-wep-key.c | 97 ++-- + panels/network/wireless-security/ws-wep-key.h | 8 +- + panels/network/wireless-security/ws-wep-key.ui | 16 +- + panels/network/wireless-security/ws-wpa-eap.c | 18 +- + panels/network/wireless-security/ws-wpa-eap.h | 8 +- + panels/network/wireless-security/ws-wpa-eap.ui | 6 +- + panels/network/wireless-security/ws-wpa-psk.c | 43 +- + panels/network/wireless-security/ws-wpa-psk.h | 10 +- + panels/network/wireless-security/ws-wpa-psk.ui | 11 +- + 34 files changed, 1457 insertions(+), 887 deletions(-) + +commit 36576a5cb60661c371fb796ea6a3cd16e67e0e74 +Author: Bastien Nocera +Date: Tue Jun 7 11:25:04 2016 +0200 + + network: Update security page for recent changes + + panels/network/connection-editor/ce-page-security.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit e6bccd664666d358d006b62fda7c0466634d48c9 +Author: Bastien Nocera +Date: Tue Jun 7 11:44:36 2016 +0200 + + network: Update wireless-security patch + + panels/network/wireless-security/Makefile.am | 2 +- + .../nm-connection-editor-to-network-panel.patch | 312 ++++++++++++--------- + 2 files changed, 178 insertions(+), 136 deletions(-) + +commit 25feb13ee9ac7a3d93dc3696cca45235873a5de4 +Author: Bastien Nocera +Date: Tue Jun 7 11:53:00 2016 +0200 + + network: Remove nag-user-dialog.ui + + It's now unused. + + .../network/wireless-security/nag-user-dialog.ui | 191 --------------------- + .../wireless-security.gresource.xml | 1 - + 2 files changed, 192 deletions(-) + +commit 7cc463a067e3358a8642e41040a68b4a28aef1c7 +Author: Bastien Nocera +Date: Tue Jun 7 11:24:29 2016 +0200 + + network: Automate updating wireless-security UI files + + from network-manager-applet. + + panels/network/wireless-security/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 280cff67db82c27cef7016ef2a62e2da67f8b725 +Author: Bastien Nocera +Date: Tue Jun 7 11:23:16 2016 +0200 + + network: Add utils from network-manager-applet + + The minimum necessary utilities from + network-manager-applet/src/utils/utils.[ch] + for the wireless-security rebase. + + panels/network/wireless-security/Makefile.am | 4 +- + panels/network/wireless-security/utils.c | 77 ++++++++++++++++++++++++++++ + panels/network/wireless-security/utils.h | 44 ++++++++++++++++ + 3 files changed, 124 insertions(+), 1 deletion(-) + +commit 199bd2c343fed1b9efd34a3cb171ef1043f3dadc +Author: Bastien Nocera +Date: Tue Jun 7 13:06:57 2016 +0200 + + network: Fix removed connections not disappearing + + A regression introduced in commit 9183d34, when we ported to libnm 1.2. + + panels/network/net-device-wifi.c | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit 1a889c89fdf2c761ec75bf78801db7906959e4bb +Author: Daniel Mustieles +Date: Mon Jun 6 07:11:00 2016 +0000 + + Updated Spanish translation + + po/es.po | 155 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 76 insertions(+), 79 deletions(-) + +commit ba5079b7b1de46e1215ee35c148f86c7e1b82b2f +Author: Baurzhan Muftakhidinov +Date: Mon Jun 6 07:09:48 2016 +0000 + + Updated Kazakh translation + + po/kk.po | 883 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 447 insertions(+), 436 deletions(-) + +commit d141196282154092d61c74c59b3a6230ba98b174 +Author: Piotr Drąg +Date: Fri Jun 3 18:18:35 2016 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 57ba49a13753f3e03e4b7e798a8b155ae24153b5 +Author: Georges Basile Stavracas Neto +Date: Thu May 26 13:08:40 2016 -0300 + + window: reimplement search + + We previously had a dedicate view for handling search, + based on model filtering and a custom panel to display + that differently. + + After moving to GtkListBox, search can be trivially + done by using a filtering function, and widgets can + be fine-tuned to display extra information. + + This patch, then, reimplements the search using a filtering + function over the panels' list. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 317 ++++++++------------------------------------------ + shell/window.ui | 2 +- + 2 files changed, 48 insertions(+), 271 deletions(-) + +commit b6ab2a492237e051da8e8885a674063137c6c1f4 +Author: Georges Basile Stavracas Neto +Date: Tue May 24 23:52:02 2016 -0300 + + window: use a listbox + + The latest mockups use a list instead of icon grid. This + commit, after all the work porting the current UI to use + a side list, replacing the temporary icon grid. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 483 +++++++++++++++----------------------------------- + shell/window.ui | 20 +-- + 2 files changed, 144 insertions(+), 359 deletions(-) + +commit 9d06a0f8587d9d43ea0f405a351b9d77af3af9ac +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:48:55 2016 -0300 + + window: add a placeholder view + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/window.ui | 50 ++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 44 insertions(+), 6 deletions(-) + +commit 2590e38905e6ded5f8159b994f86da26476a6f09 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:35:26 2016 -0300 + + window: set the default width and height + + Since the window can shrink down too much, it makes + sense for us to have a sane default width and height. + + 720x480 was chosen because that's the default resolution + for CRT TVs. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/window.ui | 2 ++ + 1 file changed, 2 insertions(+) + +commit a267ebd9a23a748c4c1cf48e1bcb97b4bd7155b5 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:25:06 2016 -0300 + + window: make the sidelist and first headerbar horizontally equal + + The first headerbar and the sidelist should stay synchronized, + and this commit does so by setting the width request of the + headerbar to the allocated width of the sidelist. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 10 ++++++++++ + shell/window.ui | 1 + + 2 files changed, 11 insertions(+) + +commit c0bdc06d1ec8faf019f79f54b09a0964b2c9bcda +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:18:57 2016 -0300 + + window: introduce the second headerbar + + This commit introduces the second headerbar, where the + panel title and the panel widgets are displayed. It also + adapts the code to use the second headerbar when needed. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 7 +++---- + shell/window.ui | 16 ++++++++++++++++ + 2 files changed, 19 insertions(+), 4 deletions(-) + +commit fa1a6b3457da2ceaf07c25dac5fd54a117c81278 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:11:31 2016 -0300 + + window: pack the headerbar inside a box + + In the future commits, we'll use two headerbars to visually + separate the panel area and the sidelist. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 6 ++-- + shell/window.ui | 91 +++++++++++++++++++++++++++------------------------ + 2 files changed, 52 insertions(+), 45 deletions(-) + +commit df086d4db9c0038f4c0a2380e86a9d65eab5563a +Author: Georges Basile Stavracas Neto +Date: Sun May 22 14:05:09 2016 -0300 + + window: put the search button in the start of the headerbar + + Since the search bar has been moved to above the sidelist, it + makes sense to have the search button on the start of the + headerbar, strengthening the relation between both widgets. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/window.ui | 4 ---- + 1 file changed, 4 deletions(-) + +commit 55cc4c3a919aad840c1ebb78d6bad31e0273fdfd +Author: Georges Basile Stavracas Neto +Date: Sun May 22 13:32:23 2016 -0300 + + window: make it a template class + + In order to prepare ourselves for the future changes, + having the window as a template class is hugely advantageous + for we'll be able to modify the interface much more + quickly and cleanly. + + This commit makes the window a template class, and only + that. No behavioral changes, nor new features were + introduced here. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/Makefile.am | 1 + + shell/alt/cc-window.c | 229 +++++++++---------------------- + shell/gnome-control-center.gresource.xml | 1 + + shell/window.ui | 215 +++++++++++++++++++++++++++++ + 4 files changed, 282 insertions(+), 164 deletions(-) + +commit 6f38ca83c84107f99b025d49ed7a45c8a1ad531b +Author: Georges Basile Stavracas Neto +Date: Sun May 22 11:59:58 2016 -0300 + + window: remove the small screen code + + Because the old layout was never meant to scale well on low + resolution displays, we had to introduce code that adapts the + window to be usable on low res screens. + + The problem with this code is that it still doesn't scale down + very well for really low resolution screens. Partially because + of the layout itself (which, again, was never meant to), partially + because the panels request a size bigger than e.g. 720x480. Now, + this is an important feature and we need to support that low + resolution by default. + + To push this constraint forward, remove the code that managed a + custom mode for low resolution screens. From now on, the Control + Center shall be adapted to scale well on any screen sizes. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 118 -------------------------------------------------- + 1 file changed, 118 deletions(-) + +commit 77ef6c4bbde0d383fbd0be5693f524b17bea1e46 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 11:53:04 2016 -0300 + + window: remove the fixed width request code + + Having a fixed width is bad for various reasons. First, it's + harder to deal with low resolution screens, which was fixed + by adding an entire new mode just to deal with it. Second, + because it may not scale well for big resolutions. + + Fix that by removing the code that handles the fixed width. + The next commit will completely remove the code that manages + small screens, in the hope that the new layout will handle + both cases well by design. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +commit 2f844e2a6ab2eff5cc987a32a4aff45e6cc8cdbc +Author: Georges Basile Stavracas Neto +Date: Sun May 22 11:50:18 2016 -0300 + + window: make the panels' stack expand + + This way, panels can fill the most of the screen, which + is the desired behavior proposed by the mockups. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit c47bc08b0645511b773864c8fc43d66b8db7dff3 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 11:35:59 2016 -0300 + + window: separate the panel selector + + To progressively achieve the sidelist, let's start by moving + the current iconview selector to the side and then turning + it into a GtkListBox. + + This commit, then, moves the iconviews' list to the start of + the horizontal box added in the previous commit. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit c006198434c6e0f8ecd2304b787c72b2a7ee7fa1 +Author: Georges Basile Stavracas Neto +Date: Sun May 22 11:26:53 2016 -0300 + + window: add a horizontal box before the stack + + The horizontal box will be used in the future commits + to separate the sidelist from the stack. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 2bb6d441a7c028ab196e9cde806ff74b2b9a1de3 +Author: Georges Basile Stavracas Neto +Date: Sat May 28 13:25:13 2016 -0300 + + build: create another executable for the new layout + + This way, we can test both layouts in parallel and, in + case something goes wrong, we always have to old layout + as a fallback. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + configure.ac | 3 ++- + search-provider/Makefile.am | 6 ++---- + shell/Makefile.am | 38 +++++++++++++++++++++++++++++++++----- + shell/alt/Makefile.am | 19 +++++++++++++++++++ + 4 files changed, 56 insertions(+), 10 deletions(-) + +commit fe3a23702f195892bd7a05055ec8bef4460b58bb +Author: Georges Basile Stavracas Neto +Date: Sat May 28 12:44:36 2016 -0300 + + build: copy CcWindow in alt/ directory + + The copied files are exact copies of shell/cc-window.c and + shell/cc-window.h, and they'll be used to implement the restyled + shell as an alternative binary. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/alt/cc-window.c | 1600 +++++++++++++++++++++++++++++++++++++++++++++++++ + shell/alt/cc-window.h | 46 ++ + 2 files changed, 1646 insertions(+) + +commit 71d39a48365421837aa905396c22b904761b9a1c +Author: Georges Basile Stavracas Neto +Date: Sun May 22 00:40:55 2016 -0300 + + window: turn into a final class + + This commit updates the code to use the recently + introduced API. The new functions improve the + legibility and maintainability of the code, and + makes it easier to work on new features. + + https://bugzilla.gnome.org/show_bug.cgi?id=766922 + + shell/cc-window.c | 472 ++++++++++++++++++++++++++---------------------------- + shell/cc-window.h | 24 +-- + 2 files changed, 227 insertions(+), 269 deletions(-) + +commit d1b8747270ebef0615a372b90d6ae14beaad5fb2 +Author: Reinout van Schouwen +Date: Wed Jun 1 23:01:59 2016 +0200 + + Updated Dutch translation by Justin van Steijn + + po/nl.po | 5750 ++++++++++++++------------------------------------------------ + 1 file changed, 1261 insertions(+), 4489 deletions(-) + +commit efc887c419740eb99dd6864db96aef20efeaef21 +Author: Felipe Borges +Date: Wed May 25 10:21:50 2016 +0200 + + user-accounts: use radio buttons for account type in Add User dialog + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 56 ++++++++++++++++------------- + panels/user-accounts/um-account-dialog.c | 10 ++---- + 2 files changed, 34 insertions(+), 32 deletions(-) + +commit 1a6d7167743399e9274bd9ea398557a6ba08029d +Author: Felipe Borges +Date: Tue May 31 12:00:47 2016 +0200 + + user-accounts: use radio buttons for account type + + According to the mockups at + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 56 ++++++++++++++++++++--- + panels/user-accounts/um-user-panel.c | 42 +++++++++-------- + 2 files changed, 73 insertions(+), 25 deletions(-) + +commit 5b3a2cc649601a83720c36cb0c4702678b70cee1 +Author: Felipe Borges +Date: Tue May 24 14:50:06 2016 +0200 + + user-accounts: redesign offline mode for enterprise login + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +commit c0a6ce08bffdb8c47dd7d86a6b89540afeb624a0 +Author: Daniel Mustieles +Date: Wed Jun 1 10:54:43 2016 +0000 + + Updated Spanish translation + + po/es.po | 832 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 420 insertions(+), 412 deletions(-) + +commit 941282a8de251da48b8e26b88fe5d83918008fcd +Author: Felipe Borges +Date: Tue May 31 12:06:01 2016 +0200 + + user-accounts: drop "Login Options" label + + According to the mockups at + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/user-accounts-dialog.ui | 33 +++++------------------ + 1 file changed, 7 insertions(+), 26 deletions(-) + +commit a848da934838d520daa188fe8d81660a14a9bc3d +Author: Felipe Borges +Date: Wed May 25 10:48:56 2016 +0200 + + user-accounts: align entries in Add User dialog + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a70888f13221cd016df89a74a1d406d10fe82ca5 +Author: Felipe Borges +Date: Tue May 24 15:43:02 2016 +0200 + + user-accounts: move arrows to start in login history dialog + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/history-dialog.ui | 59 +++++++++++++++++------------ + 1 file changed, 34 insertions(+), 25 deletions(-) + +commit 6d24ed5ae90ab3563fccee7216519ace5eed2b5b +Author: Felipe Borges +Date: Tue May 24 10:50:30 2016 +0200 + + user-accounts: update strings to new design + + https://wiki.gnome.org/Design/SystemSettings/UserAccounts + + https://bugzilla.gnome.org/show_bug.cgi?id=767065 + + panels/user-accounts/data/account-dialog.ui | 9 ++++----- + panels/user-accounts/data/password-dialog.ui | 2 +- + panels/user-accounts/pw-utils.c | 2 +- + panels/user-accounts/um-account-dialog.c | 2 +- + panels/user-accounts/um-utils.c | 5 ++--- + 5 files changed, 9 insertions(+), 11 deletions(-) + +commit 7e4a51cb37747975f780b40a89d40424433a8bb9 +Author: Cédric Valmary +Date: Mon May 30 18:40:59 2016 +0000 + + Updated Occitan translation + + po/oc.po | 187 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 91 insertions(+), 96 deletions(-) + +commit 0a37eeb7d4a6321b3c29b265fb587947c734d6de +Author: Tiago Santos +Date: Mon May 30 14:29:19 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 569 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 285 insertions(+), 284 deletions(-) + +commit e67cd42a45ab7c299cf5caec28a1d52b18bf1a48 +Author: Felipe Borges +Date: Mon May 30 15:32:38 2016 +0200 + + search: use-header-bar for Search Locations dialog + + https://bugzilla.gnome.org/show_bug.cgi?id=766513 + + panels/search/cc-search-locations-dialog.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f473ec45c7f3545505d157867bb662e2a87933a2 +Author: Felipe Borges +Date: Mon May 16 15:38:12 2016 +0200 + + search: introduce the new Search Locations dialog + + https://wiki.gnome.org/Design/SystemSettings/Search + + https://bugzilla.gnome.org/show_bug.cgi?id=766513 + + panels/search/cc-search-locations-dialog.c | 293 ++++++++++++----------------- + panels/search/cc-search-locations-dialog.h | 10 +- + panels/search/cc-search-panel.c | 4 +- + panels/search/search-locations-dialog.ui | 137 +++++++++----- + 4 files changed, 226 insertions(+), 218 deletions(-) + +commit 8bc4156375748a286cc8307a3fdc956a38c75b68 +Author: Milo Casagrande +Date: Sun May 29 13:26:11 2016 +0000 + + Updated Italian translation + (cherry picked from commit e060fcf05b5fb972cb14c950d66a13a6559c3696) + + po/it.po | 252 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 126 insertions(+), 126 deletions(-) + +commit e39ef0eea78876bcbe1a6d0735e9d39fdd7a54ef +Author: Bastien Nocera +Date: Sat May 28 21:50:53 2016 +0200 + + power: Fix build on non-Linux systems + + In 8400d3e, we ported the power panel to libnm 1.2, but at the same + time, made libnm a hard requirement. This is a problem on non-Linux + systems. + + See https://bugzilla.gnome.org/show_bug.cgi?id=765910#c31 + + configure.ac | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit fb44ea3908c30d0126116ff89f5c7bd4e91fc0a9 +Author: Friedrich Herbst +Date: Sat May 28 18:55:09 2016 +0000 + + Updated German translation + + po/de.po | 652 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 354 insertions(+), 298 deletions(-) + +commit 9183d3494788486600856df5115f11486ecb20a8 +Author: Bastien Nocera +Date: Fri Apr 29 16:05:54 2016 +0200 + + network: Port to libnm 1.2 + + We also remove support for WiMAX (now unsupported by NetworkManager), + and InfiniBand (Enterprise feature), and the use of + the deprecated NM_SETTING_WIRELESS_SEC property. + + With help from network-manager-applet patches by Jiří Klimeš and + Dan Winship. + + https://bugzilla.gnome.org/show_bug.cgi?id=765910 + + configure.ac | 12 +- + panels/network/cc-network-panel.c | 85 ++---- + .../connection-editor/ce-page-8021x-security.c | 13 +- + .../connection-editor/ce-page-8021x-security.h | 5 +- + panels/network/connection-editor/ce-page-details.c | 10 +- + panels/network/connection-editor/ce-page-details.h | 1 - + .../network/connection-editor/ce-page-ethernet.c | 55 ++-- + .../network/connection-editor/ce-page-ethernet.h | 5 +- + panels/network/connection-editor/ce-page-ip4.c | 164 +++++------ + panels/network/connection-editor/ce-page-ip4.h | 5 +- + panels/network/connection-editor/ce-page-ip6.c | 172 +++++------- + panels/network/connection-editor/ce-page-ip6.h | 5 +- + panels/network/connection-editor/ce-page-reset.c | 2 - + panels/network/connection-editor/ce-page-reset.h | 1 - + .../network/connection-editor/ce-page-security.c | 38 +-- + .../network/connection-editor/ce-page-security.h | 3 +- + panels/network/connection-editor/ce-page-vpn.c | 23 +- + panels/network/connection-editor/ce-page-vpn.h | 13 +- + panels/network/connection-editor/ce-page-wifi.c | 85 ++---- + panels/network/connection-editor/ce-page-wifi.h | 3 +- + panels/network/connection-editor/ce-page.c | 208 +++++++------- + panels/network/connection-editor/ce-page.h | 18 +- + .../network/connection-editor/firewall-helpers.h | 2 +- + .../connection-editor/net-connection-editor.c | 223 ++++++++------- + .../connection-editor/net-connection-editor.h | 8 +- + panels/network/connection-editor/vpn-helpers.c | 205 +++++--------- + panels/network/connection-editor/vpn-helpers.h | 9 +- + panels/network/net-device-ethernet.c | 83 +++--- + panels/network/net-device-mobile.c | 60 ++-- + panels/network/net-device-mobile.h | 2 +- + panels/network/net-device-simple.c | 21 +- + panels/network/net-device-wifi.c | 305 ++++++++++++--------- + panels/network/net-device.c | 72 +---- + panels/network/net-device.h | 2 +- + panels/network/net-object.c | 23 -- + panels/network/net-object.h | 4 +- + panels/network/net-vpn.c | 67 +++-- + panels/network/net-vpn.h | 4 +- + panels/network/network-dialogs.c | 120 ++++---- + panels/network/network-dialogs.h | 13 +- + panels/network/panel-common.c | 119 +++----- + panels/network/panel-common.h | 10 +- + panels/network/wireless-security/eap-method-fast.c | 3 +- + panels/network/wireless-security/eap-method-leap.c | 2 +- + panels/network/wireless-security/eap-method-peap.c | 4 +- + .../network/wireless-security/eap-method-simple.c | 3 +- + panels/network/wireless-security/eap-method-tls.c | 3 +- + panels/network/wireless-security/eap-method-ttls.c | 4 +- + panels/network/wireless-security/eap-method.c | 4 +- + panels/network/wireless-security/eap-method.h | 4 +- + panels/network/wireless-security/helpers.h | 3 +- + .../network/wireless-security/wireless-security.c | 14 +- + .../network/wireless-security/wireless-security.h | 7 +- + panels/network/wireless-security/ws-dynamic-wep.c | 4 +- + panels/network/wireless-security/ws-dynamic-wep.h | 2 +- + panels/network/wireless-security/ws-leap.c | 10 +- + panels/network/wireless-security/ws-leap.h | 2 +- + panels/network/wireless-security/ws-wep-key.c | 11 +- + panels/network/wireless-security/ws-wep-key.h | 2 +- + panels/network/wireless-security/ws-wpa-eap.c | 4 +- + panels/network/wireless-security/ws-wpa-eap.h | 2 +- + panels/network/wireless-security/ws-wpa-psk.c | 6 +- + 62 files changed, 949 insertions(+), 1423 deletions(-) + +commit 8400d3ed81d15c7406e14908437033a72348fd95 +Author: Bastien Nocera +Date: Mon May 2 15:17:20 2016 +0200 + + power: Port to libnm 1.2 + + And make the NMClient instantiation async now that the API permits it. + + https://bugzilla.gnome.org/show_bug.cgi?id=765910 + + configure.ac | 1 + + panels/power/cc-power-panel.c | 55 ++++++++++++++++++++++++++++++++++--------- + 2 files changed, 45 insertions(+), 11 deletions(-) + +commit 54acab12c791e98d10e1b779a825b9f6e401cc22 +Author: Tiago Santos +Date: Thu May 26 13:47:00 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 110 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 54 insertions(+), 56 deletions(-) + +commit 8861d4409921235c76b8792db42cd6f42d903a7a +Author: Bastien Nocera +Date: Fri Apr 29 14:20:02 2016 +0200 + + network: Remove now unused virtual devices support + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + panels/network/Makefile.am | 2 - + panels/network/cc-network-panel.c | 66 +---- + panels/network/net-virtual-device.c | 468 ------------------------------------ + panels/network/net-virtual-device.h | 68 ------ + po/POTFILES.in | 1 - + 5 files changed, 3 insertions(+), 602 deletions(-) + +commit da96effab73302de878ee70093cae088770e288a +Author: Bastien Nocera +Date: Fri Apr 29 14:15:16 2016 +0200 + + network: Remove HAVE_NM_UNSTABLE check + + We don't have any code that relies on it anymore. + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + configure.ac | 7 ------- + panels/network/cc-network-panel.c | 2 -- + 2 files changed, 9 deletions(-) + +commit a4729411b564ae1e69522101984818a11ca94efe +Author: Bastien Nocera +Date: Fri Apr 29 13:58:00 2016 +0200 + + network: Remove VLAN support + + It is supported by Cockpit already: + https://github.com/cockpit-project/cockpit/issues/1007 + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + panels/network/cc-network-panel.c | 2 -- + panels/network/connection-editor/net-connection-editor.c | 1 - + panels/network/gnome-network-panel.desktop.in.in | 2 +- + 3 files changed, 1 insertion(+), 4 deletions(-) + +commit 99743428656618b64e5115e2216339676c0e7510 +Author: Bastien Nocera +Date: Fri Apr 29 13:54:16 2016 +0200 + + network: Remove team support + + It will be supported by Cockpit in the near future: + https://github.com/cockpit-project/cockpit/issues/4330 + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + panels/network/Makefile.am | 8 +- + .../connection-editor/net-connection-editor.c | 3 - + panels/network/net-device-team.c | 190 --------------------- + panels/network/net-device-team.h | 58 ------- + po/POTFILES.in | 1 - + 5 files changed, 1 insertion(+), 259 deletions(-) + +commit b38bf8b67207b55df9d9c1f9433699c5b0395c89 +Author: Bastien Nocera +Date: Fri Apr 29 13:52:45 2016 +0200 + + network: Remove bond support + + It is supported by Cockpit already: + https://github.com/cockpit-project/cockpit/issues/458 + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + panels/network/Makefile.am | 2 - + panels/network/cc-network-panel.c | 11 +- + .../connection-editor/net-connection-editor.c | 1 - + panels/network/gnome-network-panel.desktop.in.in | 2 +- + panels/network/net-device-bond.c | 190 --------------------- + panels/network/net-device-bond.h | 58 ------- + po/POTFILES.in | 1 - + 7 files changed, 2 insertions(+), 263 deletions(-) + +commit 20b634b4544d1cfa62cf37932b20396198fd84d9 +Author: Bastien Nocera +Date: Fri Apr 29 13:50:41 2016 +0200 + + network: Remove bridge support + + It is supported by Cockpit already: + https://github.com/cockpit-project/cockpit/issues/459 + + https://bugzilla.gnome.org/show_bug.cgi?id=747443 + + panels/network/Makefile.am | 2 - + panels/network/cc-network-panel.c | 4 - + .../connection-editor/net-connection-editor.c | 1 - + panels/network/gnome-network-panel.desktop.in.in | 2 +- + panels/network/net-device-bridge.c | 190 --------------------- + panels/network/net-device-bridge.h | 58 ------- + po/POTFILES.in | 1 - + 7 files changed, 1 insertion(+), 257 deletions(-) + +commit b3199dd641602474c1a0145eac4de441827c61d2 +Author: Cosimo Cecchi +Date: Tue May 24 11:10:34 2016 -0700 + + region: remove handling of current input source GSetting + + This is not read anymore by gnome-shell or gnome-settings-daemon, and + there's no point for gnome-control-center to read or write it anymore. + + https://bugzilla.gnome.org/show_bug.cgi?id=766846 + + panels/region/cc-region-panel.c | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +commit 02298c1d431a203fffb9e717dd62a60e8f526475 +Author: Jordi Mas +Date: Sun May 22 19:33:20 2016 +0200 + + Fix to Catalan translation + + po/ca.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b0b0cd2afe1de469975517fbac6394591786b9d +Author: Tiago Santos +Date: Fri May 20 21:31:06 2016 +0000 + + Updated Portuguese translation + + po/pt.po | 1641 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 901 insertions(+), 740 deletions(-) + +commit a751850eb249c4a219ab3617e48d3d0bd11d8f6e +Author: Baurzhan Muftakhidinov +Date: Fri May 20 08:16:21 2016 +0000 + + Updated Kazakh translation + + po/kk.po | 654 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 352 insertions(+), 302 deletions(-) + +commit ebc8b16c4f96296a78a9a3232afbb9919dd8d78e +Author: Dušan Kazik +Date: Wed May 18 18:55:10 2016 +0000 + + Updated Slovak translation + + po/sk.po | 654 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 355 insertions(+), 299 deletions(-) + +commit 2ae2700612d7398a97ab7e89d26b1ed93e92439b +Author: Aurimas Černius +Date: Sat May 14 22:19:42 2016 +0300 + + Updated Lithuanian translation + + po/lt.po | 643 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 354 insertions(+), 289 deletions(-) + +commit e9b70c2efae48fb956d58e72b631b070fb2eba2a +Author: Rui Matos +Date: Tue Apr 21 19:22:09 2015 +0200 + + display: Separate interlaced from normal modes + + https://bugzilla.gnome.org/show_bug.cgi?id=763833 + + configure.ac | 2 +- + panels/display/cc-display-panel.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 2e45eeaa369cf367cd9512e1a75f51d6d174de9c +Author: Rui Matos +Date: Mon Apr 25 20:04:02 2016 +0200 + + region: Be more thorough in cc_input_chooser_reset() + + This should result in returning to the initial state as intended + instead of keeping the filter entry shown and the filter applied. + + https://bugzilla.gnome.org/show_bug.cgi?id=765909 + + panels/region/cc-input-chooser.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ff656743f4de922369ca41174980f756d16a6756 +Author: Rui Matos +Date: Tue Apr 26 18:43:46 2016 +0200 + + region: Handle escape in the input chooser's filter entry + + Reset the chooser on escape. + + https://bugzilla.gnome.org/show_bug.cgi?id=765909 + + panels/region/cc-input-chooser.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 0ac120b78289e1b4fec3eef0e66715e936cdd1ce +Author: Felipe Borges +Date: Tue May 10 14:23:12 2016 +0200 + + mouse: allow focus on switches in the Touchpad section + + Enables the navigation/focus on the switches in the Touchpad + section. + + https://bugzilla.gnome.org/show_bug.cgi?id=766186 + + panels/mouse/gnome-mouse-properties.ui | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a969805bd22e009f7a7b3db16d260a0630c972e4 +Author: Felipe Borges +Date: Tue May 10 10:28:45 2016 +0200 + + universal-access: allow focus on row switches + + This allows the navigation/focus to the settings switches. + + https://bugzilla.gnome.org/show_bug.cgi?id=766186 + + panels/universal-access/uap.ui | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d490485e2e5980fb21be77c475e6a6959a324ec8 +Author: Cédric Valmary +Date: Fri May 6 18:38:39 2016 +0000 + + Updated Occitan translation + + po/oc.po | 1848 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 925 insertions(+), 923 deletions(-) + +commit 80cf4dd43bcf596b3ec4d1fc9dce02a69f4867af +Author: Kjartan Maraas +Date: Tue May 3 23:00:47 2016 +0200 + + Updated Norwegian bokmål translation. + + po/nb.po | 385 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 214 insertions(+), 171 deletions(-) + +commit f54b157289635435774e481f95dc96fd93906cc8 +Author: Kjartan Maraas +Date: Tue May 3 22:57:04 2016 +0200 + + Updated Norwegian bokmål translation. + + po/nb.po | 1137 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 599 insertions(+), 538 deletions(-) + +commit 6d825b9660e05133d758f2501133cb089e8263eb +Author: Rui Matos +Date: Thu Mar 24 17:40:51 2016 +0100 + + display: Ensure only one output is set as primary + + When switching an output to secondary we'd set all other outputs as + primary. Instead, set only the first we find. + + https://bugzilla.gnome.org/show_bug.cgi?id=764155 + + panels/display/cc-display-panel.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 9b5329f4a88ed5b88250b2afa3ab99928f01eb40 +Author: Rui Matos +Date: Mon May 2 14:35:33 2016 +0200 + + mouse: Make touchpad capability checking on wayland work as intended + + We need to set the out variables otherwise the intended semantics as + documented by the comment aren't enforced. + + https://bugzilla.gnome.org/show_bug.cgi?id=765879 + + panels/mouse/cc-mouse-caps-helper.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit f1fab4134b16910ef935e18d561d2c0c9d9de503 +Author: GNOME Translation Robot +Date: Fri Apr 29 08:43:05 2016 +0000 + + Updated Scottish Gaelic translation + + po/gd.po | 69 ++++++++++++++++++++++++++-------------------------------------- + 1 file changed, 28 insertions(+), 41 deletions(-) + +commit 5c10ce45b8f2902e71a36649b9d0a31ccff6dc0f +Author: Bastien Nocera +Date: Thu Apr 28 23:36:30 2016 +0200 + + panels: Fix translators comments being truncated + + Commit b3be076 added soft hyphens along with a comment for translators + to use those soft hyphens. Except that gettext would only grab the one + line out of the four we wrote for translators to read. Put them all on + the same line so that gettext actually extracts those. + + https://bugzilla.gnome.org/show_bug.cgi?id=765778 + + panels/background/gnome-background-panel.desktop.in.in | 5 +---- + panels/bluetooth/gnome-bluetooth-panel.desktop.in.in | 5 +---- + panels/color/gnome-color-panel.desktop.in.in | 5 +---- + panels/datetime/gnome-datetime-panel.desktop.in.in | 5 +---- + panels/display/gnome-display-panel.desktop.in.in | 5 +---- + panels/info/gnome-info-panel.desktop.in.in | 5 +---- + panels/keyboard/gnome-keyboard-panel.desktop.in.in | 5 +---- + panels/mouse/gnome-mouse-panel.desktop.in.in | 5 +---- + panels/network/gnome-network-panel.desktop.in.in | 5 +---- + panels/notifications/gnome-notifications-panel.desktop.in.in | 5 +---- + panels/online-accounts/gnome-online-accounts-panel.desktop.in.in | 5 +---- + panels/power/gnome-power-panel.desktop.in.in | 5 +---- + panels/printers/gnome-printers-panel.desktop.in.in | 5 +---- + panels/privacy/gnome-privacy-panel.desktop.in.in | 5 +---- + panels/region/gnome-region-panel.desktop.in.in | 5 +---- + panels/search/gnome-search-panel.desktop.in.in | 5 +---- + panels/sharing/gnome-sharing-panel.desktop.in.in | 5 +---- + panels/universal-access/gnome-universal-access-panel.desktop.in.in | 5 +---- + panels/wacom/gnome-wacom-panel.desktop.in.in | 5 +---- + 19 files changed, 19 insertions(+), 76 deletions(-) + +commit 967c07e10b1c5b102094d6bc1515550d4a20bb22 +Author: Daniel Mustieles +Date: Thu Apr 28 09:37:33 2016 +0000 + + Updated Spanish translation + + po/es.po | 31 +++++++++---------------------- + 1 file changed, 9 insertions(+), 22 deletions(-) + +commit 113284f5a9e2e91a63aa5b37940fee10f7a041bb +Author: Balázs Meskó +Date: Wed Apr 27 19:02:51 2016 +0000 + + Updated Hungarian translation + + po/hu.po | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 19e3734dd62fd15e67aeeba0eddabfeee439f64a +Author: Daniel Mustieles +Date: Wed Apr 27 08:01:29 2016 +0000 + + Updated Spanish translation + + po/es.po | 632 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 348 insertions(+), 284 deletions(-) + +commit 11d5d850b2cfd3b27467d99cd5c14a9a422dbfc7 +Author: Rui Matos +Date: Tue Apr 26 16:46:58 2016 +0200 + + common: Fix search by skipping soft hyphens when normalizing + + Commit b3be07609a9bae43947ee3e59d8982a7715c9acf introduced soft + hyphens in panel names which causes searches to fail. Fix this by + skipping soft hyphen when normalizing strings. + + https://bugzilla.gnome.org/show_bug.cgi?id=765617 + + panels/common/cc-util.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c831eaa6e3fb01dc00defaf94afee00fde33e9f1 +Author: Bastien Nocera +Date: Tue Apr 26 13:53:43 2016 +0200 + + universal-access: Correct label for "Sound Keys" + + In X11, the "toggle keys" accessibility feature beeps when NumLock or + CapsLock are turned on, and also when turned off. Correct the label to + mention that. + + https://bugzilla.gnome.org/show_bug.cgi?id=765589 + + panels/universal-access/uap.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0167fd03f9cc7407fec91c30ce72b3a9be21010a +Author: Balázs Meskó +Date: Mon Apr 25 09:52:23 2016 +0000 + + Updated Hungarian translation -commit 1f949e99bc046ee3c735325c8225eb9361b035b5 -Author: Tiago Santos -Date: Fri May 20 21:32:06 2016 +0000 + po/hu.po | 652 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 351 insertions(+), 301 deletions(-) - Updated Portuguese translation +commit e21fb1f3c7050e863f00322d04a68531863ca7c3 +Author: GNOME Translation Robot +Date: Fri Apr 22 12:04:04 2016 +0000 + + Updated Scottish Gaelic translation - po/pt.po | 1496 +++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 695 insertions(+), 801 deletions(-) + po/gd.po | 469 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 219 insertions(+), 250 deletions(-) -commit fb822842ea6bf07fd1f326eeae5e15764f705994 +commit 3432b5b8c4aad23257cfb6b9a4f227b7093126ed Author: Cosimo Cecchi Date: Mon Jun 16 17:09:01 2014 -0700 @@ -286,48 +4947,52 @@ panels/search/cc-search-panel.c | 3 +++ 1 file changed, 3 insertions(+) -commit 3eb4000554fa563f27c6d2c9cf7b9de0f581ffac -Author: Rui Matos -Date: Thu Mar 24 17:40:51 2016 +0100 +commit 089603f1f33de7ccffa02a1c3c5bbf5976b5f1f5 +Author: GNOME Translation Robot +Date: Wed Apr 20 14:16:04 2016 +0000 - display: Ensure only one output is set as primary - - When switching an output to secondary we'd set all other outputs as - primary. Instead, set only the first we find. - - https://bugzilla.gnome.org/show_bug.cgi?id=764155 + Updated Scottish Gaelic translation + (cherry picked from commit 2b9a0ac274e99d96f58a9e69dc0a3af292a0d093) - panels/display/cc-display-panel.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + po/gd.po | 4139 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 2389 insertions(+), 1750 deletions(-) -commit d15caf2484548e3f6e06a38e91e3fb2707d270d3 -Author: Felipe Borges -Date: Tue May 10 14:23:12 2016 +0200 +commit fe5bac224e1d1a294651c4c2310f83fdb6591928 +Author: Fabio Tomat +Date: Fri Apr 15 23:18:33 2016 +0000 - mouse: allow focus on switches in the Touchpad section + Updated Friulian translation + (cherry picked from commit cd40ce5e7e117ab742d9acae329d557ea4dcc028) + + po/fur.po | 101 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 51 insertions(+), 50 deletions(-) + +commit 1fbc8de8bdbdebc704bbbf41618d5f825baed75f +Author: Marek Kasik +Date: Fri Apr 15 12:08:27 2016 +0200 + + printers: Fix compilation error - Enables the navigation/focus on the switches in the Touchpad - section. + Fix "format not a string literal" error by not using + formatted print. - https://bugzilla.gnome.org/show_bug.cgi?id=766186 + https://bugzilla.gnome.org/show_bug.cgi?id=764153 - panels/mouse/gnome-mouse-properties.ui | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + panels/printers/cc-printers-panel.c | 46 +++++++++++++++++++++---------------- + 1 file changed, 26 insertions(+), 20 deletions(-) -commit 15e6cd3bea2992c5ab60e44b2bf3de9f617d539a -Author: Felipe Borges -Date: Tue May 10 10:28:45 2016 +0200 +commit cce521db4a28ac64713f8b0acf5f75172ba5814a +Author: Cosimo Cecchi +Date: Mon Mar 28 16:44:35 2016 -0700 - universal-access: allow focus on row switches - - This allows the navigation/focus to the settings switches. + network: fix a GCC warning - https://bugzilla.gnome.org/show_bug.cgi?id=766186 + https://bugzilla.gnome.org/show_bug.cgi?id=764296 - panels/universal-access/uap.ui | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + panels/network/connection-editor/ce-page-security.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit 80560ef73c0e76c6ce330bcef025b57730db298e +commit af6b9b64027b934dfe287cc525dd40e94688e890 Author: Cosimo Cecchi Date: Mon Mar 28 20:47:19 2016 -0700 @@ -341,7 +5006,7 @@ shell/cc-editable-entry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 412eefd735388d73a88dd51e769364fa5ecd66a6 +commit 2fa79c35ccf429356fc189afda46b0da607d0562 Author: Cosimo Cecchi Date: Fri Sep 26 18:09:47 2014 -0700 @@ -352,7 +5017,7 @@ panels/datetime/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -commit 9ae8eb930c659f03a738cddbb21d22c708f56feb +commit cc5c94f15104807269c80f50fda6ca299f16e5db Author: Cosimo Cecchi Date: Mon Mar 28 17:30:10 2016 -0700 @@ -363,95 +5028,129 @@ panels/display/cc-display-panel.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -commit 2c2c68b47442e185b065c69462b8e8ad113ebc25 -Author: Kjartan Maraas -Date: Tue May 3 22:56:41 2016 +0200 +commit e070e819ca7b39aa11af49259e6144495556cfcc +Author: Bastien Nocera +Date: Wed Apr 13 13:43:37 2016 +0200 - Updated Norwegian bokmål translation. + network: Fix properties sizing issues + + By requiring a new GTK+ that fixes those. - po/nb.po | 1137 +++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 599 insertions(+), 538 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit db5dcda0badd33b9aea576f4f3a45c8076f11b8c -Author: Rui Matos -Date: Mon May 2 14:35:33 2016 +0200 +commit 67c1755fe7152eb5301f7188e42a431fb1fe5e29 +Author: Bastien Nocera +Date: Wed Apr 13 13:01:26 2016 +0200 - mouse: Make touchpad capability checking on wayland work as intended - - We need to set the out variables otherwise the intended semantics as - documented by the comment aren't enforced. + network: Fix warning about renamed theme property - https://bugzilla.gnome.org/show_bug.cgi?id=765879 + Theme parsing error: :1:54: The 'outline-radius' property has been renamed to '-gtk-outline-radius' - panels/mouse/cc-mouse-caps-helper.c | 3 +++ - 1 file changed, 3 insertions(+) + panels/network/cc-network-panel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -commit d40be8023a9e60f970770a92f5c2b12ddbc596f1 -Author: Rui Matos -Date: Tue Apr 26 16:46:58 2016 +0200 +commit 5036ff0f8097f20eb1fb795879f537bc7caf92ea +Author: Michael Catanzaro +Date: Thu Mar 10 14:30:58 2016 -0600 - common: Fix search by skipping soft hyphens when normalizing + network: Hide firewall zone combo when firewalld is not running - Commit b3be07609a9bae43947ee3e59d8982a7715c9acf introduced soft - hyphens in panel names which causes searches to fail. Fix this by - skipping soft hyphen when normalizing strings. + Currently, if firewalld is not running, then the firewall zone combo is + always insensitive. This would make sense if firewalld was great and we + were to consider it a distro bug to not have firewalld running and + enabled, then users would be able to see the option is disabled and + think "maybe my distro has done something wrong." - https://bugzilla.gnome.org/show_bug.cgi?id=765617 + But in actuality, firewalld is not really great, only Fedora ships it + and we're not really recommending it to other distros. So hide the combo + if it's not running, else it's just broken on $NOTFEDORA. + + https://bugzilla.gnome.org/show_bug.cgi?id=763477 - panels/common/cc-util.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + panels/network/connection-editor/ce-page-ethernet.c | 4 +++- + panels/network/connection-editor/ce-page-security.c | 2 +- + panels/network/connection-editor/ce-page-vpn.c | 4 +++- + panels/network/connection-editor/firewall-helpers.c | 9 +++++++-- + panels/network/connection-editor/firewall-helpers.h | 1 + + 5 files changed, 15 insertions(+), 5 deletions(-) -commit 2b9a0ac274e99d96f58a9e69dc0a3af292a0d093 -Author: GNOME Translation Robot -Date: Wed Apr 20 14:16:04 2016 +0000 +commit 2ff6913c13ffa617f8c91729e944c73c80ed70d4 +Author: Milo Casagrande +Date: Mon Apr 11 09:42:12 2016 +0000 - Updated Scottish Gaelic translation + Updated Italian translation + (cherry picked from commit aabdd3f58264a8547f27e33ace851aab317e5c35) - po/gd.po | 4139 ++++++++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 2389 insertions(+), 1750 deletions(-) + po/it.po | 236 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 118 insertions(+), 118 deletions(-) -commit cd40ce5e7e117ab742d9acae329d557ea4dcc028 +commit be934be8a4ebd29f2d257e036fe8a1b1cdbf41a3 Author: Fabio Tomat -Date: Fri Apr 15 23:18:33 2016 +0000 +Date: Sun Apr 10 17:36:19 2016 +0000 Updated Friulian translation + (cherry picked from commit d4fe23b3871250e5396fe2e0cd2b8a2611168847) - po/fur.po | 101 +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 51 insertions(+), 50 deletions(-) + po/fur.po | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) -commit 68e11d616959a4c1486c3ce5f60f4088f9b55b81 -Author: Bastien Nocera -Date: Wed Apr 13 14:40:43 2016 +0200 +commit 971e773724bc0f96fc6f86c6afa3e97d9d4e0a8b +Author: Arash Mousavi +Date: Sat Apr 9 11:47:16 2016 +0430 - 3.20.1 + Update Persian translations - NEWS | 13 +++++++++++++ - configure.ac | 2 +- - 2 files changed, 14 insertions(+), 1 deletion(-) + po/fa.po | 3033 +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 1813 insertions(+), 1220 deletions(-) -commit d87742d92fb3653ef834ffdcf5c0b7ebb7837eb0 -Author: Bastien Nocera -Date: Wed Apr 13 13:43:37 2016 +0200 +commit 203499f045a2677d87396e9aa0c5cc5a61f483c2 +Author: Alexander Shopov +Date: Sat Apr 9 07:26:54 2016 +0300 - network: Fix properties sizing issues + Updated Bulgarian translation + + po/bg.po | 995 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 554 insertions(+), 441 deletions(-) + +commit 13beb5db5b7b2093c0abd2d2d55396a983900c76 +Author: Cosimo Cecchi +Date: Fri Apr 8 16:14:33 2016 -0700 + + info: fetch renderer information from gnome-session - By requiring a new GTK+ that fixes those. + Now that it's exported over DBus. + + https://bugzilla.gnome.org/show_bug.cgi?id=754256 - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure.ac | 2 +- + panels/info/cc-info-panel.c | 96 +++++++++++++++------------------------------ + 2 files changed, 32 insertions(+), 66 deletions(-) -commit 2a8f1e5fda86cde861e4be7239eed09e367f3d6b -Author: Bastien Nocera -Date: Wed Apr 13 13:01:26 2016 +0200 +commit 60e7c350fe405d340e45cf43ed116dddf268316c +Author: Cosimo Cecchi +Date: Fri Apr 8 15:56:09 2016 -0700 - network: Fix warning about renamed theme property + info: remove unused code - Theme parsing error: :1:54: The 'outline-radius' property has been renamed to '-gtk-outline-radius' + https://bugzilla.gnome.org/show_bug.cgi?id=754256 - panels/network/cc-network-panel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + panels/info/cc-info-panel.c | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 6ed989a5442366f5c90b849ec5af8923b647a79a +Author: Hiroshi Takekawa +Date: Sun Mar 27 19:27:43 2016 +0900 + + printers: add compatibility code for older cups + + https://bugzilla.gnome.org/show_bug.cgi?id=764780 + + panels/printers/pp-cups.c | 9 +++++++++ + panels/printers/pp-job.c | 20 ++++++++++++++++++++ + 2 files changed, 29 insertions(+) -commit 18bc213dc4c841d25e4ee56ddc6d772b1e0c41a9 +commit 87bf4cc06e2a6480b692ab4031e1b4ea4af7fdd2 Author: Florian Müllner Date: Thu Apr 7 17:26:06 2016 +0200 @@ -466,7 +5165,7 @@ panels/universal-access/cc-ua-panel.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -commit 8c80ddf8aa5e05593c21f8fee0ae47021d76961d +commit 82b73e5e779b667279950d42f42d71eb30a22870 Author: Bastien Nocera Date: Fri Apr 8 11:29:28 2016 +0200 @@ -477,7 +5176,7 @@ panels/printers/cc-printers-panel.c | 38 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 24 deletions(-) -commit 3ec39332299e3a1beb660010e7d47884ee570928 +commit 9c70369a34877eaac31396a21d572c6a435e142d Author: Bastien Nocera Date: Thu Apr 7 15:07:36 2016 +0200 @@ -491,7 +5190,7 @@ panels/network/net-device-ethernet.c | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) -commit a231ab02b0ddbbf8bc2d338db02e27581a4b8e70 +commit ec5d9d05a7da4cef4ed9f77c13c94f00d1dad99d Author: Bastien Nocera Date: Thu Apr 7 14:34:55 2016 +0200 @@ -502,7 +5201,7 @@ panels/datetime/cc-timezone-map.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -commit a289bbe6e90c221452a6fa34607e47a139dc90db +commit c92aa114b4830636339fa76b746cb04e98cc9904 Author: Bastien Nocera Date: Thu Apr 7 14:31:32 2016 +0200 @@ -516,7 +5215,7 @@ panels/user-accounts/um-fingerprint-dialog.c | 3 +++ 1 file changed, 3 insertions(+) -commit b50e307185bc0e2a5997f353de1fe99a433d64b6 +commit 65d9bd0441c74b11fe4c87b7045e5884f01be810 Author: Bastien Nocera Date: Thu Apr 7 14:22:34 2016 +0200 @@ -527,111 +5226,151 @@ panels/sound/sound-theme-file-utils.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) -commit f0ddef944d5edb78af81add9d449333de04dd77f -Author: Michael Catanzaro -Date: Thu Mar 10 14:30:58 2016 -0600 +commit 4920641127f08b3510d9c6a2cb17352888e34308 +Author: Piotr Drąg +Date: Thu Apr 7 19:06:37 2016 +0200 - network: Hide firewall zone combo when firewalld is not running - - Currently, if firewalld is not running, then the firewall zone combo is - always insensitive. This would make sense if firewalld was great and we - were to consider it a distro bug to not have firewalld running and - enabled, then users would be able to see the option is disabled and - think "maybe my distro has done something wrong." - - But in actuality, firewalld is not really great, only Fedora ships it - and we're not really recommending it to other distros. So hide the combo - if it's not running, else it's just broken on $NOTFEDORA. + Updated Polish translation - https://bugzilla.gnome.org/show_bug.cgi?id=763477 - - panels/network/connection-editor/ce-page-ethernet.c | 4 +++- - panels/network/connection-editor/ce-page-security.c | 2 +- - panels/network/connection-editor/ce-page-vpn.c | 4 +++- - panels/network/connection-editor/firewall-helpers.c | 9 +++++++-- - panels/network/connection-editor/firewall-helpers.h | 1 + - 5 files changed, 15 insertions(+), 5 deletions(-) - -commit aabdd3f58264a8547f27e33ace851aab317e5c35 -Author: Milo Casagrande -Date: Mon Apr 11 09:42:12 2016 +0000 - - Updated Italian translation - - po/it.po | 236 +++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 118 insertions(+), 118 deletions(-) - -commit d4fe23b3871250e5396fe2e0cd2b8a2611168847 -Author: Fabio Tomat -Date: Sun Apr 10 17:36:19 2016 +0000 - - Updated Friulian translation + Hyphenation based on hunspell's hyphen. - po/fur.po | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + po/pl.po | 77 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 39 insertions(+), 38 deletions(-) -commit f85d4b69f6df4d2feb93b740f015fb4d219d9a74 -Author: Arash Mousavi -Date: Sat Apr 9 11:47:16 2016 +0430 +commit be6096957d5853037ea845edceac11fa6e01efae +Author: Piotr Drąg +Date: Thu Apr 7 18:37:38 2016 +0200 - Update Persian translations + Updated Polish translation + + Improvement suggested by Rafal Luzynski . - po/fa.po | 3033 +++++++++++++++++++++++++++++++++++++------------------------- - 1 file changed, 1813 insertions(+), 1220 deletions(-) + po/pl.po | 90 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 45 insertions(+), 45 deletions(-) -commit 255fe50be6e087aa692496ad9953cfa5fe9a0517 -Author: Alexander Shopov -Date: Sat Apr 9 07:26:54 2016 +0300 +commit b3be07609a9bae43947ee3e59d8982a7715c9acf +Author: Bastien Nocera +Date: Thu Apr 7 14:22:50 2016 +0200 - Updated Bulgarian translation + panels: Fix truncated panel names for larger fonts + + Note that this fix will not automatically fix translations, which will + need to add soft-hyphens (U+00AD) to their translations themselves, and + will not fix larger fonts for which the split up syllables end up + being bigger than the maximum text width. + + It's the best we can do without redesigning the Settings shell, which is + already something planned. + + https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 + + panels/background/gnome-background-panel.desktop.in.in | 6 +++++- + panels/bluetooth/gnome-bluetooth-panel.desktop.in.in | 6 +++++- + panels/color/gnome-color-panel.desktop.in.in | 6 +++++- + panels/datetime/gnome-datetime-panel.desktop.in.in | 4 ++++ + panels/display/gnome-display-panel.desktop.in.in | 6 +++++- + panels/info/gnome-info-panel.desktop.in.in | 6 +++++- + panels/keyboard/gnome-keyboard-panel.desktop.in.in | 6 +++++- + panels/mouse/gnome-mouse-panel.desktop.in.in | 6 +++++- + panels/network/gnome-network-panel.desktop.in.in | 6 +++++- + panels/notifications/gnome-notifications-panel.desktop.in.in | 6 +++++- + panels/online-accounts/gnome-online-accounts-panel.desktop.in.in | 6 +++++- + panels/power/gnome-power-panel.desktop.in.in | 6 +++++- + panels/printers/gnome-printers-panel.desktop.in.in | 6 +++++- + panels/privacy/gnome-privacy-panel.desktop.in.in | 6 +++++- + panels/region/gnome-region-panel.desktop.in.in | 6 +++++- + panels/search/gnome-search-panel.desktop.in.in | 4 ++++ + panels/sharing/gnome-sharing-panel.desktop.in.in | 6 +++++- + panels/universal-access/gnome-universal-access-panel.desktop.in.in | 6 +++++- + panels/wacom/gnome-wacom-panel.desktop.in.in | 6 +++++- + 19 files changed, 93 insertions(+), 17 deletions(-) + +commit 9a43229ec2867f122ae51da943519cdbbb0649e6 +Author: Timm Bäder +Date: Sat Apr 2 18:17:27 2016 +0200 + + mouse panel: Remove superfluous GtkListBoxRow + + The GtkBox>GtkListBoxRow>GtkListBox hierarchy is unnecessary, also + remove the GtkSeparator from the GtkListBox and move it into the GtkBox, + so the width matches that of the GtkListBox (it missed 2px on either + side before). + + https://bugzilla.gnome.org/show_bug.cgi?id=764503 + + panels/mouse/gnome-mouse-properties.c | 3 +- + panels/mouse/gnome-mouse-properties.ui | 413 ++++++++++++++++----------------- + 2 files changed, 201 insertions(+), 215 deletions(-) + +commit 645330853b4480c548e8e0cf04bc8a4022ee5df9 +Author: Timm Bäder +Date: Sat Apr 2 17:55:48 2016 +0200 + + mouse panel: Make all listbox rows unactivatable + + Activating them doesn't do anything, so don't make them look like it + does. + + https://bugzilla.gnome.org/show_bug.cgi?id=764503 - po/bg.po | 731 ++++++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 415 insertions(+), 316 deletions(-) + panels/mouse/gnome-mouse-properties.ui | 9 +++++++++ + 1 file changed, 9 insertions(+) -commit 6bf2c9f2ee49fb9cc5991c467163b55836c1ba30 -Author: Hiroshi Takekawa -Date: Sun Mar 27 19:27:43 2016 +0900 +commit b1e2bc6f043cbca0901c7c224bc9084b54974851 +Author: Cosimo Cecchi +Date: Tue Apr 5 10:33:54 2016 -0700 - printers: add compatibility code for older cups + power: show "Suspend & Power Off" section only when relevant - https://bugzilla.gnome.org/show_bug.cgi?id=764780 + We now ask logind whether the system can suspend or hibernate, and + change the visibility of the items in the panel based on that. + + Based on a patch by Mario Sanchez Prada . + + https://bugzilla.gnome.org/show_bug.cgi?id=764508 - panels/printers/pp-cups.c | 9 +++++++++ - panels/printers/pp-job.c | 20 ++++++++++++++++++++ - 2 files changed, 29 insertions(+) + panels/power/cc-power-panel.c | 197 ++++++++++++++++++++++++++++-------------- + 1 file changed, 134 insertions(+), 63 deletions(-) -commit 56e94327050f51d2097b1580f94bbb03cac51ae0 -Author: Piotr Drąg -Date: Thu Apr 7 19:06:37 2016 +0200 +commit 0e54ee82c815f35f71dc8f6fdad781cc40f2a217 +Author: Cosimo Cecchi +Date: Sat Apr 2 11:04:36 2016 -0700 - Updated Polish translation + power: move function call into section method - Hyphenation based on hunspell's hyphen. + This function logically belongs into the section constructor. Move it + there. + + https://bugzilla.gnome.org/show_bug.cgi?id=764508 - po/pl.po | 77 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 39 insertions(+), 38 deletions(-) + panels/power/cc-power-panel.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -commit 7cc51151e8ab935a7dac1cbcaa992fa524699df3 -Author: Piotr Drąg -Date: Thu Apr 7 18:37:38 2016 +0200 +commit eb94d06c9063b4e660b3d21f226845a1d877d965 +Author: Cosimo Cecchi +Date: Sat Apr 2 11:03:04 2016 -0700 - Updated Polish translation + power: remove unneeded call - Improvement suggested by Rafal Luzynski . + This function is already called from add_suspend_and_power_off_section() + a few lines above. + + https://bugzilla.gnome.org/show_bug.cgi?id=764508 - po/pl.po | 90 ++++++++++++++++++++++++++++++++-------------------------------- - 1 file changed, 45 insertions(+), 45 deletions(-) + panels/power/cc-power-panel.c | 1 - + 1 file changed, 1 deletion(-) -commit 39c825d3e7150c72b2117f9496aa4ecbcda6d360 +commit 4f8de30202abaf48e6f4f5bbfd64babfe14bf7cc Author: Fabio Tomat Date: Tue Apr 5 20:29:26 2016 +0000 Updated Friulian translation + (cherry picked from commit 39c825d3e7150c72b2117f9496aa4ecbcda6d360) po/fur.po | 94 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) -commit ce48b5c6594ad450bbfee526683fe19efffe9ef3 +commit a7da5a2727721549712b867170f517e530fbebc9 Author: Rui Matos Date: Mon Apr 4 20:01:31 2016 +0200 @@ -648,7 +5387,7 @@ panels/mouse/gnome-mouse-properties.c | 8 +++++++ 3 files changed, 53 insertions(+) -commit a3d62acfc5d9ba0f0a9e79abb666bcfa36a44943 +commit 0bc4b21bb2dc3dbb13efac621b596cd40cd1c07f Author: Rui Matos Date: Mon Apr 4 19:59:16 2016 +0200 @@ -661,7 +5400,7 @@ panels/mouse/gnome-mouse-properties.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -commit 97689b586bfb6f5937799101220001e15bd47856 +commit 727d2284f20a7d2fb3dbc03261da204b07587eda Author: Rui Matos Date: Tue Apr 5 17:48:11 2016 +0200 @@ -675,7 +5414,7 @@ panels/mouse/cc-mouse-caps-helper.h | 6 +---- 2 files changed, 25 insertions(+), 30 deletions(-) -commit 15d1fbd59a504b86b76e280dfd4b1346f3ce779a +commit 8f7e99a0342481e1192caffa0a5fedd5335c06dc Author: Rui Matos Date: Tue Apr 5 17:00:20 2016 +0200 @@ -690,7 +5429,7 @@ panels/mouse/gnome-mouse-properties.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) -commit 796e3fba9ed206e6570d3b38e3b81cf096851568 +commit 6a86c7e957850b7122a7570abd81f250bc640fe7 Author: Rui Matos Date: Tue Apr 5 16:58:49 2016 +0200 @@ -703,7 +5442,7 @@ panels/mouse/cc-mouse-caps-helper.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) -commit dbd5441c8d58d87763d23fe3f044a4e89d677f9b +commit d3252400a9381bf7490a41fe5f35dc69c0791889 Author: Rui Matos Date: Mon Apr 4 19:51:38 2016 +0200 @@ -719,6 +5458,36 @@ panels/mouse/cc-mouse-panel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) +commit 73dcc0fb7df5392b75c527b9fa5cfc6426a96afa +Author: Roddy Shuler +Date: Thu Mar 19 14:11:27 2015 -0700 + + background: Replace octal code with literal UTF-8 character + + Apparently due to a recent upgrade to gettext, the octal code was not + being processed properly in generating the .pot file. + + https://bugzilla.gnome.org/show_bug.cgi?id=764318 + + panels/background/cc-background-item.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 47dcfee83b7b9130a02582ade15ef51797fee4af +Author: Cosimo Cecchi +Date: Tue Apr 5 10:14:53 2016 -0700 + + display: add option to enable and disable overscan compensation + + Adds a switch that allows to control overscan compensation, when the + driver supports it. + + Based on a patch by Tomeu Vizoso + + https://bugzilla.gnome.org/show_bug.cgi?id=725135 + + panels/display/cc-display-panel.c | 64 ++++++++++++++++++++++++++++++++------- + 1 file changed, 53 insertions(+), 11 deletions(-) + commit 28c54f3d551af09c414fbf2e2e13a9f7b61781f9 Author: Jonathan Kang Date: Tue Apr 5 14:15:20 2016 +0800 diff -Nru gnome-control-center-3.20.2/config.h.in gnome-control-center-3.22.1/config.h.in --- gnome-control-center-3.20.2/config.h.in 2016-10-11 14:26:38.000000000 +0000 +++ gnome-control-center-3.22.1/config.h.in 2016-10-11 12:14:20.000000000 +0000 @@ -54,9 +54,6 @@ /* Define to 1 if NetworkManager is available */ #undef HAVE_NETWORK_MANAGER -/* Define to 1 if NetworkManager is available */ -#undef HAVE_NM_UNSTABLE - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H diff -Nru gnome-control-center-3.20.2/configure gnome-control-center-3.22.1/configure --- gnome-control-center-3.20.2/configure 2016-10-11 14:26:37.000000000 +0000 +++ gnome-control-center-3.22.1/configure 2016-10-11 12:14:05.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-control-center 3.20.2. +# Generated by GNU Autoconf 2.69 for gnome-control-center 3.22.1. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-control-center' PACKAGE_TARNAME='gnome-control-center' -PACKAGE_VERSION='3.20.2' -PACKAGE_STRING='gnome-control-center 3.20.2' +PACKAGE_VERSION='3.22.1' +PACKAGE_STRING='gnome-control-center 3.22.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center' PACKAGE_URL='' @@ -666,10 +666,8 @@ BUILD_BLUETOOTH_TRUE BLUETOOTH_LIBS BLUETOOTH_CFLAGS -HAVE_NM_UNSTABLE_FALSE -HAVE_NM_UNSTABLE_TRUE -NM_UNSTABLE_CHECK_LIBS -NM_UNSTABLE_CHECK_CFLAGS +POWER_PANEL_LIBS +POWER_PANEL_CFLAGS NM_VPN_MODULE_DIR NM_VPN_CONFIG_DIR BUILD_NETWORK_FALSE @@ -711,8 +709,6 @@ PRINTERS_PANEL_CFLAGS COLOR_PANEL_LIBS COLOR_PANEL_CFLAGS -POWER_PANEL_LIBS -POWER_PANEL_CFLAGS ONLINE_ACCOUNTS_PANEL_LIBS ONLINE_ACCOUNTS_PANEL_CFLAGS NOTIFICATIONS_PANEL_LIBS @@ -1011,8 +1007,6 @@ NOTIFICATIONS_PANEL_LIBS ONLINE_ACCOUNTS_PANEL_CFLAGS ONLINE_ACCOUNTS_PANEL_LIBS -POWER_PANEL_CFLAGS -POWER_PANEL_LIBS COLOR_PANEL_CFLAGS COLOR_PANEL_LIBS PRINTERS_PANEL_CFLAGS @@ -1045,8 +1039,8 @@ WAYLAND_LIBS NETWORK_MANAGER_CFLAGS NETWORK_MANAGER_LIBS -NM_UNSTABLE_CHECK_CFLAGS -NM_UNSTABLE_CHECK_LIBS +POWER_PANEL_CFLAGS +POWER_PANEL_LIBS BLUETOOTH_CFLAGS BLUETOOTH_LIBS SMBCLIENT_CFLAGS @@ -1595,7 +1589,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-control-center 3.20.2 to adapt to many kinds of systems. +\`configure' configures gnome-control-center 3.22.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1670,7 +1664,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-control-center 3.20.2:";; + short | recursive ) echo "Configuration of gnome-control-center 3.22.1:";; esac cat <<\_ACEOF @@ -1790,10 +1784,6 @@ pkg-config ONLINE_ACCOUNTS_PANEL_LIBS linker flags for ONLINE_ACCOUNTS_PANEL, overriding pkg-config - POWER_PANEL_CFLAGS - C compiler flags for POWER_PANEL, overriding pkg-config - POWER_PANEL_LIBS - linker flags for POWER_PANEL, overriding pkg-config COLOR_PANEL_CFLAGS C compiler flags for COLOR_PANEL, overriding pkg-config COLOR_PANEL_LIBS @@ -1855,10 +1845,10 @@ C compiler flags for NETWORK_MANAGER, overriding pkg-config NETWORK_MANAGER_LIBS linker flags for NETWORK_MANAGER, overriding pkg-config - NM_UNSTABLE_CHECK_CFLAGS - C compiler flags for NM_UNSTABLE_CHECK, overriding pkg-config - NM_UNSTABLE_CHECK_LIBS - linker flags for NM_UNSTABLE_CHECK, overriding pkg-config + POWER_PANEL_CFLAGS + C compiler flags for POWER_PANEL, overriding pkg-config + POWER_PANEL_LIBS + linker flags for POWER_PANEL, overriding pkg-config BLUETOOTH_CFLAGS C compiler flags for BLUETOOTH, overriding pkg-config BLUETOOTH_LIBS @@ -1941,7 +1931,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-control-center configure 3.20.2 +gnome-control-center configure 3.22.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2310,7 +2300,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-control-center $as_me 3.20.2, which was +It was created by gnome-control-center $as_me 3.22.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3179,7 +3169,7 @@ # Define the identity of the package. PACKAGE='gnome-control-center' - VERSION='3.20.2' + VERSION='3.22.1' cat >>confdefs.h <<_ACEOF @@ -15010,21 +15000,21 @@ GLIB_REQUIRED_VERSION=2.44.0 -GTK_REQUIRED_VERSION=3.20.3 +GTK_REQUIRED_VERSION=3.22.0 PA_REQUIRED_VERSION=2.0 CANBERRA_REQUIRED_VERSION=0.13 GDKPIXBUF_REQUIRED_VERSION=2.23.0 POLKIT_REQUIRED_VERSION=0.103 GSD_REQUIRED_VERSION=3.19.1 -NETWORK_MANAGER_REQUIRED_VERSION=0.9.8 -NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7.995 +NETWORK_MANAGER_REQUIRED_VERSION=1.2.0 +NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0 MODEM_MANAGER_REQUIRED_VERSION=0.7 LIBNOTIFY_REQUIRED_VERSION=0.7.3 -GNOME_DESKTOP_REQUIRED_VERSION=3.19.93 -SCHEMAS_REQUIRED_VERSION=3.19.3 +GNOME_DESKTOP_REQUIRED_VERSION=3.21.2 +SCHEMAS_REQUIRED_VERSION=3.21.4 LIBWACOM_REQUIRED_VERSION=0.7 CLUTTER_REQUIRED_VERSION=1.11.3 -GOA_REQUIRED_VERSION=3.15.1 +GOA_REQUIRED_VERSION=3.21.5 ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.39 COLORD_REQUIRED_VERSION=0.1.34 COLORD_GTK_REQUIRED_VERSION=0.1.24 @@ -16197,14 +16187,14 @@ pkg_cv_INFO_PANEL_CFLAGS="$INFO_PANEL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgtop-2.0 gl + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgtop-2.0 gl + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INFO_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgtop-2.0 gl + pkg_cv_INFO_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16217,14 +16207,14 @@ pkg_cv_INFO_PANEL_LIBS="$INFO_PANEL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgtop-2.0 gl + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgtop-2.0 gl + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_INFO_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgtop-2.0 gl + pkg_cv_INFO_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -16246,16 +16236,16 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - INFO_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES libgtop-2.0 gl + INFO_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1` else - INFO_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES libgtop-2.0 gl + INFO_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$INFO_PANEL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ($COMMON_MODULES libgtop-2.0 gl + as_fn_error $? "Package requirements ($COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) were not met: $INFO_PANEL_PKG_ERRORS @@ -16872,106 +16862,6 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POWER_PANEL" >&5 -$as_echo_n "checking for POWER_PANEL... " >&6; } - -if test -n "$POWER_PANEL_CFLAGS"; then - pkg_cv_POWER_PANEL_CFLAGS="$POWER_PANEL_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_POWER_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$POWER_PANEL_LIBS"; then - pkg_cv_POWER_PANEL_LIBS="$POWER_PANEL_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_POWER_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` - else - POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$POWER_PANEL_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements ($COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) were not met: - -$POWER_PANEL_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables POWER_PANEL_CFLAGS -and POWER_PANEL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables POWER_PANEL_CFLAGS -and POWER_PANEL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - POWER_PANEL_CFLAGS=$pkg_cv_POWER_PANEL_CFLAGS - POWER_PANEL_LIBS=$pkg_cv_POWER_PANEL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLOR_PANEL" >&5 $as_echo_n "checking for COLOR_PANEL... " >&6; } @@ -18490,26 +18380,17 @@ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= \$NETWORK_MANAGER_APPLET_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm >= \$NETWORK_MANAGER_REQUIRED_VERSION + libnma >= \$NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= \$MODEM_MANAGER_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18522,26 +18403,17 @@ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= \$NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= \$NETWORK_MANAGER_APPLET_REQUIRED_VERSION + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm >= \$NETWORK_MANAGER_REQUIRED_VERSION + libnma >= \$NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= \$MODEM_MANAGER_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + ($PKG_CONFIG --exists --print-errors "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -18563,18 +18435,12 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION" 2>&1` else - NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION + NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -18618,22 +18484,29 @@ fi -# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 +# Check for power panel +if test x${have_networkmanager} = xyes; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM_UNSTABLE_CHECK" >&5 -$as_echo_n "checking for NM_UNSTABLE_CHECK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POWER_PANEL" >&5 +$as_echo_n "checking for POWER_PANEL... " >&6; } -if test -n "$NM_UNSTABLE_CHECK_CFLAGS"; then - pkg_cv_NM_UNSTABLE_CHECK_CFLAGS="$NM_UNSTABLE_CHECK_CFLAGS" +if test -n "$POWER_PANEL_CFLAGS"; then + pkg_cv_POWER_PANEL_CFLAGS="$POWER_PANEL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-util >= 0.9.9.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnm-util >= 0.9.9.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= \$NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NM_UNSTABLE_CHECK_CFLAGS=`$PKG_CONFIG --cflags "libnm-util >= 0.9.9.0" 2>/dev/null` + pkg_cv_POWER_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18641,16 +18514,22 @@ else pkg_failed=untried fi -if test -n "$NM_UNSTABLE_CHECK_LIBS"; then - pkg_cv_NM_UNSTABLE_CHECK_LIBS="$NM_UNSTABLE_CHECK_LIBS" +if test -n "$POWER_PANEL_LIBS"; then + pkg_cv_POWER_PANEL_LIBS="$POWER_PANEL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnm-util >= 0.9.9.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnm-util >= 0.9.9.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= \$NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NM_UNSTABLE_CHECK_LIBS=`$PKG_CONFIG --libs "libnm-util >= 0.9.9.0" 2>/dev/null` + pkg_cv_POWER_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18671,38 +18550,153 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NM_UNSTABLE_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnm-util >= 0.9.9.0" 2>&1` + POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` else - NM_UNSTABLE_CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnm-util >= 0.9.9.0" 2>&1` + POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$NM_UNSTABLE_CHECK_PKG_ERRORS" >&5 + echo "$POWER_PANEL_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION) were not met: + +$POWER_PANEL_PKG_ERRORS - nm_unstable=no +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables POWER_PANEL_CFLAGS +and POWER_PANEL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - nm_unstable=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables POWER_PANEL_CFLAGS +and POWER_PANEL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - NM_UNSTABLE_CHECK_CFLAGS=$pkg_cv_NM_UNSTABLE_CHECK_CFLAGS - NM_UNSTABLE_CHECK_LIBS=$pkg_cv_NM_UNSTABLE_CHECK_LIBS + POWER_PANEL_CFLAGS=$pkg_cv_POWER_PANEL_CFLAGS + POWER_PANEL_LIBS=$pkg_cv_POWER_PANEL_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - nm_unstable=yes + fi -if test x$nm_unstable = xyes; then +else -$as_echo "#define HAVE_NM_UNSTABLE 1" >>confdefs.h +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POWER_PANEL" >&5 +$as_echo_n "checking for POWER_PANEL... " >&6; } +if test -n "$POWER_PANEL_CFLAGS"; then + pkg_cv_POWER_PANEL_CFLAGS="$POWER_PANEL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_POWER_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$POWER_PANEL_LIBS"; then + pkg_cv_POWER_PANEL_LIBS="$POWER_PANEL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= \$GSD_REQUIRED_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_POWER_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi - if test x$nm_unstable = xyes; then - HAVE_NM_UNSTABLE_TRUE= - HAVE_NM_UNSTABLE_FALSE='#' + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - HAVE_NM_UNSTABLE_TRUE='#' - HAVE_NM_UNSTABLE_FALSE= + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` + else + POWER_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$POWER_PANEL_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION) were not met: +$POWER_PANEL_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables POWER_PANEL_CFLAGS +and POWER_PANEL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables POWER_PANEL_CFLAGS +and POWER_PANEL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + POWER_PANEL_CFLAGS=$pkg_cv_POWER_PANEL_CFLAGS + POWER_PANEL_LIBS=$pkg_cv_POWER_PANEL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi +fi # Check for gnome-bluetooth @@ -19442,7 +19436,7 @@ fi -CONTROL_CENTER_VERSION=3.20.2 +CONTROL_CENTER_VERSION=3.22.1 @@ -19557,7 +19551,7 @@ ;; esac -ac_config_files="$ac_config_files Makefile panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/bluetooth/Makefile panels/bluetooth/gnome-bluetooth-panel.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/search/Makefile panels/search/gnome-search-panel.desktop.in panels/sharing/Makefile panels/sharing/gnome-sharing-panel.desktop.in panels/sound/Makefile panels/sound/gvc/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/privacy/Makefile panels/privacy/gnome-privacy-panel.desktop.in panels/network/Makefile panels/network/wireless-security/Makefile panels/network/connection-editor/Makefile panels/network/gnome-network-panel.desktop.in panels/notifications/Makefile panels/notifications/gnome-notifications-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/wacom/Makefile panels/wacom/calibrator/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in libgd/Makefile search-provider/Makefile shell/appdata/Makefile shell/Makefile shell/gnome-control-center.desktop.in man/Makefile" +ac_config_files="$ac_config_files Makefile panels/Makefile panels/common/Makefile panels/background/Makefile panels/background/gnome-background-panel.desktop.in panels/bluetooth/Makefile panels/bluetooth/gnome-bluetooth-panel.desktop.in panels/datetime/Makefile panels/datetime/gnome-datetime-panel.desktop.in panels/datetime/po-timezones/Makefile panels/display/Makefile panels/display/gnome-display-panel.desktop.in panels/keyboard/Makefile panels/keyboard/gnome-keyboard-panel.desktop.in panels/keyboard/gnome-keybindings.pc panels/region/Makefile panels/region/gnome-region-panel.desktop.in panels/mouse/Makefile panels/mouse/gnome-mouse-panel.desktop.in panels/online-accounts/Makefile panels/online-accounts/gnome-online-accounts-panel.desktop.in panels/online-accounts/icons/Makefile panels/online-accounts/icons/16x16/Makefile panels/online-accounts/icons/22x22/Makefile panels/online-accounts/icons/24x24/Makefile panels/online-accounts/icons/32x32/Makefile panels/online-accounts/icons/48x48/Makefile panels/online-accounts/icons/256x256/Makefile panels/search/Makefile panels/search/gnome-search-panel.desktop.in panels/sharing/Makefile panels/sharing/gnome-sharing-panel.desktop.in panels/sound/Makefile panels/sound/gvc/Makefile panels/sound/data/Makefile panels/sound/data/gnome-sound-panel.desktop.in panels/sound/data/symbolic-icons/Makefile panels/sound/data/symbolic-icons/scalable/Makefile panels/sound/data/symbolic-icons/scalable/status/Makefile panels/sound/data/icons/Makefile panels/sound/data/icons/16x16/Makefile panels/sound/data/icons/16x16/apps/Makefile panels/sound/data/icons/16x16/devices/Makefile panels/sound/data/icons/16x16/status/Makefile panels/sound/data/icons/22x22/Makefile panels/sound/data/icons/22x22/apps/Makefile panels/sound/data/icons/22x22/status/Makefile panels/sound/data/icons/24x24/Makefile panels/sound/data/icons/24x24/apps/Makefile panels/sound/data/icons/24x24/devices/Makefile panels/sound/data/icons/24x24/status/Makefile panels/sound/data/icons/32x32/Makefile panels/sound/data/icons/32x32/apps/Makefile panels/sound/data/icons/32x32/devices/Makefile panels/sound/data/icons/32x32/status/Makefile panels/sound/data/icons/48x48/Makefile panels/sound/data/icons/48x48/apps/Makefile panels/sound/data/icons/48x48/devices/Makefile panels/sound/data/icons/scalable/Makefile panels/sound/data/icons/scalable/apps/Makefile panels/sound/data/icons/scalable/devices/Makefile panels/sound/data/sounds/Makefile panels/info/Makefile panels/info/gnome-info-panel.desktop.in panels/power/Makefile panels/power/gnome-power-panel.desktop.in panels/power/icons/Makefile panels/power/icons/16x16/Makefile panels/power/icons/22x22/Makefile panels/power/icons/24x24/Makefile panels/power/icons/32x32/Makefile panels/power/icons/48x48/Makefile panels/power/icons/256x256/Makefile panels/color/Makefile panels/color/gnome-color-panel.desktop.in panels/color/icons/Makefile panels/color/icons/16x16/Makefile panels/color/icons/22x22/Makefile panels/color/icons/24x24/Makefile panels/color/icons/32x32/Makefile panels/color/icons/48x48/Makefile panels/color/icons/64x64/Makefile panels/color/icons/256x256/Makefile panels/color/icons/scalable/Makefile panels/printers/Makefile panels/printers/gnome-printers-panel.desktop.in panels/privacy/Makefile panels/privacy/gnome-privacy-panel.desktop.in panels/network/Makefile panels/network/wireless-security/Makefile panels/network/connection-editor/Makefile panels/network/gnome-network-panel.desktop.in panels/notifications/Makefile panels/notifications/gnome-notifications-panel.desktop.in panels/universal-access/Makefile panels/universal-access/gnome-universal-access-panel.desktop.in panels/user-accounts/Makefile panels/user-accounts/data/Makefile panels/user-accounts/data/gnome-user-accounts-panel.desktop.in panels/user-accounts/data/faces/Makefile panels/wacom/Makefile panels/wacom/calibrator/Makefile panels/wacom/gnome-wacom-panel.desktop.in po/Makefile.in libgd/Makefile search-provider/Makefile shell/appdata/Makefile shell/alt/Makefile shell/Makefile shell/gnome-control-center.desktop.in man/Makefile" cat >confcache <<\_ACEOF @@ -19785,10 +19779,6 @@ as_fn_error $? "conditional \"BUILD_NETWORK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_NM_UNSTABLE_TRUE}" && test -z "${HAVE_NM_UNSTABLE_FALSE}"; then - as_fn_error $? "conditional \"HAVE_NM_UNSTABLE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_BLUETOOTH_TRUE}" && test -z "${BUILD_BLUETOOTH_FALSE}"; then as_fn_error $? "conditional \"BUILD_BLUETOOTH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20206,7 +20196,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-control-center $as_me 3.20.2, which was +This file was extended by gnome-control-center $as_me 3.22.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20272,7 +20262,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-control-center config.status 3.20.2 +gnome-control-center config.status 3.22.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20794,6 +20784,7 @@ "libgd/Makefile") CONFIG_FILES="$CONFIG_FILES libgd/Makefile" ;; "search-provider/Makefile") CONFIG_FILES="$CONFIG_FILES search-provider/Makefile" ;; "shell/appdata/Makefile") CONFIG_FILES="$CONFIG_FILES shell/appdata/Makefile" ;; + "shell/alt/Makefile") CONFIG_FILES="$CONFIG_FILES shell/alt/Makefile" ;; "shell/Makefile") CONFIG_FILES="$CONFIG_FILES shell/Makefile" ;; "shell/gnome-control-center.desktop.in") CONFIG_FILES="$CONFIG_FILES shell/gnome-control-center.desktop.in" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; diff -Nru gnome-control-center-3.20.2/configure.ac gnome-control-center-3.22.1/configure.ac --- gnome-control-center-3.20.2/configure.ac 2016-10-11 14:15:07.000000000 +0000 +++ gnome-control-center-3.22.1/configure.ac 2016-10-11 11:58:37.000000000 +0000 @@ -1,4 +1,4 @@ -m4_define([gnome_control_center_version], 3.20.2) +m4_define([gnome_control_center_version], 3.22.1) AC_INIT([gnome-control-center], [gnome_control_center_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center]) @@ -6,7 +6,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz tar-ustar check-news]) +AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz tar-ustar check-news subdir-objects]) AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -86,21 +86,21 @@ dnl ============================================== GLIB_REQUIRED_VERSION=2.44.0 -GTK_REQUIRED_VERSION=3.20.3 +GTK_REQUIRED_VERSION=3.22.0 PA_REQUIRED_VERSION=2.0 CANBERRA_REQUIRED_VERSION=0.13 GDKPIXBUF_REQUIRED_VERSION=2.23.0 POLKIT_REQUIRED_VERSION=0.103 GSD_REQUIRED_VERSION=3.19.1 -NETWORK_MANAGER_REQUIRED_VERSION=0.9.8 -NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7.995 +NETWORK_MANAGER_REQUIRED_VERSION=1.2.0 +NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0 MODEM_MANAGER_REQUIRED_VERSION=0.7 LIBNOTIFY_REQUIRED_VERSION=0.7.3 -GNOME_DESKTOP_REQUIRED_VERSION=3.19.93 -SCHEMAS_REQUIRED_VERSION=3.19.3 +GNOME_DESKTOP_REQUIRED_VERSION=3.21.2 +SCHEMAS_REQUIRED_VERSION=3.21.4 LIBWACOM_REQUIRED_VERSION=0.7 CLUTTER_REQUIRED_VERSION=1.11.3 -GOA_REQUIRED_VERSION=3.15.1 +GOA_REQUIRED_VERSION=3.21.5 ACCOUNTSSERVICE_REQUIRED_VERSION=0.6.39 COLORD_REQUIRED_VERSION=0.1.34 COLORD_GTK_REQUIRED_VERSION=0.1.24 @@ -129,7 +129,7 @@ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION) PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= 3.1.0 upower-glib >= 0.99.0) -PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl +PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION @@ -141,8 +141,6 @@ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= $COLORD_REQUIRED_VERSION colord-gtk >= $COLORD_GTK_REQUIRED_VERSION @@ -192,11 +190,9 @@ fi fi -PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION +PKG_CHECK_MODULES(NETWORK_MANAGER, + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, [have_networkmanager=yes], have_networkmanager=no) if test "x$have_networkmanager" = xno ; then @@ -213,12 +209,15 @@ AC_SUBST(NM_VPN_MODULE_DIR) fi -# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 -PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no) -if test x$nm_unstable = xyes; then - AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available]) +# Check for power panel +if test x${have_networkmanager} = xyes; then + PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 + libnm >= $NETWORK_MANAGER_REQUIRED_VERSION + gnome-settings-daemon >= $GSD_REQUIRED_VERSION) +else + PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION) fi -AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) # Check for gnome-bluetooth PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, @@ -551,6 +550,7 @@ libgd/Makefile search-provider/Makefile shell/appdata/Makefile +shell/alt/Makefile shell/Makefile shell/gnome-control-center.desktop.in man/Makefile diff -Nru gnome-control-center-3.20.2/debian/changelog gnome-control-center-3.22.1/debian/changelog --- gnome-control-center-3.20.2/debian/changelog 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/changelog 2016-10-11 15:36:05.000000000 +0000 @@ -1,45 +1,9 @@ -gnome-control-center (1:3.20.2-0ubuntu1) yakkety; urgency=medium +gnome-control-center (1:3.22.1-1ubuntu1) zesty; urgency=medium - * New upstream bugfix release (LP: #1633753) - * Drop patches applied in new release - - -- Jeremy Bicha Sat, 15 Oct 2016 13:05:25 -0400 - -gnome-control-center (1:3.20.1-2ubuntu3) yakkety; urgency=medium - - * Add 08_lowercase_user_names.patch: - - Copy patch from unity-control-center to disallow upper-case - letters in user names for compliance with adduser (LP: #1600638) - * Depend on system-config-printer-gnome instead of -common. - Ubuntu's s-c-p packaging differs and we need scp-dbus-service.py - (LP: #1623150) - - -- Jeremy Bicha Wed, 05 Oct 2016 14:35:22 -0400 - -gnome-control-center (1:3.20.1-2ubuntu2) yakkety; urgency=medium - - * Cherrypick commits from the 3.20 branch since there was never a 3.20.2 - release. See patch headers or git for descriptions of issues fixed. - - 0002-mouse-Make-touchpad-capability-checking-on-wayland-w.patch - - 0007-universal-access-allow-focus-on-row-switches.patch - - 0008-mouse-allow-focus-on-switches-in-the-Touchpad-sectio.patch - - 0014-network-fix-some-SSID-escaping-issues.patch - - 0016-user-accounts-Fix-missing-records-in-the-history-dia.patch - (LP: #1443052) - - 0020-privacy-React-to-changes-in-permissions-store.patch - - 0021-privacy-Update-for-PermissionStore-DBus-API-changes.patch - - 0025-power-Fix-hiding-wi-fi-mobile-broadband-toggles.patch - - 0026-power-Fix-wifi-device-state-when-opening-power-panel.patch - - 0027-printers-Fix-compilation-warning.patch - - 0028-display-Fix-possible-crash-on-startup.patch - - -- Jeremy Bicha Tue, 04 Oct 2016 06:52:59 -0400 - -gnome-control-center (1:3.20.1-2ubuntu1) yakkety; urgency=medium - - [ Jeremy Bicha ] - * Merge with Debian (LP: #1611195). Remaining changes: + * Merge with Debian. Remaining changes: + debian/patches: + - 08_lowercase_user_names.patch: + Disallow upper-case letters in user names for compliance with adduser - 52_region_language.patch Adapt region panel to use Ubuntu style regions - 56_use_ubuntu_info_branding.patch, @@ -61,23 +25,96 @@ + debian/control.in: - Recommend ibus, unity-control-center-faces, and unity-system-service - Don't recommend rygel | rygel-tracker for now - - Breaks/Replaces libgnome-control-center1 - build-dep on ttf-ubuntu-font-family and valac for logo generation + - Depend on system-config-printer-gnome instead of -common. + Ubuntu's s-c-p packaging differs and we need scp-dbus-service.py + Split out shared data that is used by unity-control-center + Install apport hook + debian/gnome-control-center-data.install: - Don't install gnome-control-center.pkla since we use policykit-desktop-privileges instead - Don't install 'faces', installed instead by unity-control-center-faces - * revert_revert_main_disable_sslv3_because_of_POODLE.patch: - - Dropped, gnome-online-accounts uses webkit2 now * debian/patches/ubuntu-gnome-version.patch: - - Set Ubuntu version to 16.10 - - [ Tim Lunn ] - * debian/patches/52_region_language.patch: refreshed + - Set Ubuntu version to 17.04 + + -- Jeremy Bicha Tue, 11 Oct 2016 11:36:05 -0400 + +gnome-control-center (1:3.22.1-1) unstable; urgency=medium + + * New upstream release. + + -- Michael Biebl Tue, 11 Oct 2016 17:30:11 +0200 + +gnome-control-center (1:3.22.0-2) unstable; urgency=medium + + [ Jeremy Bicha ] + * debian/control.in: + - Recommend libcanberra-pulse for Test Speakers feature (Closes: #676234) + + [ Andreas Henriksson ] + * Add build-dependency on tzdata as zone.tab is used in tests. + (Closes: #839485) + + -- Andreas Henriksson Sat, 08 Oct 2016 22:42:58 +0200 + +gnome-control-center (1:3.22.0-1) unstable; urgency=medium + + * New upstream release. + * Drop fix-crash-entering-ipv4-gateway.patch and + fix-crash-entering-ipv4-routes.patch, merged upstream. + * Bump debhelper compat level to 10. + * Bump Build-Depends on libgtk-3-dev to (>= 3.22.0) for + GtkScrolledWindow.propagate_natural_width. (Closes: #838336) + * Use non-multiarch path (/usr/lib/gnome-control-center) for libexecdir. + + -- Michael Biebl Wed, 21 Sep 2016 02:00:20 +0200 + +gnome-control-center (1:3.21.92-2) unstable; urgency=high + + * Team upload. + * Add fix-crash-entering-ipv4-gateway.patch and + fix-crash-entering-ipv4-routes.patch taken from upstream git fixing + crashes when setting IPv4 gateway or IPv4 routes. They can be dropped for + 3.21.93. Closes: #836835 + * High urgency to get those fixes in testing as quickly as possible. + + -- Raphaël Hertzog Thu, 15 Sep 2016 21:40:56 +0200 + +gnome-control-center (1:3.21.92-1) unstable; urgency=medium + + * New upstream beta release. + * debian/gnome-control-center.install: ship usr/share/gettext/its + - this installs the new gnome-keybindings.its and .loc + * Append a ~ to the versioned libsmbclient-dev build-dependency + to silence lintian. + + -- Andreas Henriksson Tue, 13 Sep 2016 14:19:49 +0200 + +gnome-control-center (1:3.21.90-1) unstable; urgency=medium + + [ Andreas Henriksson ] + * New upstream beta release. + * Update (build-)dependencies according to configure.ac changes: + - bump gsettings-desktop-schemas-dev to >= 3.21.4 + - bump libgoa-1.0-dev to >= 3.21.5 + - bump libgnome-desktop-3-dev to >= 3.21.2 + - bump libgtk-3-dev to >= 3.21.4 + - bump libnm-* to >= 1.2.0 + - Replace libnm-glib-dev, libnm-glib-vpn-dev, libnm-gtk-dev and + libnm-util-dev with libnm-dev (>= 1.2.0) and libnma-dev (>= 1.2.0) + * Drop Recommends on mesa-utils + - not needed for a long time since upstream commit c60221e0b4187a + which has now been superseded by fetching the info over dbus + from gnome-session. + * Bump build-dependency on libgtk-3-dev to >= 3.21.5 + - the keyboard panel uses GtkShortcutLabel which is not in 3.21.4. + + [ Michael Biebl ] + * Drop Build-Depends on libdbus-1-dev and libnotify-dev, no longer required. + * Drop obsolete cleanup code in maintainer scripts. + * Convert from cdbs to dh. - -- Jeremy Bicha Sat, 13 Aug 2016 11:58:16 -0400 + -- Michael Biebl Thu, 01 Sep 2016 12:43:52 +0200 gnome-control-center (1:3.20.1-2) unstable; urgency=medium diff -Nru gnome-control-center-3.20.2/debian/compat gnome-control-center-3.22.1/debian/compat --- gnome-control-center-3.20.2/debian/compat 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/compat 2016-10-11 15:36:05.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru gnome-control-center-3.20.2/debian/control gnome-control-center-3.22.1/debian/control --- gnome-control-center-3.20.2/debian/control 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/control 2016-10-11 15:36:05.000000000 +0000 @@ -7,19 +7,16 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Jeremy Bicha , Laurent Bigonville , Michael Biebl +Uploaders: Andreas Henriksson , Jeremy Bicha , Laurent Bigonville , Michael Biebl Standards-Version: 3.9.8 -Build-Depends: autotools-dev, - cdbs (>= 0.4.41), - debhelper (>= 9), +Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1~), libaccountsservice-dev (>= 0.6.39), desktop-file-utils, - dh-autoreconf, gnome-common, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-dev (>= 3.19.1), - gsettings-desktop-schemas-dev (>= 3.19.3), + gsettings-desktop-schemas-dev (>= 3.21.4), gtk-doc-tools, intltool (>= 0.37.1), libcanberra-gtk3-dev, @@ -27,29 +24,25 @@ libcolord-dev (>= 0.1.29), libcolord-gtk-dev (>= 0.1.24), libcups2-dev, - libdbus-1-dev (>= 0.32), libgdk-pixbuf2.0-dev (>= 2.23.0), libgirepository1.0-dev, libglib2.0-dev (>= 2.44.0), - libgnome-desktop-3-dev (>= 3.19.93), + libgnome-desktop-3-dev (>= 3.21.2), libgnomekbd-dev (>= 2.91.91), libgnome-bluetooth-dev (>= 3.18.0) [linux-any], libibus-1.0-dev (>= 1.5.2), - libgoa-1.0-dev (>= 3.15.1), + libgoa-1.0-dev (>= 3.21.5), libgrilo-0.3-dev (>= 0.3.0), - libgtk-3-dev (>= 3.19.12), + libgtk-3-dev (>= 3.22.0), libgtop2-dev, libgudev-1.0-dev [linux-any], libkrb5-dev, - libnm-glib-dev (>= 0.9.8) [linux-any], - libnm-glib-vpn-dev (>= 0.9.8) [linux-any], - libnm-gtk-dev (>= 0.9.8) [linux-any], - libnm-util-dev (>= 0.9.8) [linux-any], - libnotify-dev (>= 0.7.3), + libnm-dev (>= 1.2.0) [linux-any], + libnma-dev (>= 1.2.0) [linux-any], libpolkit-gobject-1-dev (>= 0.103), libpulse-dev, libpwquality-dev, - libsmbclient-dev (>= 2:3.6.12-1), + libsmbclient-dev (>= 2:3.6.12-1~), libupower-glib-dev (>= 0.99.0), libwacom-dev (>= 0.7) [linux-any], libxi-dev (>= 2:1.2), @@ -58,11 +51,12 @@ libxklavier-dev (>= 5.1), libxml2-dev, locales, - network-manager-dev (>= 0.9.8) [linux-any], - libnm-util-dev (>= 0.9.8) [linux-any], - libnm-glib-dev (>= 0.9.8) [linux-any], + network-manager-dev (>= 1.2.0) [linux-any], + libnm-util-dev (>= 1.2.0) [linux-any], + libnm-glib-dev (>= 1.2.0) [linux-any], libmm-glib-dev [linux-any], shared-mime-info, + tzdata , ttf-ubuntu-font-family, valac (>= 0.20.0), Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu @@ -79,7 +73,7 @@ gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 3.19.1), - gsettings-desktop-schemas (>= 3.19.3), + gsettings-desktop-schemas (>= 3.21.4), Recommends: cups-pk-helper, gnome-online-accounts, gnome-user-guide, @@ -88,7 +82,6 @@ ibus, iso-codes, libcanberra-pulse, - mesa-utils, mousetweaks, policykit-1, # rygel | rygel-tracker, @@ -100,8 +93,6 @@ realmd, ubuntu-system-service, unity-control-center-faces -Breaks: libgnome-control-center1 -Replaces: libgnome-control-center1 Suggests: gstreamer1.0-pulseaudio, libcanberra-gtk-module, libcanberra-gtk3-module, diff -Nru gnome-control-center-3.20.2/debian/control.in gnome-control-center-3.22.1/debian/control.in --- gnome-control-center-3.20.2/debian/control.in 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/control.in 2016-10-11 15:36:05.000000000 +0000 @@ -5,17 +5,14 @@ XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.8 -Build-Depends: autotools-dev, - cdbs (>= 0.4.41), - debhelper (>= 9), +Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1~), libaccountsservice-dev (>= 0.6.39), desktop-file-utils, - dh-autoreconf, gnome-common, gnome-pkg-tools (>= 0.10), gnome-settings-daemon-dev (>= 3.19.1), - gsettings-desktop-schemas-dev (>= 3.19.3), + gsettings-desktop-schemas-dev (>= 3.21.4), gtk-doc-tools, intltool (>= 0.37.1), libcanberra-gtk3-dev, @@ -23,29 +20,25 @@ libcolord-dev (>= 0.1.29), libcolord-gtk-dev (>= 0.1.24), libcups2-dev, - libdbus-1-dev (>= 0.32), libgdk-pixbuf2.0-dev (>= 2.23.0), libgirepository1.0-dev, libglib2.0-dev (>= 2.44.0), - libgnome-desktop-3-dev (>= 3.19.93), + libgnome-desktop-3-dev (>= 3.21.2), libgnomekbd-dev (>= 2.91.91), libgnome-bluetooth-dev (>= 3.18.0) [linux-any], libibus-1.0-dev (>= 1.5.2), - libgoa-1.0-dev (>= 3.15.1), + libgoa-1.0-dev (>= 3.21.5), libgrilo-0.3-dev (>= 0.3.0), - libgtk-3-dev (>= 3.19.12), + libgtk-3-dev (>= 3.22.0), libgtop2-dev, libgudev-1.0-dev [linux-any], libkrb5-dev, - libnm-glib-dev (>= 0.9.8) [linux-any], - libnm-glib-vpn-dev (>= 0.9.8) [linux-any], - libnm-gtk-dev (>= 0.9.8) [linux-any], - libnm-util-dev (>= 0.9.8) [linux-any], - libnotify-dev (>= 0.7.3), + libnm-dev (>= 1.2.0) [linux-any], + libnma-dev (>= 1.2.0) [linux-any], libpolkit-gobject-1-dev (>= 0.103), libpulse-dev, libpwquality-dev, - libsmbclient-dev (>= 2:3.6.12-1), + libsmbclient-dev (>= 2:3.6.12-1~), libupower-glib-dev (>= 0.99.0), libwacom-dev (>= 0.7) [linux-any], libxi-dev (>= 2:1.2), @@ -54,11 +47,12 @@ libxklavier-dev (>= 5.1), libxml2-dev, locales, - network-manager-dev (>= 0.9.8) [linux-any], - libnm-util-dev (>= 0.9.8) [linux-any], - libnm-glib-dev (>= 0.9.8) [linux-any], + network-manager-dev (>= 1.2.0) [linux-any], + libnm-util-dev (>= 1.2.0) [linux-any], + libnm-glib-dev (>= 1.2.0) [linux-any], libmm-glib-dev [linux-any], shared-mime-info, + tzdata , ttf-ubuntu-font-family, valac (>= 0.20.0), Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu @@ -75,7 +69,7 @@ gnome-control-center-data (>= ${source:Version}), gnome-desktop3-data, gnome-settings-daemon (>= 3.19.1), - gsettings-desktop-schemas (>= 3.19.3), + gsettings-desktop-schemas (>= 3.21.4), Recommends: cups-pk-helper, gnome-online-accounts, gnome-user-guide, @@ -84,7 +78,6 @@ ibus, iso-codes, libcanberra-pulse, - mesa-utils, mousetweaks, policykit-1, # rygel | rygel-tracker, @@ -96,8 +89,6 @@ realmd, ubuntu-system-service, unity-control-center-faces -Breaks: libgnome-control-center1 -Replaces: libgnome-control-center1 Suggests: gstreamer1.0-pulseaudio, libcanberra-gtk-module, libcanberra-gtk3-module, diff -Nru gnome-control-center-3.20.2/debian/gnome-control-center-data.install gnome-control-center-3.22.1/debian/gnome-control-center-data.install --- gnome-control-center-3.20.2/debian/gnome-control-center-data.install 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/gnome-control-center-data.install 2016-10-11 15:36:05.000000000 +0000 @@ -1,6 +1,7 @@ usr/share/gnome-control-center usr/share/sounds usr/share/locale +usr/share/gettext/its usr/share/icons usr/share/polkit-1 debian/source_gnome-control-center.py /usr/share/apport/package-hooks diff -Nru gnome-control-center-3.20.2/debian/gnome-control-center-data.postinst gnome-control-center-3.22.1/debian/gnome-control-center-data.postinst --- gnome-control-center-3.20.2/debian/gnome-control-center-data.postinst 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/gnome-control-center-data.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#! /bin/sh -set -e - -if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl "1:2.26"; then - rm -f /etc/xdg/autostart/gnome-at-session.desktop -fi - -#DEBHELPER# diff -Nru gnome-control-center-3.20.2/debian/gnome-control-center.docs gnome-control-center-3.22.1/debian/gnome-control-center.docs --- gnome-control-center-3.20.2/debian/gnome-control-center.docs 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/debian/gnome-control-center.docs 2016-10-11 15:36:05.000000000 +0000 @@ -0,0 +1,3 @@ +AUTHORS +NEWS +README diff -Nru gnome-control-center-3.20.2/debian/gnome-control-center.postinst gnome-control-center-3.22.1/debian/gnome-control-center.postinst --- gnome-control-center-3.20.2/debian/gnome-control-center.postinst 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/gnome-control-center.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#! /bin/sh -set -e - -rm -f /etc/gnome-vfs-2.0/modules/theme-method.conf -rm -f /etc/gnome-vfs-2.0/modules/font-method.conf - -#DEBHELPER# diff -Nru gnome-control-center-3.20.2/debian/gnome-control-center.postrm gnome-control-center-3.22.1/debian/gnome-control-center.postrm --- gnome-control-center-3.20.2/debian/gnome-control-center.postrm 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/gnome-control-center.postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -#! /bin/sh -set -e - -case "$1" in -purge) - rm -f /etc/gnome-settings-daemon/xrandr/monitors.xml || true - ;; -*) - ;; -esac - -#DEBHELPER# diff -Nru gnome-control-center-3.20.2/debian/patches/ubuntu_external_panels.patch gnome-control-center-3.22.1/debian/patches/ubuntu_external_panels.patch --- gnome-control-center-3.20.2/debian/patches/ubuntu_external_panels.patch 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/patches/ubuntu_external_panels.patch 2016-10-11 15:36:05.000000000 +0000 @@ -13,10 +13,10 @@ --- -Index: gnome-control-center-3.17.3/shell/cc-panel-loader.c +Index: gnome-control-center-3.22.0/shell/cc-panel-loader.c =================================================================== ---- gnome-control-center-3.17.3.orig/shell/cc-panel-loader.c -+++ gnome-control-center-3.17.3/shell/cc-panel-loader.c +--- gnome-control-center-3.22.0.orig/shell/cc-panel-loader.c ++++ gnome-control-center-3.22.0/shell/cc-panel-loader.c @@ -26,6 +26,20 @@ #include "cc-panel-loader.h" @@ -38,7 +38,7 @@ #ifndef CC_PANEL_LOADER_NO_GTYPES /* Extension points */ -@@ -149,6 +163,25 @@ parse_categories (GDesktopAppInfo *app) +@@ -164,6 +178,25 @@ parse_categories (GDesktopAppInfo *app) return retval; } @@ -64,7 +64,7 @@ void cc_panel_loader_fill_model (CcShellModel *model) { -@@ -159,6 +192,7 @@ cc_panel_loader_fill_model (CcShellModel +@@ -174,6 +207,7 @@ cc_panel_loader_fill_model (CcShellModel GDesktopAppInfo *app; char *desktop_name; int category; @@ -72,7 +72,7 @@ desktop_name = g_strconcat ("gnome-", all_panels[i].name, "-panel.desktop", NULL); -@@ -176,11 +210,43 @@ cc_panel_loader_fill_model (CcShellModel +@@ -191,11 +225,43 @@ cc_panel_loader_fill_model (CcShellModel if (G_UNLIKELY (category < 0)) continue; @@ -116,7 +116,7 @@ #ifndef CC_PANEL_LOADER_NO_GTYPES static GHashTable *panel_types; -@@ -208,7 +274,8 @@ cc_panel_loader_load_by_name (CcShell +@@ -223,7 +289,8 @@ cc_panel_loader_load_by_name (CcShell ensure_panel_types (); get_type = g_hash_table_lookup (panel_types, name); @@ -126,10 +126,10 @@ return g_object_new (get_type (), "shell", shell, -Index: gnome-control-center-3.17.3/shell/cc-panel-loader.h +Index: gnome-control-center-3.22.0/shell/cc-panel-loader.h =================================================================== ---- gnome-control-center-3.17.3.orig/shell/cc-panel-loader.h -+++ gnome-control-center-3.17.3/shell/cc-panel-loader.h +--- gnome-control-center-3.22.0.orig/shell/cc-panel-loader.h ++++ gnome-control-center-3.22.0/shell/cc-panel-loader.h @@ -29,6 +29,7 @@ G_BEGIN_DECLS @@ -138,11 +138,11 @@ GList *cc_panel_loader_get_panels (void); CcPanel *cc_panel_loader_load_by_name (CcShell *shell, const char *name, -Index: gnome-control-center-3.17.3/shell/cc-window.c +Index: gnome-control-center-3.22.0/shell/cc-window.c =================================================================== ---- gnome-control-center-3.17.3.orig/shell/cc-window.c -+++ gnome-control-center-3.17.3/shell/cc-window.c -@@ -140,6 +140,27 @@ get_icon_name_from_g_icon (GIcon *gicon) +--- gnome-control-center-3.22.0.orig/shell/cc-window.c ++++ gnome-control-center-3.22.0/shell/cc-window.c +@@ -139,6 +139,27 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } @@ -170,24 +170,25 @@ static gboolean activate_panel (CcWindow *self, const gchar *id, -@@ -155,6 +176,12 @@ activate_panel (CcWindow *self +@@ -153,6 +174,13 @@ activate_panel (CcWindow *self return FALSE; - priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); -+ if (!priv->current_panel) + self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); ++ ++ if (!self->current_panel) + { + external_launch_by_id (id); + return FALSE; + } + - cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); - gtk_widget_show (priv->current_panel); + cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel)); + gtk_widget_show (self->current_panel); -@@ -882,6 +909,7 @@ setup_model (CcWindow *shell) +@@ -873,6 +901,7 @@ setup_model (CcWindow *shell) add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System")); - cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->priv->store)); -+ cc_panel_loader_external_fill_model (CC_SHELL_MODEL (shell->priv->store)); + cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store)); ++ cc_panel_loader_external_fill_model (CC_SHELL_MODEL (shell->store)); } static void diff -Nru gnome-control-center-3.20.2/debian/patches/ubuntu-gnome-version.patch gnome-control-center-3.22.1/debian/patches/ubuntu-gnome-version.patch --- gnome-control-center-3.20.2/debian/patches/ubuntu-gnome-version.patch 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/patches/ubuntu-gnome-version.patch 2016-10-11 15:36:05.000000000 +0000 @@ -48,7 +48,7 @@ noinst_LTLIBRARIES = libinfo.la +UbuntuLogo.png: logo-generator -+ ./logo-generator --logo UbuntuLogoBlank.png --text "ubuntu 16.10" --output UbuntuLogo.png ++ ./logo-generator --logo UbuntuLogoBlank.png --text "ubuntu 17.04" --output UbuntuLogo.png + BUILT_SOURCES = \ + UbuntuLogo.png \ @@ -66,7 +66,7 @@ + private static string? file = null; + private static string? text = null; + private static string? result = null; -+ private const OptionEntry[] options = { ++ private const OptionEntry[] options = { + {"logo", 0, 0, OptionArg.FILENAME, ref file, "Path to logo", "LOGO"}, + {"text", 0, 0, OptionArg.STRING, ref text, "Sublogo text", "TEXT"}, + {"output", 0, 0, OptionArg.FILENAME, ref result, "Path to rendered output", "OUTPUT"}, @@ -79,7 +79,7 @@ + opt_context.set_help_enabled (true); + opt_context.add_main_entries (options, null); + opt_context.parse (ref args); -+ } catch (OptionError e) { ++ } catch (OptionError e) { + stdout.printf ("error: %s\n", e.message); + stdout.printf ("Run '%s --help' to see a full list of available command line options.\n", args[0]); + return 0; diff -Nru gnome-control-center-3.20.2/debian/rules gnome-control-center-3.22.1/debian/rules --- gnome-control-center-3.20.2/debian/rules 2016-10-15 17:05:25.000000000 +0000 +++ gnome-control-center-3.22.1/debian/rules 2016-10-11 15:36:05.000000000 +0000 @@ -1,23 +1,25 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -include /usr/share/dpkg/buildflags.mk +export DEB_CPPFLAGS_MAINT_APPEND = -DSSHD_SERVICE=\"ssh.service\" -CPPFLAGS += -DSSHD_SERVICE=\\\"ssh.service\\\" +%: + dh $@ --with gnome -DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mimedb +override_dh_autoreconf: + dh_autoreconf --as-needed -DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act -pre-build:: +override_dh_auto_configure: + dh_auto_configure -- \ + --libexecdir=\$${prefix}/lib/gnome-control-center \ + --disable-update-mimedb + +override_dh_auto_build: touch panels/info/UbuntuLogo.png cp debian/UbuntuLogoBlank.png panels/info + dh_auto_build -common-binary-post-install-arch:: list-missing +override_dh_install: + dh_install --list-missing diff -Nru gnome-control-center-3.20.2/libgd/Makefile.in gnome-control-center-3.22.1/libgd/Makefile.in --- gnome-control-center-3.20.2/libgd/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/libgd/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -447,8 +447,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/Makefile.decl gnome-control-center-3.22.1/Makefile.decl --- gnome-control-center-3.20.2/Makefile.decl 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/Makefile.decl 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,53 @@ +GTESTER = gtester # in $PATH for non-GLIB packages +GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +# initialize variables for unconditional += appending +TEST_PROGS = + +# test: run all tests in cwd and subdirs +test: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '' > $@.xml ; \ + echo '' >> $@.xml ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ + done ; \ + echo >> $@.xml ; \ + echo '' >> $@.xml ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ + } +.PHONY: test test-report perf-report full-report +# run make test as part of make check +check-local: test diff -Nru gnome-control-center-3.20.2/Makefile.in gnome-control-center-3.22.1/Makefile.in --- gnome-control-center-3.20.2/Makefile.in 2016-10-11 14:26:38.000000000 +0000 +++ gnome-control-center-3.22.1/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -313,8 +313,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/man/Makefile.in gnome-control-center-3.22.1/man/Makefile.in --- gnome-control-center-3.20.2/man/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/man/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -261,8 +261,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/NEWS gnome-control-center-3.22.1/NEWS --- gnome-control-center-3.20.2/NEWS 2016-10-11 14:24:47.000000000 +0000 +++ gnome-control-center-3.22.1/NEWS 2016-10-11 12:08:54.000000000 +0000 @@ -1,41 +1,142 @@ ============== -Version 3.20.2 +Version 3.22.1 ============== -- Fix panel search -- Fix some keyboard navigation issues - Translation updates Display: -- Ensure only one output is set as primary -- Fix possible crash on startup +- Ensure the preselected resolution matches the current mode + +Keyboard: +- Fix capture of Alt+PrintScreen shortcuts + +============== +Version 3.22.0 +============== Network: -- Fix some SSID escaping issues +- Only show a gateway entry for the first IPv4 address, NetworkManager + ignored every subsequent ones, but we still had a UI for those +- Fix application of the default gateway +- Fix possible crashes when editing IPv4 gateways or routes Power: -- Fix hiding wi-fi, mobile broadband toggles -- Fix wifi device state when opening power panel +- Fix "automatic suspend" label not taking batteries into account +- Fix initial state of the Wi-Fi switch +=============== +Version 3.21.92 +=============== Privacy: -- React to changes in permissions store -- Update for PermissionStore DBus API changes +- Fix quoting of distro name and privacy URL -User accounts: -- Fix missing records in the history dialog +Network: +- Fix warning when enabling hotspot +- Fix saving of IPv6 gateway +- Fix warning if IPv6 gateway is empty +- Fix IPv6 settings not being applicable when method changes +- Return better error when 8021x security is invalid +- Avoid warning when ad-hoc mode is invalid +- Re-set the SSID when enabling the Hotspot +- Fix crash when changing IPv4 DNS + +Keyboard: +- Many UI changes following up from the panel redesign +- Don't grab the mouse pointer when capturing shortcuts +- Don't regrab the keyboard after an event if already grabbed +- Fix grabs not working when initially showing the dialog +- Don't apply "Backspace" straight away +- Allow Tab and Super in accels +- Normalise Shift and Tab in shortcuts +- Fix shortcut label in RTL languages + +Region: +- Avoid a crash on panel destruction + +=============== +Version 3.21.90 +=============== -============== -Version 3.20.1 -============== +- Fix truncated panel names for larger fonts +- Port to libnm 1.2 +- Translation updates +Display: +- Add option to enable and disable overscan compensation when + supported by the driver +- Ensure only one output is set as primary +- Separate interlaced from normal modes + +Info: +- Fetch renderer information from gnome-session +- Show OS build-id + +Keyboard: +- Update to a new design + +Mouse: +- Show only relevant widgets for the hardware we're able to detect +- Detect and warn if we're running on the synaptics driver +- Make all listbox rows unactivatable +- Remove superfluous GtkListBoxRow +- Allow keyboard navigation/focus to the Touchpad section switches +- Offer a separate option for edge scrolling +- Don't allow two-finger and edge scrolling at the same time + +Network: +- Use VPN plugin paths as specified in the .name files +- Ensure the Wifi list is updated as networks appear/disapper +- Hide firewall zone combo when firewalld is not running +- Remove bridge, bond, team, VLAN and virtual devices support - these + are most useful on non-desktop systems for which a UI like Cockpit + is better suited +- Remove the first page of the "Add Connection" wizard +- Update wireless-security UI from network-manager-applet +- Remember "Ignore CA certificate" +- Fix removed connections not disappearing +- Fix hotspot silently failing with long hostname +- Fix several crashes + +Online Accounts: +- Don't use deprecated GoaProviderGroup API +- Add a Calendar group +- Let goa_provider_show_account create the full UI + +Power: - Translate the "When the Power Button is pressed" drop-down -- Fix a number of build warnings -- Fix crash opening Wacom panel under Wayland -- Fix Wi-Fi list being empty when enabled within the Network panel -- Throw an error when using the Synaptics touchpad driver -- Add support for older versions of CUPS -- Hide firewall zone combo when firewalld isn't running -- Fix the visual bell test not working in some cases +- Show "Suspend & Power Off" section only when relevant + +Printers: +- Add compatibility code for older cups +- Use a panel wide page for empty state +- Present spinner while populating the panel +- Rename printers asynchronously +- Added new async API to check availability of maintenance commands +- Check all supported CUPS commands, not just the first one + +Privacy: +- React to changes in permissions store +- Various layout and cosmetic cleanups + +Region: +- Reset the input chooser on escape +- Improve widget spacing + +Search: +- Work around applications not shipping icons at all sizes +- Introduce the new Search Locations dialog + +Sharing: +- Update to a new design + +Universal Access: +- Specify a window when testing visual bell +- Correct label for "Sound Keys" +- Allow keyboard navigation/focus to the settings switches + +User Accounts: +- Update to a new design +- Fix missing records in the history dialog ============== Version 3.20.0 diff -Nru gnome-control-center-3.20.2/panels/background/cc-background-item.c gnome-control-center-3.22.1/panels/background/cc-background-item.c --- gnome-control-center-3.20.2/panels/background/cc-background-item.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/background/cc-background-item.c 2016-05-02 16:24:31.000000000 +0000 @@ -204,7 +204,7 @@ } else { /* translators: 100 × 100px * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN */ - item->priv->size = g_strdup_printf (_("%d \303\227 %d"), + item->priv->size = g_strdup_printf (_("%d × %d"), item->priv->width, item->priv->height); } diff -Nru gnome-control-center-3.20.2/panels/background/gnome-background-panel.desktop.in.in gnome-control-center-3.22.1/panels/background/gnome-background-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/background/gnome-background-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/background/gnome-background-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Background +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Back­ground _Comment=Change your background image to a wallpaper or photo Exec=gnome-control-center background Icon=preferences-desktop-wallpaper @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings; OnlyShowIn=GNOME; # Translators: those are keywords for the background control-center panel _Keywords=Wallpaper;Screen;Desktop; diff -Nru gnome-control-center-3.20.2/panels/background/Makefile.in gnome-control-center-3.22.1/panels/background/Makefile.in --- gnome-control-center-3.20.2/panels/background/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/background/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -337,8 +337,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -611,22 +609,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-chooser-dialog.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in gnome-control-center-3.22.1/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,12 +1,13 @@ [Desktop Entry] -_Name=Bluetooth +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Blue­tooth _Comment=Turn Bluetooth on and off and connect your devices Icon=bluetooth Exec=gnome-control-center bluetooth Terminal=false Type=Application NoDisplay=true -Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings; OnlyShowIn=GNOME;Unity; StartupNotify=true X-GNOME-Bugzilla-Bugzilla=GNOME diff -Nru gnome-control-center-3.20.2/panels/bluetooth/Makefile.in gnome-control-center-3.22.1/panels/bluetooth/Makefile.in --- gnome-control-center-3.20.2/panels/bluetooth/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/bluetooth/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -314,8 +314,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -530,22 +528,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-bluetooth-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/color/gnome-color-panel.desktop.in.in gnome-control-center-3.22.1/panels/color/gnome-color-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/color/gnome-color-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/gnome-color-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Color +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Co­lor _Comment=Calibrate the color of your devices, such as displays, cameras or printers Exec=gnome-control-center color Icon=preferences-color @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings; +Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/color/icons/16x16/Makefile.in gnome-control-center-3.22.1/panels/color/icons/16x16/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/16x16/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/16x16/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/22x22/Makefile.in gnome-control-center-3.22.1/panels/color/icons/22x22/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/22x22/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/22x22/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/24x24/Makefile.in gnome-control-center-3.22.1/panels/color/icons/24x24/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/24x24/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/24x24/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/256x256/Makefile.in gnome-control-center-3.22.1/panels/color/icons/256x256/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/256x256/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/256x256/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/32x32/Makefile.in gnome-control-center-3.22.1/panels/color/icons/32x32/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/32x32/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/32x32/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/48x48/Makefile.in gnome-control-center-3.22.1/panels/color/icons/48x48/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/48x48/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/48x48/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/64x64/Makefile.in gnome-control-center-3.22.1/panels/color/icons/64x64/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/64x64/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/64x64/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/Makefile.in gnome-control-center-3.22.1/panels/color/icons/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/icons/scalable/Makefile.in gnome-control-center-3.22.1/panels/color/icons/scalable/Makefile.in --- gnome-control-center-3.20.2/panels/color/icons/scalable/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/icons/scalable/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/color/Makefile.in gnome-control-center-3.22.1/panels/color/Makefile.in --- gnome-control-center-3.20.2/panels/color/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/color/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -357,8 +357,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -587,22 +585,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-color-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/common/Makefile.am gnome-control-center-3.22.1/panels/common/Makefile.am --- gnome-control-center-3.20.2/panels/common/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/common/Makefile.am 2016-09-27 12:37:36.000000000 +0000 @@ -10,7 +10,9 @@ BUILT_SOURCES = \ cc-common-resources.c \ - cc-common-resources.h + cc-common-resources.h \ + gsd-common-enums.c \ + gsd-common-enums.h liblanguage_la_SOURCES = \ $(BUILT_SOURCES) \ diff -Nru gnome-control-center-3.20.2/panels/common/Makefile.in gnome-control-center-3.22.1/panels/common/Makefile.in --- gnome-control-center-3.20.2/panels/common/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/common/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -129,7 +129,7 @@ am__v_lt_0 = --silent am__v_lt_1 = liblanguage_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_2 = cc-common-resources.lo +am__objects_2 = cc-common-resources.lo gsd-common-enums.lo am_liblanguage_la_OBJECTS = $(am__objects_2) cc-util.lo \ cc-common-language.lo cc-language-chooser.lo liblanguage_la_OBJECTS = $(am_liblanguage_la_OBJECTS) @@ -332,8 +332,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -468,7 +466,9 @@ $(am__append_1) BUILT_SOURCES = \ cc-common-resources.c \ - cc-common-resources.h + cc-common-resources.h \ + gsd-common-enums.c \ + gsd-common-enums.h liblanguage_la_SOURCES = \ $(BUILT_SOURCES) \ @@ -575,22 +575,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsd-input-helper.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/datetime/gnome-datetime-panel.desktop.in.in gnome-control-center-3.22.1/panels/datetime/gnome-datetime-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/datetime/gnome-datetime-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/gnome-datetime-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,4 +1,5 @@ [Desktop Entry] +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details _Name=Date & Time _Comment=Change the date and time, including time zone Exec=gnome-control-center datetime @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings; OnlyShowIn=GNOME; # Translators: those are keywords for the date and time control-center panel _Keywords=Clock;Timezone;Location; diff -Nru gnome-control-center-3.20.2/panels/datetime/Makefile.am gnome-control-center-3.22.1/panels/datetime/Makefile.am --- gnome-control-center-3.20.2/panels/datetime/Makefile.am 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/Makefile.am 2016-09-27 12:37:36.000000000 +0000 @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + # This is used in PANEL_CFLAGS cappletname = datetime @@ -23,7 +25,9 @@ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ $(NULL) -noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone +# test-timezone is still too noisy +noinst_PROGRAMS = $(TEST_PROGS) test-timezone +TEST_PROGS += test-timezone-gfx test-endianess test_timezone_SOURCES = test-timezone.c cc-timezone-map.h cc-timezone-map.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h test_timezone_LDADD = $(DATETIME_PANEL_LIBS) -lm @@ -31,22 +35,14 @@ test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) -lm -test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) +test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) -DSRCDIR="\"$(srcdir)\"" test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h test_endianess_LDADD = $(DATETIME_PANEL_LIBS) test_endianess_CFLAGS = $(DATETIME_PANEL_CFLAGS) -all-local: check-local - -check-local: test-timezone-gfx test-endianess test-timezone - $(builddir)/test-timezone-gfx $(srcdir)/data - $(builddir)/test-endianess -# $(builddir)/test-timezone - noinst_LTLIBRARIES = libdate_time.la - # This requires running d-bus session and accessible timedate1 daemon # FIXME: need to find a way how to filter out unnecessary d-bus stuff (introspectable, properties) #timedated1-interface.xml: diff -Nru gnome-control-center-3.20.2/panels/datetime/Makefile.in gnome-control-center-3.22.1/panels/datetime/Makefile.in --- gnome-control-center-3.20.2/panels/datetime/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -90,8 +90,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = test-timezone-gfx$(EXEEXT) test-endianess$(EXEEXT) \ - test-timezone$(EXEEXT) +noinst_PROGRAMS = $(am__EXEEXT_1) test-timezone$(EXEEXT) subdir = panels/datetime ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ @@ -122,6 +121,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am__EXEEXT_1 = test-timezone-gfx$(EXEEXT) test-endianess$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_test_endianess_OBJECTS = test_endianess-test-endianess.$(OBJEXT) \ test_endianess-date-endian.$(OBJEXT) @@ -265,7 +265,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(srcdir)/gnome-datetime-panel.desktop.in.in \ - $(top_srcdir)/depcomp + $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -399,8 +399,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -527,6 +525,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages +GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +# initialize variables for unconditional += appending +TEST_PROGS = test-timezone-gfx test-endianess # This is used in PANEL_CFLAGS cappletname = datetime @@ -555,11 +558,10 @@ test_timezone_CFLAGS = $(DATETIME_PANEL_CFLAGS) test_timezone_gfx_SOURCES = test-timezone-gfx.c tz.c tz.h cc-datetime-resources.c cc-datetime-resources.h test_timezone_gfx_LDADD = $(DATETIME_PANEL_LIBS) -lm -test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) +test_timezone_gfx_CFLAGS = $(DATETIME_PANEL_CFLAGS) -DSRCDIR="\"$(srcdir)\"" test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h test_endianess_LDADD = $(DATETIME_PANEL_LIBS) test_endianess_CFLAGS = $(DATETIME_PANEL_CFLAGS) -# $(builddir)/test-timezone noinst_LTLIBRARIES = libdate_time.la # This requires running d-bus session and accessible timedate1 daemon @@ -613,7 +615,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -633,6 +635,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.decl $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -703,22 +706,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tz.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -1181,7 +1187,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(polkitdir)"; do \ @@ -1300,8 +1306,8 @@ .MAKE: $(am__recursive_targets) all check check-am install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ - check check-am check-local clean clean-generic clean-libtool \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am check-local clean clean-generic clean-libtool \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ @@ -1325,11 +1331,53 @@ .PRECIOUS: Makefile -all-local: check-local - -check-local: test-timezone-gfx test-endianess test-timezone - $(builddir)/test-timezone-gfx $(srcdir)/data - $(builddir)/test-endianess +# test: run all tests in cwd and subdirs +test: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '' > $@.xml ; \ + echo '' >> $@.xml ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ + done ; \ + echo >> $@.xml ; \ + echo '' >> $@.xml ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ + } +.PHONY: test test-report perf-report full-report +# run make test as part of make check +check-local: test timedated.c: timedated.h timedated.h: Makefile.am timedated1-interface.xml gdbus-codegen \ diff -Nru gnome-control-center-3.20.2/panels/datetime/po-timezones/Makefile.am gnome-control-center-3.22.1/panels/datetime/po-timezones/Makefile.am --- gnome-control-center-3.20.2/panels/datetime/po-timezones/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/po-timezones/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -15,6 +15,8 @@ %.mo: %.po $(AM_V_GEN) msgfmt -o $@ $< +test: + install: $(CATALOGS) @mkdir -p $(DESTDIR)$(localedir) for n in $(CATALOGS); do \ diff -Nru gnome-control-center-3.20.2/panels/datetime/po-timezones/Makefile.in gnome-control-center-3.22.1/panels/datetime/po-timezones/Makefile.in --- gnome-control-center-3.20.2/panels/datetime/po-timezones/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/po-timezones/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -230,8 +230,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -563,6 +561,8 @@ %.mo: %.po $(AM_V_GEN) msgfmt -o $@ $< +test: + install: $(CATALOGS) @mkdir -p $(DESTDIR)$(localedir) for n in $(CATALOGS); do \ diff -Nru gnome-control-center-3.20.2/panels/datetime/test-endianess.c gnome-control-center-3.22.1/panels/datetime/test-endianess.c --- gnome-control-center-3.20.2/panels/datetime/test-endianess.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/test-endianess.c 2016-08-12 12:43:57.000000000 +0000 @@ -20,14 +20,35 @@ g_print ("\t\t%s\n", date_endian_to_string (endianess)); } -int main (int argc, char **argv) +static void +test_endianess (void) { GDir *dir; const char *name; + dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); + if (dir == NULL) { + /* Try with /usr/share/locale/ + * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ + dir = g_dir_open ("/usr/share/locale/", 0, NULL); + if (dir == NULL) { + g_assert_not_reached (); + } + } + + while ((name = g_dir_read_name (dir)) != NULL) + print_endianess (name); +} + +int main (int argc, char **argv) +{ setlocale (LC_ALL, ""); bind_textdomain_codeset ("libc", "UTF-8"); + g_test_init (&argc, &argv, NULL); + + g_setenv ("G_DEBUG", "fatal_warnings", FALSE); + if (argv[1] != NULL) { verbose = 1; @@ -38,18 +59,7 @@ return 0; } - dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); - if (dir == NULL) { - /* Try with /usr/share/locale/ - * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ - dir = g_dir_open ("/usr/share/locale/", 0, NULL); - if (dir == NULL) { - return 1; - } - } - - while ((name = g_dir_read_name (dir)) != NULL) - print_endianess (name); + g_test_add_func ("/datetime/endianess", test_endianess); - return 0; + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/panels/datetime/test-timezone.c gnome-control-center-3.22.1/panels/datetime/test-timezone.c --- gnome-control-center-3.20.2/panels/datetime/test-timezone.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/test-timezone.c 2016-08-12 12:43:57.000000000 +0000 @@ -1,3 +1,4 @@ +#include #include #include "cc-timezone-map.h" @@ -56,15 +57,13 @@ return tzs; } -int main (int argc, char **argv) +static void +test_timezone (void) { CcTimezoneMap *map; TzDB *tz_db; GList *tzs, *l; GHashTable *ht; - int ret = 0; - - gtk_init (&argc, &argv); ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); map = cc_timezone_map_new (); @@ -83,12 +82,13 @@ else g_print ("Failed to locate timezone '%s' (original name: '%s')\n", clean_tz, timezone); g_hash_table_insert (ht, g_strdup (clean_tz), GINT_TO_POINTER (TRUE)); + g_test_fail (); } /* We don't warn for those two, we'll just fallback * in the panel code */ if (!g_str_equal (clean_tz, "posixrules") && !g_str_equal (clean_tz, "Factory")) - ret = 1; + g_test_fail (); } g_free (timezone); g_free (clean_tz); @@ -96,6 +96,17 @@ g_list_free (tzs); tz_db_free (tz_db); g_hash_table_destroy (ht); +} + +int main (int argc, char **argv) +{ + setlocale (LC_ALL, ""); + gtk_init (NULL, NULL); + g_test_init (&argc, &argv, NULL); + + g_setenv ("G_DEBUG", "fatal_warnings", FALSE); + + g_test_add_func ("/datetime/timezone", test_timezone); - return ret; + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/panels/datetime/test-timezone-gfx.c gnome-control-center-3.22.1/panels/datetime/test-timezone-gfx.c --- gnome-control-center-3.20.2/panels/datetime/test-timezone-gfx.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/datetime/test-timezone-gfx.c 2016-09-27 12:37:36.000000000 +0000 @@ -3,24 +3,13 @@ #include "tz.h" -int main (int argc, char **argv) +static void +test_timezone_gfx (gconstpointer data) { + const char *pixmap_dir = data; TzDB *db; GPtrArray *locs; guint i; - char *pixmap_dir; - int retval = 0; - - setlocale (LC_ALL, ""); - - if (argc == 2) { - pixmap_dir = g_strdup (argv[1]); - } else if (argc == 1) { - pixmap_dir = g_strdup ("data/"); - } else { - g_message ("Usage: %s [PIXMAP DIRECTORY]", argv[0]); - return 1; - } db = tz_load_db (); locs = tz_get_locations (db); @@ -42,14 +31,34 @@ if (g_file_test (path, G_FILE_TEST_IS_REGULAR) == FALSE) { g_message ("File '%s' missing for zone '%s'", filename, loc->zone); - retval = 1; + g_test_fail (); } g_free (filename); g_free (path); } tz_db_free (db); - g_free (pixmap_dir); +} + +int main (int argc, char **argv) +{ + char *pixmap_dir; + + setlocale (LC_ALL, ""); + g_test_init (&argc, &argv, NULL); + + g_setenv ("G_DEBUG", "fatal_warnings", FALSE); + + if (argc == 2) { + pixmap_dir = g_strdup (argv[1]); + } else if (argc == 1) { + pixmap_dir = g_strdup (SRCDIR "/data/"); + } else { + g_message ("Usage: %s [PIXMAP DIRECTORY]", argv[0]); + return 1; + } + + g_test_add_data_func ("/datetime/timezone-gfx", pixmap_dir, test_timezone_gfx); - return retval; + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/panels/display/cc-display-panel.c gnome-control-center-3.22.1/panels/display/cc-display-panel.c --- gnome-control-center-3.20.2/panels/display/cc-display-panel.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/display/cc-display-panel.c 2016-10-10 16:17:15.000000000 +0000 @@ -78,6 +78,7 @@ GtkWidget *res_combo; GtkWidget *freq_combo; GHashTable *res_freqs; + GtkWidget *scaling_switch; GtkWidget *rotate_left_button; GtkWidget *upside_down_button; GtkWidget *rotate_right_button; @@ -122,12 +123,12 @@ GnomeRROutput *output; GVariantBuilder builder; gint number; - gboolean has_outputs; if (!priv->shell_proxy) return; - has_outputs = FALSE; + g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE); + g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY); infos = gnome_rr_config_get_outputs (priv->current_configuration); for (info = infos; *info; info++) @@ -136,13 +137,6 @@ if (number == 0) continue; - if (!has_outputs) - { - g_variant_builder_init (&builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_open (&builder, G_VARIANT_TYPE_ARRAY); - has_outputs = TRUE; - } - output = gnome_rr_screen_get_output_by_name (priv->screen, gnome_rr_output_info_get_name (*info)); g_variant_builder_add (&builder, "{uv}", @@ -150,9 +144,6 @@ g_variant_new_int32 (number)); } - if (!has_outputs) - return; - g_variant_builder_close (&builder); g_dbus_proxy_call (priv->shell_proxy, @@ -1670,11 +1661,12 @@ gint width = gnome_rr_mode_get_width (mode); gint height = gnome_rr_mode_get_height (mode); const char *aspect = make_aspect_string (width, height); + const char *interlaced = gnome_rr_mode_get_is_interlaced (mode) ? "i" : ""; if (aspect != NULL) - return g_strdup_printf ("%d × %d (%s)", width, height, aspect); + return g_strdup_printf ("%d × %d%s (%s)", width, height, interlaced, aspect); else - return g_strdup_printf ("%d × %d", width, height); + return g_strdup_printf ("%d × %d%s", width, height, interlaced); } static GtkWidget * @@ -1896,7 +1888,8 @@ /* select the current mode in the combo box */ if (gnome_rr_mode_get_width (modes[i]) == gnome_rr_mode_get_width (current_mode) - && gnome_rr_mode_get_height (modes[i]) == gnome_rr_mode_get_height (current_mode)) + && gnome_rr_mode_get_height (modes[i]) == gnome_rr_mode_get_height (current_mode) + && gnome_rr_mode_get_is_interlaced (modes[i]) == gnome_rr_mode_get_is_interlaced (current_mode)) { gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->res_combo), &iter); @@ -2171,12 +2164,23 @@ } static void +underscan_switch_toggled (CcDisplayPanel *panel) +{ + CcDisplayPanelPrivate *priv = panel->priv; + gboolean value; + + value = gtk_switch_get_active (GTK_SWITCH (priv->scaling_switch)); + gnome_rr_output_info_set_underscanning (priv->current_output, value); + update_apply_button (panel); +} + +static void show_setup_dialog (CcDisplayPanel *panel) { CcDisplayPanelPrivate *priv = panel->priv; GtkWidget *listbox = NULL, *content_area, *item, *box, *frame, *preview; GtkWidget *label, *rotate_box; - gint i, width_mm, height_mm, old_width, old_height; + gint i, width_mm, height_mm, old_width, old_height, grid_pos; GnomeRROutput *output; gchar *str; gboolean clone, was_clone, primary, was_primary, active; @@ -2219,6 +2223,7 @@ gtk_container_add (GTK_CONTAINER (content_area), box); /* configuration grid */ + grid_pos = 0; priv->config_grid = gtk_grid_new (); gtk_widget_set_margin_start (priv->config_grid, 36); gtk_widget_set_margin_end (priv->config_grid, 36); @@ -2231,7 +2236,8 @@ priv->current_configuration, cc_display_panel_get_output_id (priv->current_output), DISPLAY_PREVIEW_SETUP_HEIGHT); - gtk_grid_attach (GTK_GRID (priv->config_grid), preview, 0, 0, 2, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), preview, 0, grid_pos, 2, 1); + grid_pos++; /* rotation */ show_rotation = should_show_rotation (panel, output); @@ -2243,8 +2249,9 @@ gtk_widget_set_margin_bottom (rotate_box, 12); gtk_style_context_add_class (gtk_widget_get_style_context (rotate_box), GTK_STYLE_CLASS_LINKED); - gtk_grid_attach (GTK_GRID (priv->config_grid), rotate_box, 0, 1, 2, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), rotate_box, 0, grid_pos, 2, 1); gtk_widget_set_halign (rotate_box, GTK_ALIGN_CENTER); + grid_pos++; if (gnome_rr_output_info_supports_rotation (priv->current_output, GNOME_RR_ROTATION_90)) @@ -2310,25 +2317,28 @@ label = gtk_label_new (_("Size")); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 2, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, grid_pos, 1, 1); gtk_widget_set_halign (label, GTK_ALIGN_END); label = gtk_label_new (str); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, grid_pos, 1, 1); gtk_widget_set_halign (label, GTK_ALIGN_START); g_free (str); + + grid_pos++; } /* aspect ratio */ label = gtk_label_new (_("Aspect Ratio")); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, grid_pos, 1, 1); gtk_widget_set_halign (label, GTK_ALIGN_END); label = gtk_label_new (make_aspect_string (gnome_rr_output_info_get_preferred_width (priv->current_output), gnome_rr_output_info_get_preferred_height (priv->current_output))); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 1, grid_pos, 1, 1); gtk_widget_set_halign (label, GTK_ALIGN_START); + grid_pos++; /* resolution combo box */ res_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); @@ -2345,12 +2355,34 @@ label = gtk_label_new (_("Resolution")); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 4, 1, 1); - gtk_grid_attach (GTK_GRID (priv->config_grid), priv->res_combo, 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, grid_pos, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), priv->res_combo, 1, grid_pos, 1, 1); + grid_pos++; gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_halign (priv->res_combo, GTK_ALIGN_START); + /* overscan */ + if (!gnome_rr_output_is_builtin_display (output) && + gnome_rr_output_supports_underscanning (output)) + { + priv->scaling_switch = gtk_switch_new (); + gtk_switch_set_active (GTK_SWITCH (priv->scaling_switch), + gnome_rr_output_info_get_underscanning (priv->current_output)); + g_signal_connect_swapped (G_OBJECT (priv->scaling_switch), "notify::active", + G_CALLBACK (underscan_switch_toggled), panel); + + label = gtk_label_new (_("Adjust for TV")); + gtk_style_context_add_class (gtk_widget_get_style_context (label), + GTK_STYLE_CLASS_DIM_LABEL); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, grid_pos, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), priv->scaling_switch, 1, grid_pos, 1, 1); + grid_pos++; + + gtk_widget_set_halign (label, GTK_ALIGN_END); + gtk_widget_set_halign (priv->scaling_switch, GTK_ALIGN_START); + } + /* frequency combo box */ freq_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER); priv->freq_combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (freq_model)); @@ -2360,18 +2392,19 @@ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->freq_combo), renderer, "text", 0); g_signal_connect (priv->freq_combo, "changed", G_CALLBACK (freq_combo_changed), panel); - gtk_grid_attach (GTK_GRID (priv->config_grid), priv->freq_combo, 1, 5, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), priv->freq_combo, 1, grid_pos, 1, 1); gtk_widget_set_halign (priv->freq_combo, GTK_ALIGN_START); gtk_widget_set_no_show_all (priv->freq_combo, TRUE); label = gtk_label_new (_("Refresh Rate")); gtk_style_context_add_class (gtk_widget_get_style_context (label), GTK_STYLE_CLASS_DIM_LABEL); - gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, 5, 1, 1); + gtk_grid_attach (GTK_GRID (priv->config_grid), label, 0, grid_pos, 1, 1); gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_no_show_all (label, TRUE); g_object_bind_property (priv->freq_combo, "visible", label, "visible", G_BINDING_BIDIRECTIONAL); + grid_pos++; was_clone = clone = gnome_rr_config_get_clone (priv->current_configuration); was_primary = primary = gnome_rr_output_info_get_primary (priv->current_output); diff -Nru gnome-control-center-3.20.2/panels/display/gnome-display-panel.desktop.in.in gnome-control-center-3.22.1/panels/display/gnome-display-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/display/gnome-display-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/display/gnome-display-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Displays +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Dis­plays _Comment=Choose how to use connected monitors and projectors Exec=gnome-control-center display Icon=preferences-desktop-display @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/display/Makefile.in gnome-control-center-3.22.1/panels/display/Makefile.in --- gnome-control-center-3.20.2/panels/display/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/display/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -319,8 +319,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -537,22 +535,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollarea.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/info/cc-info-panel.c gnome-control-center-3.22.1/panels/info/cc-info-panel.c --- gnome-control-center-3.20.2/panels/info/cc-info-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/info/cc-info-panel.c 2016-08-12 12:43:57.000000000 +0000 @@ -39,8 +39,6 @@ #endif #ifdef GDK_WINDOWING_X11 #include -#include -#include #endif #include "gsd-disk-space-helper.h" @@ -57,10 +55,6 @@ #define MEDIA_HANDLING_SCHEMA "org.gnome.desktop.media-handling" -/* Session */ -#define GNOME_SESSION_MANAGER_SCHEMA "org.gnome.desktop.session" -#define KEY_SESSION_NAME "session-name" - #define WID(w) (GtkWidget *) gtk_builder_get_object (self->priv->builder, w) CC_PANEL_REGISTER (CcInfoPanel, cc_info_panel) @@ -72,7 +66,7 @@ /* Will be the string below, or "Unknown" */ const char *hardware_string; - char *glx_renderer; + char *renderer; } GraphicsData; typedef struct @@ -103,8 +97,6 @@ GSettings *media_settings; GtkWidget *other_application_combo; - GDBusConnection *session_bus; - GraphicsData *graphics_data; }; @@ -288,79 +280,47 @@ static void graphics_data_free (GraphicsData *gdata) { - g_free (gdata->glx_renderer); + g_free (gdata->renderer); g_slice_free (GraphicsData, gdata); } -#ifdef GDK_WINDOWING_X11 static char * -get_graphics_data_glx_renderer () +get_renderer_from_session (void) { - Display *display; - int attributes[] = { - GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, - GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR, - GLX_RENDER_TYPE, GLX_RGBA_BIT, - None - }; - int nconfigs; - int major, minor; - Window window; - GLXFBConfig *config; - GLXWindow glxwin; - GLXContext context; - XSetWindowAttributes win_attributes; - XVisualInfo *visualInfo; + GDBusProxy *session_proxy; + GVariant *renderer_variant; char *renderer; + GError *error = NULL; - gdk_error_trap_push (); - - display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.gnome.SessionManager", + "/org/gnome/SessionManager", + "org.gnome.SessionManager", + NULL, &error); + if (error != NULL) + { + g_warning ("Unable to connect to create a proxy for org.gnome.SessionManager: %s", + error->message); + g_error_free (error); + return NULL; + } - glXQueryVersion (display, &major, &minor); - config = glXChooseFBConfig (display, DefaultScreen (display), - attributes, &nconfigs); - if (config == NULL) { - g_warning ("Failed to get OpenGL configuration"); + renderer_variant = g_dbus_proxy_get_cached_property (session_proxy, "Renderer"); + g_object_unref (session_proxy); - gdk_error_trap_pop_ignored (); - return NULL; - } - visualInfo = glXGetVisualFromFBConfig (display, *config); - win_attributes.colormap = XCreateColormap (display, DefaultRootWindow(display), - visualInfo->visual, AllocNone ); - - window = XCreateWindow (display, DefaultRootWindow (display), - 0, 0, /* x, y */ - 1, 1, /* width, height */ - 0, /* border_width */ - visualInfo->depth, InputOutput, - visualInfo->visual, CWColormap, &win_attributes); - glxwin = glXCreateWindow (display, *config, window, NULL); - - context = glXCreateNewContext (display, *config, GLX_RGBA_TYPE, - NULL, TRUE); - XFree (config); - - glXMakeContextCurrent (display, glxwin, glxwin, context); - renderer = (char *) glGetString (GL_RENDERER); - g_debug ("Got GL_RENDERER: '%s'", renderer); - renderer = renderer ? prettify_info (renderer) : NULL; - - glXMakeContextCurrent (display, None, None, NULL); - glXDestroyContext (display, context); - glXDestroyWindow (display, glxwin); - XDestroyWindow (display, window); - XFree (visualInfo); + if (!renderer_variant) + { + g_warning ("Unable to retrieve org.gnome.SessionManager.Renderer property"); + return NULL; + } - if (gdk_error_trap_pop () != Success) { - g_warning ("Failed to get OpenGL driver info"); - return NULL; - } + renderer = prettify_info (g_variant_get_string (renderer_variant, NULL)); + g_variant_unref (renderer_variant); return renderer; } -#endif static GraphicsData * get_graphics_data (void) @@ -375,8 +335,8 @@ #ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (display)) { - result->glx_renderer = get_graphics_data_glx_renderer (); - result->hardware_string = result->glx_renderer; + result->renderer = get_renderer_from_session (); + result->hardware_string = result->renderer; } else #endif @@ -432,49 +392,108 @@ object_class->finalize = cc_info_panel_finalize; } -static char * -get_os_type (void) +static GHashTable* +get_os_info (void) { - int bits; - char *buffer; - char *name; - char *result; + GHashTable *hashtable; + gchar *buffer; - name = NULL; + hashtable = NULL; if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL)) { - char *start, *end; + gchar **lines; + gint i; + + lines = g_strsplit (buffer, "\n", -1); + + for (i = 0; lines[i] != NULL; i++) + { + gchar *delimiter, *key, *value; + + /* Initialize the hash table if needed */ + if (!hashtable) + hashtable = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + delimiter = strstr (lines[i], "="); + value = NULL; + key = NULL; + + if (delimiter != NULL) + { + gint size; + + key = g_strndup (lines[i], delimiter - lines[i]); + + /* Jump the '=' */ + delimiter += strlen ("="); + + /* Eventually jump the ' " ' character */ + if (g_str_has_prefix (delimiter, "\"")) + delimiter += strlen ("\""); + + size = strlen (delimiter); + + /* Don't consider the last ' " ' too */ + if (g_str_has_suffix (delimiter, "\"")) + size -= strlen ("\""); + + value = g_strndup (delimiter, size); - start = end = NULL; - if ((start = strstr (buffer, "PRETTY_NAME=\"")) != NULL) - { - start += strlen ("PRETTY_NAME=\""); - end = strchr (start, '"'); - } - - if (start != NULL && end != NULL) - { - name = g_strndup (start, end - start); - } + g_hash_table_insert (hashtable, key, value); + } + } - g_free (buffer); + g_strfreev (lines); + g_free (buffer); } + return hashtable; +} + +static char * +get_os_type (void) +{ + GHashTable *os_info; + gchar *name, *result, *build_id; + int bits; + + os_info = get_os_info (); + + if (!os_info) + return NULL; + + name = g_hash_table_lookup (os_info, "PRETTY_NAME"); + build_id = g_hash_table_lookup (os_info, "BUILD_ID"); + if (GLIB_SIZEOF_VOID_P == 8) bits = 64; else bits = 32; - /* translators: This is the name of the OS, followed by the type - * of architecture, for example: - * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit" */ - if (name) - result = g_strdup_printf (_("%s %d-bit"), name, bits); + if (build_id) + { + /* translators: This is the name of the OS, followed by the type + * of architecture and the build id, for example: + * "Fedora 18 (Spherical Cow) 64-bit (Build ID: xyz)" or + * "Ubuntu (Oneric Ocelot) 32-bit (Build ID: jki)" */ + if (name) + result = g_strdup_printf (_("%s %d-bit (Build ID: %s)"), name, bits, build_id); + else + result = g_strdup_printf (_("%d-bit (Build ID: %s)"), bits, build_id); + } else - result = g_strdup_printf (_("%d-bit"), bits); + { + /* translators: This is the name of the OS, followed by the type + * of architecture, for example: + * "Fedora 18 (Spherical Cow) 64-bit" or "Ubuntu (Oneric Ocelot) 32-bit" */ + if (name) + result = g_strdup_printf (_("%s %d-bit"), name, bits); + else + result = g_strdup_printf (_("%d-bit"), bits); + } - g_free (name); + g_clear_pointer (&os_info, g_hash_table_destroy); return result; } @@ -1561,10 +1580,6 @@ self->priv->media_settings = g_settings_new (MEDIA_HANDLING_SCHEMA); - self->priv->session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); - - g_assert (self->priv->session_bus); - if (gtk_builder_add_from_resource (self->priv->builder, "/org/gnome/control-center/info/info.ui", &error) == 0) diff -Nru gnome-control-center-3.20.2/panels/info/gnome-info-panel.desktop.in.in gnome-control-center-3.22.1/panels/info/gnome-info-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/info/gnome-info-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/info/gnome-info-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Details +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=De­tails _Comment=View information about your system Exec=gnome-control-center info Icon=applications-system @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/info/Makefile.in gnome-control-center-3.22.1/panels/info/Makefile.in --- gnome-control-center-3.20.2/panels/info/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/info/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -313,8 +313,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -533,22 +531,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsd-disk-space-helper.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-item.c gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-item.c --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-item.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-item.c 2016-08-12 12:43:57.000000000 +0000 @@ -50,6 +50,7 @@ PROP_BINDING, PROP_EDITABLE, PROP_TYPE, + PROP_IS_VALUE_DEFAULT, PROP_COMMAND }; @@ -59,6 +60,17 @@ G_DEFINE_TYPE (CcKeyboardItem, cc_keyboard_item, G_TYPE_OBJECT) +static const gchar * +get_binding_from_variant (GVariant *variant) +{ + if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) + return g_variant_get_string (variant, NULL); + else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING_ARRAY)) + return g_variant_get_strv (variant, NULL)[0]; + else + return ""; +} + static gboolean binding_from_string (const char *str, guint *accelerator_key, @@ -146,15 +158,53 @@ const char *value, gboolean set_backend) { - g_free (item->priv->binding); - item->priv->binding = g_strdup (value); + CcKeyboardItem *reverse; + gboolean enabled; + + reverse = item->priv->reverse_item; + enabled = value && strlen (value) > 0; + + g_clear_pointer (&item->priv->binding, g_free); + item->priv->binding = enabled ? g_strdup (value) : g_strdup (""); + binding_from_string (item->priv->binding, &item->keyval, &item->keycode, &item->mask); + /* + * Always treat the pair (item, reverse) as a unit: setting one also + * disables the other, disabling one up also sets the other. + */ + if (reverse) + { + GdkModifierType reverse_mask; + + reverse_mask = enabled ? item->mask ^ GDK_SHIFT_MASK : item->mask; + + g_clear_pointer (&reverse->priv->binding, g_free); + if (enabled) + reverse->priv->binding = gtk_accelerator_name_with_keycode (NULL, + item->keyval, + item->keycode, + reverse_mask); + + binding_from_string (reverse->priv->binding, + &reverse->keyval, + &reverse->keycode, + &reverse->mask); + } + if (set_backend == FALSE) return; settings_set_binding (item->settings, item->key, item->priv->binding); + + g_object_notify (G_OBJECT (item), "is-value-default"); + + if (reverse) + { + settings_set_binding (reverse->settings, reverse->key, reverse->priv->binding); + g_object_notify (G_OBJECT (reverse), "is-value-default"); + } } static void @@ -232,26 +282,15 @@ case PROP_COMMAND: g_value_set_string (value, self->command); break; + case PROP_IS_VALUE_DEFAULT: + g_value_set_boolean (value, cc_keyboard_item_is_value_default (self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } -static GObject * -cc_keyboard_item_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - CcKeyboardItem *keyboard_item; - - keyboard_item = CC_KEYBOARD_ITEM (G_OBJECT_CLASS (cc_keyboard_item_parent_class)->constructor (type, - n_construct_properties, - construct_properties)); - - return G_OBJECT (keyboard_item); -} - static void cc_keyboard_item_class_init (CcKeyboardItemClass *klass) { @@ -259,7 +298,6 @@ object_class->get_property = cc_keyboard_item_get_property; object_class->set_property = cc_keyboard_item_set_property; - object_class->constructor = cc_keyboard_item_constructor; object_class->finalize = cc_keyboard_item_finalize; g_object_class_install_property (object_class, @@ -304,6 +342,14 @@ NULL, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_IS_VALUE_DEFAULT, + g_param_spec_boolean ("is-value-default", + "is value default", + "is value default", + TRUE, + G_PARAM_READABLE)); + g_type_class_add_private (klass, sizeof (CcKeyboardItemPrivate)); } @@ -508,6 +554,80 @@ { return item->priv->hidden; } + +/** + * cc_keyboard_item_is_value_default: + * @self: a #CcKeyboardItem + * + * Retrieves whether the shortcut is the default value or not. + * + * Returns: %TRUE if the shortcut is the default value, %FALSE otherwise. + */ +gboolean +cc_keyboard_item_is_value_default (CcKeyboardItem *self) +{ + GVariant *user_value; + gboolean is_value_default; + + g_return_val_if_fail (CC_IS_KEYBOARD_ITEM (self), FALSE); + + /* + * When the shortcut is custom, we don't treat it as modified + * since we don't know what would be its default value. + */ + if (self->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + return TRUE; + + user_value = g_settings_get_user_value (self->settings, self->key); + + is_value_default = TRUE; + + if (user_value) + { + GVariant *default_value; + const gchar *default_binding, *user_binding; + + default_value = g_settings_get_default_value (self->settings, self->key); + + default_binding = get_binding_from_variant (default_value); + user_binding = get_binding_from_variant (user_value); + + is_value_default = (g_strcmp0 (default_binding, user_binding) == 0); + + g_clear_pointer (&default_value, g_variant_unref); + } + + g_clear_pointer (&user_value, g_variant_unref); + + return is_value_default; +} + +/** + * cc_keyboard_item_reset: + * @self: a #CcKeyboardItem + * + * Reset the keyboard binding to the default value. + */ +void +cc_keyboard_item_reset (CcKeyboardItem *self) +{ + CcKeyboardItem *reverse; + + g_return_if_fail (CC_IS_KEYBOARD_ITEM (self)); + + reverse = self->priv->reverse_item; + + g_settings_reset (self->settings, self->key); + g_object_notify (G_OBJECT (self), "is-value-default"); + + /* Also reset the reverse item */ + if (reverse) + { + g_settings_reset (reverse->settings, reverse->key); + g_object_notify (G_OBJECT (reverse), "is-value-default"); + } +} + /* * vim: sw=2 ts=8 cindent noai bs=2 */ diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-item.h gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-item.h --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-item.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-item.h 2016-08-12 12:43:57.000000000 +0000 @@ -21,6 +21,7 @@ #define __CC_KEYBOARD_ITEM_H #include +#include G_BEGIN_DECLS @@ -59,6 +60,7 @@ /* FIXME move to priv? */ guint keyval; guint keycode; + BindingGroupType group; GdkModifierType mask; GtkTreeModel *model; char *description; @@ -107,6 +109,10 @@ gboolean hidden); gboolean cc_keyboard_item_is_hidden (CcKeyboardItem *item); +gboolean cc_keyboard_item_is_value_default (CcKeyboardItem *self); + +void cc_keyboard_item_reset (CcKeyboardItem *self); + G_END_DECLS #endif /* __CC_KEYBOARD_ITEM_H */ diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-manager.c gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-manager.c --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-manager.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-manager.c 2016-09-27 12:37:36.000000000 +0000 @@ -0,0 +1,1017 @@ +/* + * Copyright (C) 2010 Intel, Inc + * Copyright (C) 2016 Endless, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * Author: Thomas Wood + * Georges Basile Stavracas Neto + * + */ + +#include + +#include "cc-keyboard-manager.h" +#include "keyboard-shortcuts.h" +#include "wm-common.h" + +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys" +#define CUSTOM_SHORTCUTS_ID "custom" + +struct _CcKeyboardManager +{ + GObject parent; + + GtkListStore *shortcuts_model; + GtkListStore *sections_store; + + GHashTable *kb_system_sections; + GHashTable *kb_apps_sections; + GHashTable *kb_user_sections; + + GSettings *binding_settings; + + gpointer wm_changed_id; +}; + +G_DEFINE_TYPE (CcKeyboardManager, cc_keyboard_manager, G_TYPE_OBJECT) + +enum +{ + SHORTCUT_ADDED, + SHORTCUT_CHANGED, + SHORTCUT_REMOVED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0, }; + +/* + * Auxiliary methos + */ +static void +free_key_array (GPtrArray *keys) +{ + if (keys != NULL) + { + gint i; + + for (i = 0; i < keys->len; i++) + { + CcKeyboardItem *item; + + item = g_ptr_array_index (keys, i); + + g_object_unref (item); + } + + g_ptr_array_free (keys, TRUE); + } +} + +static const gchar* +get_binding_from_variant (GVariant *variant) +{ + if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) + return g_variant_get_string (variant, NULL); + else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING_ARRAY)) + return g_variant_get_strv (variant, NULL)[0]; + + return NULL; +} + +static gboolean +is_shortcut_different (CcUniquenessData *data, + CcKeyboardItem *item) +{ + if (data->orig_item && cc_keyboard_item_equal (data->orig_item, item)) + return FALSE; + + if (data->new_keyval != 0) + { + if (data->new_keyval != item->keyval) + return TRUE; + } + else if (item->keyval != 0 || data->new_keycode != item->keycode) + { + return TRUE; + } + + return FALSE; +} + +static gboolean +compare_keys_for_uniqueness (CcKeyboardItem *current_item, + CcUniquenessData *data) +{ + CcKeyboardItem *reverse_item; + + /* No conflict for: blanks, different modifiers or ourselves */ + if (!current_item || + data->orig_item == current_item || + data->new_mask != current_item->mask) + { + return FALSE; + } + + reverse_item = cc_keyboard_item_get_reverse_item (current_item); + + /* When the current item is the reversed shortcut of a main item, simply ignore it */ + if (reverse_item && cc_keyboard_item_is_hidden (current_item)) + return FALSE; + + if (is_shortcut_different (data, current_item)) + return FALSE; + + /* Also check for the reverse item if any */ + if (reverse_item && is_shortcut_different (data, reverse_item)) + return FALSE; + + /* No tests failed and we found a conflict */ + data->conflict_item = current_item; + + return TRUE; +} + +static gboolean +check_for_uniqueness (gpointer key, + GPtrArray *keys_array, + CcUniquenessData *data) +{ + guint i; + + for (i = 0; i < keys_array->len; i++) + { + CcKeyboardItem *item; + + item = keys_array->pdata[i]; + + if (compare_keys_for_uniqueness (item, data)) + return TRUE; + } + + return FALSE; +} + + +static GHashTable* +get_hash_for_group (CcKeyboardManager *self, + BindingGroupType group) +{ + GHashTable *hash; + + switch (group) + { + case BINDING_GROUP_SYSTEM: + hash = self->kb_system_sections; + break; + case BINDING_GROUP_APPS: + hash = self->kb_apps_sections; + break; + case BINDING_GROUP_USER: + hash = self->kb_user_sections; + break; + default: + hash = NULL; + } + + return hash; +} + +static gboolean +have_key_for_group (CcKeyboardManager *self, + int group, + const gchar *name) +{ + GHashTableIter iter; + GPtrArray *keys; + gint i; + + g_hash_table_iter_init (&iter, get_hash_for_group (self, group)); + while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &keys)) + { + for (i = 0; i < keys->len; i++) + { + CcKeyboardItem *item = g_ptr_array_index (keys, i); + + if (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS && + g_strcmp0 (name, item->key) == 0) + { + return TRUE; + } + + return FALSE; + } + } + + return FALSE; +} + +static void +add_shortcuts (CcKeyboardManager *self) +{ + GtkTreeModel *sections_model; + GtkTreeIter sections_iter; + gboolean can_continue; + + sections_model = GTK_TREE_MODEL (self->sections_store); + can_continue = gtk_tree_model_get_iter_first (sections_model, §ions_iter); + + while (can_continue) + { + BindingGroupType group; + GPtrArray *keys; + gchar *id, *title; + gint i; + + gtk_tree_model_get (sections_model, + §ions_iter, + SECTION_DESCRIPTION_COLUMN, &title, + SECTION_GROUP_COLUMN, &group, + SECTION_ID_COLUMN, &id, + -1); + + /* Ignore separators */ + if (group == BINDING_GROUP_SEPARATOR) + { + can_continue = gtk_tree_model_iter_next (sections_model, §ions_iter); + continue; + } + + keys = g_hash_table_lookup (get_hash_for_group (self, group), id); + + for (i = 0; i < keys->len; i++) + { + CcKeyboardItem *item = g_ptr_array_index (keys, i); + + if (!cc_keyboard_item_is_hidden (item)) + { + GtkTreeIter new_row; + + gtk_list_store_append (self->shortcuts_model, &new_row); + gtk_list_store_set (self->shortcuts_model, + &new_row, + DETAIL_DESCRIPTION_COLUMN, item->description, + DETAIL_KEYENTRY_COLUMN, item, + DETAIL_TYPE_COLUMN, SHORTCUT_TYPE_KEY_ENTRY, + -1); + + g_signal_emit (self, signals[SHORTCUT_ADDED], + 0, + item, + id, + title); + } + } + + can_continue = gtk_tree_model_iter_next (sections_model, §ions_iter); + + g_free (title); + g_free (id); + } +} + +static void +append_section (CcKeyboardManager *self, + const gchar *title, + const gchar *id, + BindingGroupType group, + const KeyListEntry *keys_list) +{ + GtkTreeModel *shortcut_model; + GtkTreeIter iter; + GHashTable *reverse_items; + GHashTable *hash; + GPtrArray *keys_array; + gboolean is_new; + gint i; + + hash = get_hash_for_group (self, group); + + if (!hash) + return; + + shortcut_model = GTK_TREE_MODEL (self->shortcuts_model); + + /* Add all CcKeyboardItems for this section */ + is_new = FALSE; + keys_array = g_hash_table_lookup (hash, id); + if (keys_array == NULL) + { + keys_array = g_ptr_array_new (); + is_new = TRUE; + } + + reverse_items = g_hash_table_new (g_str_hash, g_str_equal); + + for (i = 0; keys_list != NULL && keys_list[i].name != NULL; i++) + { + CcKeyboardItem *item; + gboolean ret; + + if (have_key_for_group (self, group, keys_list[i].name)) + continue; + + item = cc_keyboard_item_new (keys_list[i].type); + + switch (keys_list[i].type) + { + case CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH: + ret = cc_keyboard_item_load_from_gsettings_path (item, keys_list[i].name, FALSE); + break; + + case CC_KEYBOARD_ITEM_TYPE_GSETTINGS: + ret = cc_keyboard_item_load_from_gsettings (item, + keys_list[i].description, + keys_list[i].schema, + keys_list[i].name); + if (ret && keys_list[i].reverse_entry != NULL) + { + CcKeyboardItem *reverse_item; + reverse_item = g_hash_table_lookup (reverse_items, + keys_list[i].reverse_entry); + if (reverse_item != NULL) + { + cc_keyboard_item_add_reverse_item (item, + reverse_item, + keys_list[i].is_reversed); + } + else + { + g_hash_table_insert (reverse_items, + keys_list[i].name, + item); + } + } + break; + + default: + g_assert_not_reached (); + } + + if (ret == FALSE) + { + /* We don't actually want to popup a dialog - just skip this one */ + g_object_unref (item); + continue; + } + + cc_keyboard_item_set_hidden (item, keys_list[i].hidden); + item->model = shortcut_model; + item->group = group; + + g_ptr_array_add (keys_array, item); + } + + g_hash_table_destroy (reverse_items); + + /* Add the keys to the hash table */ + if (is_new) + { + g_hash_table_insert (hash, g_strdup (id), keys_array); + + /* Append the section to the left tree view */ + gtk_list_store_append (GTK_LIST_STORE (self->sections_store), &iter); + gtk_list_store_set (GTK_LIST_STORE (self->sections_store), + &iter, + SECTION_DESCRIPTION_COLUMN, title, + SECTION_ID_COLUMN, id, + SECTION_GROUP_COLUMN, group, + -1); + } +} + +static void +append_sections_from_file (CcKeyboardManager *self, + const gchar *path, + const char *datadir, + gchar **wm_keybindings) +{ + KeyList *keylist; + KeyListEntry *keys; + KeyListEntry key = { 0, 0, 0, 0, 0, 0, 0 }; + const char *title; + int group; + guint i; + + keylist = parse_keylist_from_file (path); + + if (keylist == NULL) + return; + +#define const_strv(s) ((const gchar* const*) s) + + /* If there's no keys to add, or the settings apply to a window manager + * that's not the one we're running */ + if (keylist->entries->len == 0 || + (keylist->wm_name != NULL && !g_strv_contains (const_strv (wm_keybindings), keylist->wm_name)) || + keylist->name == NULL) + { + g_free (keylist->name); + g_free (keylist->package); + g_free (keylist->wm_name); + g_array_free (keylist->entries, TRUE); + g_free (keylist); + return; + } + +#undef const_strv + + /* Empty KeyListEntry to end the array */ + key.name = NULL; + g_array_append_val (keylist->entries, key); + + keys = (KeyListEntry *) g_array_free (keylist->entries, FALSE); + if (keylist->package) + { + char *localedir; + + localedir = g_build_filename (datadir, "locale", NULL); + bindtextdomain (keylist->package, localedir); + g_free (localedir); + + title = dgettext (keylist->package, keylist->name); + } else { + title = _(keylist->name); + } + + if (keylist->group && strcmp (keylist->group, "system") == 0) + group = BINDING_GROUP_SYSTEM; + else + group = BINDING_GROUP_APPS; + + append_section (self, title, keylist->name, group, keys); + + g_free (keylist->name); + g_free (keylist->package); + g_free (keylist->wm_name); + g_free (keylist->schema); + g_free (keylist->group); + + for (i = 0; keys[i].name != NULL; i++) + { + KeyListEntry *entry = &keys[i]; + g_free (entry->schema); + g_free (entry->description); + g_free (entry->name); + g_free (entry->reverse_entry); + } + + g_free (keylist); + g_free (keys); +} + +static void +append_sections_from_gsettings (CcKeyboardManager *self) +{ + char **custom_paths; + GArray *entries; + KeyListEntry key = { 0, 0, 0, 0, 0, 0, 0 }; + int i; + + /* load custom shortcuts from GSettings */ + entries = g_array_new (FALSE, TRUE, sizeof (KeyListEntry)); + + custom_paths = g_settings_get_strv (self->binding_settings, "custom-keybindings"); + for (i = 0; custom_paths[i]; i++) + { + key.name = g_strdup (custom_paths[i]); + if (!have_key_for_group (self, BINDING_GROUP_USER, key.name)) + { + key.type = CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH; + g_array_append_val (entries, key); + } + else + g_free (key.name); + } + g_strfreev (custom_paths); + + if (entries->len > 0) + { + KeyListEntry *keys; + int i; + + /* Empty KeyListEntry to end the array */ + key.name = NULL; + g_array_append_val (entries, key); + + keys = (KeyListEntry *) entries->data; + append_section (self, _("Custom Shortcuts"), CUSTOM_SHORTCUTS_ID, BINDING_GROUP_USER, keys); + for (i = 0; i < entries->len; ++i) + { + g_free (keys[i].name); + } + } + else + { + append_section (self, _("Custom Shortcuts"), CUSTOM_SHORTCUTS_ID, BINDING_GROUP_USER, NULL); + } + + g_array_free (entries, TRUE); +} + +static void +reload_sections (CcKeyboardManager *self) +{ + GtkTreeModel *shortcut_model; + GHashTable *loaded_files; + GDir *dir; + gchar *default_wm_keybindings[] = { "Mutter", "GNOME Shell", NULL }; + gchar **wm_keybindings; + const gchar * const * data_dirs; + guint i; + + shortcut_model = GTK_TREE_MODEL (self->shortcuts_model); + + /* Clear previous models and hash tables */ + gtk_list_store_clear (GTK_LIST_STORE (self->sections_store)); + gtk_list_store_clear (GTK_LIST_STORE (shortcut_model)); + + g_clear_pointer (&self->kb_system_sections, g_hash_table_destroy); + self->kb_system_sections = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) free_key_array); + + g_clear_pointer (&self->kb_apps_sections, g_hash_table_destroy); + self->kb_apps_sections = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) free_key_array); + + g_clear_pointer (&self->kb_user_sections, g_hash_table_destroy); + self->kb_user_sections = g_hash_table_new_full (g_str_hash, + g_str_equal, + g_free, + (GDestroyNotify) free_key_array); + + /* Load WM keybindings */ +#ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) + wm_keybindings = wm_common_get_current_keybindings (); + else +#endif + wm_keybindings = g_strdupv (default_wm_keybindings); + + loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + + data_dirs = g_get_system_data_dirs (); + for (i = 0; data_dirs[i] != NULL; i++) + { + char *dir_path; + const gchar *name; + + dir_path = g_build_filename (data_dirs[i], "gnome-control-center", "keybindings", NULL); + + dir = g_dir_open (dir_path, 0, NULL); + if (!dir) + { + g_free (dir_path); + continue; + } + + for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) + { + gchar *path; + + if (g_str_has_suffix (name, ".xml") == FALSE) + continue; + + if (g_hash_table_lookup (loaded_files, name) != NULL) + { + g_debug ("Not loading %s, it was already loaded from another directory", name); + continue; + } + + g_hash_table_insert (loaded_files, g_strdup (name), GINT_TO_POINTER (1)); + path = g_build_filename (dir_path, name, NULL); + append_sections_from_file (self, path, data_dirs[i], wm_keybindings); + g_free (path); + } + + g_free (dir_path); + g_dir_close (dir); + } + + g_hash_table_destroy (loaded_files); + g_strfreev (wm_keybindings); + + /* Load custom keybindings */ + append_sections_from_gsettings (self); +} + +/* + * Callbacks + */ +static void +on_window_manager_change (const char *wm_name, + CcKeyboardManager *self) +{ + reload_sections (self); +} + +static void +cc_keyboard_manager_finalize (GObject *object) +{ + CcKeyboardManager *self = (CcKeyboardManager *)object; + + g_clear_pointer (&self->kb_system_sections, g_hash_table_destroy); + g_clear_pointer (&self->kb_apps_sections, g_hash_table_destroy); + g_clear_pointer (&self->kb_user_sections, g_hash_table_destroy); + g_clear_object (&self->binding_settings); + + g_clear_pointer (&self->wm_changed_id, wm_common_unregister_window_manager_change); + + G_OBJECT_CLASS (cc_keyboard_manager_parent_class)->finalize (object); +} + +static void +cc_keyboard_manager_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +} + +static void +cc_keyboard_manager_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +} + +static void +cc_keyboard_manager_class_init (CcKeyboardManagerClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = cc_keyboard_manager_finalize; + object_class->get_property = cc_keyboard_manager_get_property; + object_class->set_property = cc_keyboard_manager_set_property; + + /** + * CcKeyboardManager:shortcut-added: + * + * Emited when a shortcut is added. + */ + signals[SHORTCUT_ADDED] = g_signal_new ("shortcut-added", + CC_TYPE_KEYBOARD_MANAGER, + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, + 3, + CC_TYPE_KEYBOARD_ITEM, + G_TYPE_STRING, + G_TYPE_STRING); + + /** + * CcKeyboardManager:shortcut-changed: + * + * Emited when a shortcut is added. + */ + signals[SHORTCUT_CHANGED] = g_signal_new ("shortcut-changed", + CC_TYPE_KEYBOARD_MANAGER, + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, + 1, + CC_TYPE_KEYBOARD_ITEM); + + + /** + * CcKeyboardManager:shortcut-removed: + * + * Emited when a shortcut is removed. + */ + signals[SHORTCUT_REMOVED] = g_signal_new ("shortcut-removed", + CC_TYPE_KEYBOARD_MANAGER, + G_SIGNAL_RUN_FIRST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, + 1, + CC_TYPE_KEYBOARD_ITEM); +} + +static void +cc_keyboard_manager_init (CcKeyboardManager *self) +{ + /* Bindings */ + self->binding_settings = g_settings_new (BINDINGS_SCHEMA); + + /* Setup the section models */ + self->sections_store = gtk_list_store_new (SECTION_N_COLUMNS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INT); + + self->shortcuts_model = gtk_list_store_new (DETAIL_N_COLUMNS, + G_TYPE_STRING, + G_TYPE_POINTER, + G_TYPE_INT); + +#ifdef GDK_WINDOWING_X11 + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) + self->wm_changed_id = wm_common_register_window_manager_change ((GFunc) on_window_manager_change, + self); +#endif +} + + +CcKeyboardManager * +cc_keyboard_manager_new (void) +{ + return g_object_new (CC_TYPE_KEYBOARD_MANAGER, NULL); +} + +void +cc_keyboard_manager_load_shortcuts (CcKeyboardManager *self) +{ + g_return_if_fail (CC_IS_KEYBOARD_MANAGER (self)); + + reload_sections (self); + add_shortcuts (self); +} + +/** + * cc_keyboard_manager_create_custom_shortcut: + * @self: a #CcKeyboardPanel + * + * Creates a new temporary keyboard shortcut. + * + * Returns: (transfer full): a #CcKeyboardItem + */ +CcKeyboardItem* +cc_keyboard_manager_create_custom_shortcut (CcKeyboardManager *self) +{ + CcKeyboardItem *item; + gchar *settings_path; + + g_return_val_if_fail (CC_IS_KEYBOARD_MANAGER (self), NULL); + + item = cc_keyboard_item_new (CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH); + + settings_path = find_free_settings_path (self->binding_settings); + cc_keyboard_item_load_from_gsettings_path (item, settings_path, TRUE); + g_free (settings_path); + + item->model = GTK_TREE_MODEL (self->shortcuts_model); + item->group = BINDING_GROUP_USER; + + return item; +} + +/** + * cc_keyboard_manager_add_custom_shortcut: + * @self: a #CcKeyboardPanel + * @item: the #CcKeyboardItem to be added + * + * Effectively adds the custom shortcut. + */ +void +cc_keyboard_manager_add_custom_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item) +{ + GPtrArray *keys_array; + GtkTreeIter iter; + GHashTable *hash; + GVariantBuilder builder; + char **settings_paths; + int i; + + g_return_if_fail (CC_IS_KEYBOARD_MANAGER (self)); + + hash = get_hash_for_group (self, BINDING_GROUP_USER); + keys_array = g_hash_table_lookup (hash, CUSTOM_SHORTCUTS_ID); + + if (keys_array == NULL) + { + keys_array = g_ptr_array_new (); + g_hash_table_insert (hash, g_strdup (CUSTOM_SHORTCUTS_ID), keys_array); + } + + g_ptr_array_add (keys_array, item); + + gtk_list_store_append (self->shortcuts_model, &iter); + gtk_list_store_set (self->shortcuts_model, &iter, DETAIL_KEYENTRY_COLUMN, item, -1); + + settings_paths = g_settings_get_strv (self->binding_settings, "custom-keybindings"); + + g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); + + for (i = 0; settings_paths[i]; i++) + g_variant_builder_add (&builder, "s", settings_paths[i]); + + g_variant_builder_add (&builder, "s", item->gsettings_path); + + g_settings_set_value (self->binding_settings, "custom-keybindings", g_variant_builder_end (&builder)); + + g_signal_emit (self, signals[SHORTCUT_ADDED], + 0, + item, + CUSTOM_SHORTCUTS_ID, + _("Custom Shortcuts")); +} + +/** + * cc_keyboard_manager_remove_custom_shortcut: + * @self: a #CcKeyboardPanel + * @item: the #CcKeyboardItem to be added + * + * Removed the custom shortcut. + */ +void +cc_keyboard_manager_remove_custom_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GPtrArray *keys_array; + GVariantBuilder builder; + gboolean valid; + char **settings_paths; + int i; + + g_return_if_fail (CC_IS_KEYBOARD_MANAGER (self)); + + model = GTK_TREE_MODEL (self->shortcuts_model); + valid = gtk_tree_model_get_iter_first (model, &iter); + + /* Search for the iter */ + while (valid) + { + CcKeyboardItem *current_item; + + gtk_tree_model_get (model, &iter, + DETAIL_KEYENTRY_COLUMN, ¤t_item, + -1); + + if (current_item == item) + break; + + valid = gtk_tree_model_iter_next (model, &iter); + } + + /* Shortcut not found or not a custom shortcut */ + g_assert (valid); + g_assert (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH); + + g_settings_delay (item->settings); + g_settings_reset (item->settings, "name"); + g_settings_reset (item->settings, "command"); + g_settings_reset (item->settings, "binding"); + g_settings_apply (item->settings); + g_settings_sync (); + + settings_paths = g_settings_get_strv (self->binding_settings, "custom-keybindings"); + g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); + + for (i = 0; settings_paths[i]; i++) + if (strcmp (settings_paths[i], item->gsettings_path) != 0) + g_variant_builder_add (&builder, "s", settings_paths[i]); + + g_settings_set_value (self->binding_settings, + "custom-keybindings", + g_variant_builder_end (&builder)); + + g_strfreev (settings_paths); + + keys_array = g_hash_table_lookup (get_hash_for_group (self, BINDING_GROUP_USER), CUSTOM_SHORTCUTS_ID); + g_ptr_array_remove (keys_array, item); + + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + + g_signal_emit (self, signals[SHORTCUT_REMOVED], 0, item); +} + +/** + * cc_keyboard_manager_get_collision: + * @self: a #CcKeyboardManager + * @item: (nullable): a keyboard shortcut + * @keyval: the key value + * @mask: a mask for the key sequence + * @keycode: the code of the key. + * + * Retrieves the collision item for the given shortcut. + * + * Returns: (transfer none)(nullable): the collisioned shortcut + */ +CcKeyboardItem* +cc_keyboard_manager_get_collision (CcKeyboardManager *self, + CcKeyboardItem *item, + gint keyval, + GdkModifierType mask, + gint keycode) +{ + CcUniquenessData data; + BindingGroupType i; + + g_return_val_if_fail (CC_IS_KEYBOARD_MANAGER (self), NULL); + + data.orig_item = item; + data.new_keyval = keyval; + data.new_mask = mask; + data.new_keycode = keycode; + data.conflict_item = NULL; + + if (keyval == 0 && keycode == 0) + return NULL; + + /* Any number of shortcuts can be disabled */ + for (i = BINDING_GROUP_SYSTEM; i <= BINDING_GROUP_USER && !data.conflict_item; i++) + { + GHashTable *table; + + table = get_hash_for_group (self, i); + + if (!table) + continue; + + g_hash_table_find (table, (GHRFunc) check_for_uniqueness, &data); + } + + return data.conflict_item; +} + +/** + * cc_keyboard_manager_disable_shortcut: + * @self: a #CcKeyboardManager + * @item: a @CcKeyboardItem + * + * Disables the given keyboard shortcut. + */ +void +cc_keyboard_manager_disable_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item) +{ + g_return_if_fail (CC_IS_KEYBOARD_MANAGER (self)); + + g_object_set (item, "binding", NULL, NULL); +} + +/** + * cc_keyboard_manager_reset_shortcut: + * @self: a #CcKeyboardManager + * @item: a #CcKeyboardItem + * + * Resets the keyboard shortcut managed by @item, and eventually + * disables any shortcut that conflicts with the new shortcut's + * value. + */ +void +cc_keyboard_manager_reset_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item) +{ + GVariant *default_value; + const gchar *default_binding; + + g_return_if_fail (CC_IS_KEYBOARD_MANAGER (self)); + g_return_if_fail (CC_IS_KEYBOARD_ITEM (item)); + + default_value = g_settings_get_default_value (item->settings, item->key); + default_binding = get_binding_from_variant (default_value); + + /* Disables any shortcut that conflicts with the new shortcut's value */ + if (default_binding && *default_binding != '\0') + { + GdkModifierType mask; + CcKeyboardItem *collision; + guint *keycodes; + guint keyval; + + gtk_accelerator_parse_with_keycode (default_binding, &keyval, &keycodes, &mask); + + collision = cc_keyboard_manager_get_collision (self, + NULL, + keyval, + mask, + keycodes ? keycodes[0] : 0); + + if (collision) + cc_keyboard_manager_disable_shortcut (self, collision); + + g_free (keycodes); + } + + /* Resets the current item */ + cc_keyboard_item_reset (item); + + g_variant_unref (default_value); +} diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-manager.h gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-manager.h --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-manager.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-manager.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2010 Intel, Inc + * Copyright (C) 2016 Endless, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * Author: Thomas Wood + * Georges Basile Stavracas Neto + * + */ + +#ifndef CC_KEYBOARD_MANAGER_H +#define CC_KEYBOARD_MANAGER_H + +#include + +#include "cc-keyboard-item.h" + +G_BEGIN_DECLS + +#define CC_TYPE_KEYBOARD_MANAGER (cc_keyboard_manager_get_type()) + +G_DECLARE_FINAL_TYPE (CcKeyboardManager, cc_keyboard_manager, CC, KEYBOARD_MANAGER, GObject) + +CcKeyboardManager* cc_keyboard_manager_new (void); + +void cc_keyboard_manager_load_shortcuts (CcKeyboardManager *self); + +CcKeyboardItem* cc_keyboard_manager_create_custom_shortcut (CcKeyboardManager *self); + +void cc_keyboard_manager_add_custom_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item); + +void cc_keyboard_manager_remove_custom_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item); + +CcKeyboardItem* cc_keyboard_manager_get_collision (CcKeyboardManager *self, + CcKeyboardItem *item, + gint keyval, + GdkModifierType mask, + gint keycode); + +void cc_keyboard_manager_disable_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item); + +void cc_keyboard_manager_reset_shortcut (CcKeyboardManager *self, + CcKeyboardItem *item); + +G_END_DECLS + +#endif /* CC_KEYBOARD_MANAGER_H */ + diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-panel.c gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-panel.c --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-panel.c 2016-09-27 12:37:36.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Intel, Inc + * Copyright (C) 2016 Endless, Inc * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,127 +16,429 @@ * along with this program; if not, see . * * Author: Thomas Wood + * Georges Basile Stavracas Neto * */ +#include + +#include "cc-keyboard-item.h" +#include "cc-keyboard-manager.h" +#include "cc-keyboard-option.h" #include "cc-keyboard-panel.h" #include "cc-keyboard-resources.h" +#include "cc-keyboard-shortcut-editor.h" #include "keyboard-shortcuts.h" -CC_PANEL_REGISTER (CcKeyboardPanel, cc_keyboard_panel) +#include "cc-util.h" -#define KEYBOARD_PANEL_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelPrivate)) +typedef struct { + CcKeyboardItem *item; + gchar *section_title; + gchar *section_id; +} RowData; -struct _CcKeyboardPanelPrivate +struct _CcKeyboardPanel { - GtkBuilder *builder; + CcPanel parent; + + /* Search */ + GtkWidget *empty_search_placeholder; + GtkWidget *search_button; + GtkWidget *search_entry; + + /* Shortcuts */ + GtkWidget *listbox; + GtkListBoxRow *add_shortcut_row; + GtkSizeGroup *accelerator_sizegroup; + + /* Custom shortcut dialog */ + GtkWidget *shortcut_editor; + + GRegex *pictures_regex; + + CcKeyboardManager *manager; }; +CC_PANEL_REGISTER (CcKeyboardPanel, cc_keyboard_panel) + enum { PROP_0, PROP_PARAMETERS }; -enum { - TYPING_PAGE, - SHORTCUTS_PAGE -}; +static const gchar* custom_css = +"button.reset-shortcut-button {" +" padding: 0;" +"}"; + +/* RowData functions */ +static RowData * +row_data_new (CcKeyboardItem *item, + const gchar *section_id, + const gchar *section_title) +{ + RowData *data; + + data = g_new0 (RowData, 1); + data->item = g_object_ref (item); + data->section_id = g_strdup (section_id); + data->section_title = g_strdup (section_title); + + return data; +} static void -cc_keyboard_panel_set_page (CcKeyboardPanel *panel, - const gchar *page, - const gchar *section) -{ - GtkWidget *notebook; - gint page_num; - - if (g_strcmp0 (page, "typing") == 0) - page_num = TYPING_PAGE; - else if (g_strcmp0 (page, "shortcuts") == 0) - page_num = SHORTCUTS_PAGE; - else { - g_warning ("Could not switch to non-existent page '%s'", page); - return; - } - - notebook = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, "keyboard_notebook")); - gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page_num); - - if (page_num == SHORTCUTS_PAGE && - section != NULL) { - keyboard_shortcuts_set_section (CC_PANEL (panel), section); - } +row_data_free (RowData *data) +{ + g_object_unref (data->item); + g_free (data->section_id); + g_free (data->section_title); + g_free (data); +} + +static gboolean +transform_binding_to_accel (GBinding *binding, + const GValue *from_value, + GValue *to_value, + gpointer user_data) +{ + CcKeyboardItem *item; + gchar *accelerator; + + item = CC_KEYBOARD_ITEM (g_binding_get_source (binding)); + + /* Embolden the label when the shortcut is modified */ + if (!cc_keyboard_item_is_value_default (item)) + { + gchar *tmp; + + tmp = convert_keysym_state_to_string (item->keyval, + item->mask, + item->keycode); + + accelerator = g_strdup_printf ("%s", tmp); + + g_free (tmp); + } + else + { + accelerator = convert_keysym_state_to_string (item->keyval, + item->mask, + item->keycode); + } + + g_value_take_string (to_value, accelerator); + + return TRUE; } static void -cc_keyboard_panel_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) +shortcut_modified_changed_cb (CcKeyboardItem *item, + GParamSpec *pspec, + GtkWidget *button) { - CcKeyboardPanel *panel = CC_KEYBOARD_PANEL (object); + gtk_widget_set_child_visible (button, !cc_keyboard_item_is_value_default (item)); +} - switch (property_id) +static void +reset_shortcut_cb (GtkWidget *reset_button, + CcKeyboardItem *item) +{ + CcKeyboardPanel *self; + + self = CC_KEYBOARD_PANEL (gtk_widget_get_ancestor (reset_button, CC_TYPE_KEYBOARD_PANEL)); + + cc_keyboard_manager_reset_shortcut (self->manager, item); +} + +static void +add_item (CcKeyboardPanel *self, + CcKeyboardItem *item, + const gchar *section_id, + const gchar *section_title) +{ + GtkWidget *row, *box, *label, *reset_button; + + /* Horizontal box */ + box = g_object_new (GTK_TYPE_BOX, + "orientation", GTK_ORIENTATION_HORIZONTAL, + "spacing", 18, + "margin-start", 6, + "margin-end", 6, + "margin-bottom", 4, + "margin-top", 4, + NULL); + + /* Shortcut title */ + label = gtk_label_new (item->description); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR); + gtk_widget_set_hexpand (label, TRUE); + + g_object_bind_property (item, + "description", + label, + "label", + G_BINDING_DEFAULT); + + gtk_container_add (GTK_CONTAINER (box), label); + + /* Shortcut accelerator */ + label = gtk_label_new (""); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + + gtk_size_group_add_widget (self->accelerator_sizegroup, label); + + g_object_bind_property_full (item, + "binding", + label, + "label", + G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE, + transform_binding_to_accel, + NULL, NULL, NULL); + + gtk_container_add (GTK_CONTAINER (box), label); + + gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); + + /* Reset shortcut button */ + reset_button = gtk_button_new_from_icon_name ("edit-clear-symbolic", GTK_ICON_SIZE_BUTTON); + gtk_widget_set_valign (reset_button, GTK_ALIGN_CENTER); + + gtk_button_set_relief (GTK_BUTTON (reset_button), GTK_RELIEF_NONE); + gtk_widget_set_child_visible (reset_button, !cc_keyboard_item_is_value_default (item)); + + gtk_widget_set_tooltip_text (reset_button, _("Reset the shortcut to its default value")); + + gtk_container_add (GTK_CONTAINER (box), reset_button); + + gtk_style_context_add_class (gtk_widget_get_style_context (reset_button), "flat"); + gtk_style_context_add_class (gtk_widget_get_style_context (reset_button), "circular"); + gtk_style_context_add_class (gtk_widget_get_style_context (reset_button), "reset-shortcut-button"); + + g_signal_connect (item, + "notify::is-value-default", + G_CALLBACK (shortcut_modified_changed_cb), + reset_button); + + g_signal_connect (reset_button, + "clicked", + G_CALLBACK (reset_shortcut_cb), + item); + + /* The row */ + row = gtk_list_box_row_new (); + gtk_container_add (GTK_CONTAINER (row), box); + + gtk_widget_show_all (row); + + g_object_set_data_full (G_OBJECT (row), + "data", + row_data_new (item, section_id, section_title), + (GDestroyNotify) row_data_free); + + gtk_container_add (GTK_CONTAINER (self->listbox), row); +} + +static void +remove_item (CcKeyboardPanel *self, + CcKeyboardItem *item) +{ + GList *children, *l; + + children = gtk_container_get_children (GTK_CONTAINER (self->listbox)); + + for (l = children; l != NULL; l = l->next) { - case PROP_PARAMETERS: { - GVariant *parameters, *v; - const gchar *page, *section; - - parameters = g_value_get_variant (value); - if (!parameters) - break; - page = section = NULL; - switch (g_variant_n_children (parameters)) + RowData *row_data; + + row_data = g_object_get_data (l->data, "data"); + + if (row_data->item == item) { - case 2: - g_variant_get_child (parameters, 1, "v", &v); - section = g_variant_get_string (v, NULL); - g_variant_unref (v); - /* fall-through */ - case 1: - g_variant_get_child (parameters, 0, "v", &v); - page = g_variant_get_string (v, NULL); - g_variant_unref (v); - cc_keyboard_panel_set_page (panel, page, section); - /* fall-through */ - case 0: - break; - default: - g_warning ("Unexpected parameters found, ignore request"); + gtk_container_remove (GTK_CONTAINER (self->listbox), l->data); + break; } - break; } - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } + g_list_free (children); } -static GObject * -cc_keyboard_panel_constructor (GType gtype, - guint n_properties, - GObjectConstructParam *properties) +static gint +sort_function (GtkListBoxRow *a, + GtkListBoxRow *b, + gpointer user_data) { - GObject *obj; CcKeyboardPanel *self; - CcKeyboardPanelPrivate *priv; - GtkWidget *widget; + RowData *a_data, *b_data; + gint retval; + + self = user_data; + + if (a == self->add_shortcut_row) + return 1; - obj = G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->constructor (gtype, n_properties, properties); + if (b == self->add_shortcut_row) + return -1; - self = CC_KEYBOARD_PANEL (obj); - priv = self->priv; + a_data = g_object_get_data (G_OBJECT (a), "data"); + b_data = g_object_get_data (G_OBJECT (b), "data"); - keyboard_shortcuts_init (CC_PANEL (self), priv->builder); + /* Put custom shortcuts below everything else */ + if (a_data->item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + return 1; + else if (b_data->item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + return -1; - widget = (GtkWidget *) gtk_builder_get_object (priv->builder, - "shortcuts_page"); + retval = g_strcmp0 (a_data->section_title, b_data->section_title); - gtk_container_add (GTK_CONTAINER (self), widget); + if (retval != 0) + return retval; - return obj; + return g_strcmp0 (a_data->item->description, b_data->item->description); +} + +static void +header_function (GtkListBoxRow *row, + GtkListBoxRow *before, + gpointer user_data) +{ + CcKeyboardPanel *self; + gboolean add_header; + RowData *data; + + self = user_data; + add_header = FALSE; + + /* The + row always has a separator */ + if (row == self->add_shortcut_row) + { + GtkWidget *separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_show (separator); + + gtk_list_box_row_set_header (row, separator); + + return; + } + + data = g_object_get_data (G_OBJECT (row), "data"); + + if (before) + { + RowData *before_data = g_object_get_data (G_OBJECT (before), "data"); + + if (before_data) + add_header = g_strcmp0 (before_data->section_id, data->section_id) != 0; + } + else + { + add_header = TRUE; + } + + if (add_header) + { + GtkWidget *box, *label; + gchar *markup; + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_widget_set_margin_top (box, before ? 18 : 6); + + markup = g_strdup_printf ("%s", _(data->section_title)); + label = g_object_new (GTK_TYPE_LABEL, + "label", markup, + "use-markup", TRUE, + "xalign", 0.0, + "margin-start", 6, + NULL); + + gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); + + gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (box), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)); + + gtk_list_box_row_set_header (row, box); + + gtk_widget_show_all (box); + + g_free (markup); + } + else + { + gtk_list_box_row_set_header (row, NULL); + } +} + +static gboolean +filter_function (GtkListBoxRow *row, + gpointer user_data) +{ + CcKeyboardPanel *self = user_data; + RowData *data; + gboolean retval; + gchar *search, *name; + + if (gtk_entry_get_text_length (GTK_ENTRY (self->search_entry)) == 0) + return TRUE; + + /* When searching, the '+' row is always hidden */ + if (row == self->add_shortcut_row) + return FALSE; + + data = g_object_get_data (G_OBJECT (row), "data"); + name = cc_util_normalize_casefold_and_unaccent (data->item->description); + search = cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (GTK_ENTRY (self->search_entry))); + + retval = strstr (name, search) != NULL; + + g_free (search); + g_free (name); + + return retval; +} + +static void +shortcut_row_activated (GtkWidget *button, + GtkListBoxRow *row, + CcKeyboardPanel *self) +{ + CcKeyboardShortcutEditor *editor; + + editor = CC_KEYBOARD_SHORTCUT_EDITOR (self->shortcut_editor); + + if (row != self->add_shortcut_row) + { + RowData *data = g_object_get_data (G_OBJECT (row), "data"); + + cc_keyboard_shortcut_editor_set_mode (editor, CC_SHORTCUT_EDITOR_EDIT); + cc_keyboard_shortcut_editor_set_item (editor, data->item); + } + else + { + cc_keyboard_shortcut_editor_set_mode (editor, CC_SHORTCUT_EDITOR_CREATE); + cc_keyboard_shortcut_editor_set_item (editor, NULL); + } + + gtk_widget_show (self->shortcut_editor); +} + +static void +cc_keyboard_panel_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) + { + case PROP_PARAMETERS: + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } } static const char * @@ -145,60 +448,118 @@ } static void -cc_keyboard_panel_dispose (GObject *object) +cc_keyboard_panel_finalize (GObject *object) { - keyboard_shortcuts_dispose (CC_PANEL (object)); + CcKeyboardPanel *self = CC_KEYBOARD_PANEL (object); + + g_clear_pointer (&self->pictures_regex, g_regex_unref); + g_clear_object (&self->accelerator_sizegroup); + + cc_keyboard_option_clear_all (); - G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->dispose (object); + G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object); } static void -cc_keyboard_panel_finalize (GObject *object) +cc_keyboard_panel_constructed (GObject *object) { - CcKeyboardPanel *panel = CC_KEYBOARD_PANEL (object); + CcKeyboardPanel *self = CC_KEYBOARD_PANEL (object); + GtkWindow *toplevel; - if (panel->priv->builder) - g_object_unref (panel->priv->builder); + G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->constructed (object); - G_OBJECT_CLASS (cc_keyboard_panel_parent_class)->finalize (object); + /* Setup the dialog's transient parent */ + toplevel = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)))); + gtk_window_set_transient_for (GTK_WINDOW (self->shortcut_editor), toplevel); + + cc_shell_embed_widget_in_header (cc_panel_get_shell (CC_PANEL (self)), self->search_button); } static void cc_keyboard_panel_class_init (CcKeyboardPanelClass *klass) { + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass); CcPanelClass *panel_class = CC_PANEL_CLASS (klass); - g_type_class_add_private (klass, sizeof (CcKeyboardPanelPrivate)); - panel_class->get_help_uri = cc_keyboard_panel_get_help_uri; - object_class->constructor = cc_keyboard_panel_constructor; object_class->set_property = cc_keyboard_panel_set_property; - object_class->dispose = cc_keyboard_panel_dispose; object_class->finalize = cc_keyboard_panel_finalize; + object_class->constructed = cc_keyboard_panel_constructed; g_object_class_override_property (object_class, PROP_PARAMETERS, "parameters"); + + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/gnome-keyboard-panel.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, add_shortcut_row); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, empty_search_placeholder); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, listbox); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, search_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardPanel, search_entry); + + gtk_widget_class_bind_template_callback (widget_class, shortcut_row_activated); } static void cc_keyboard_panel_init (CcKeyboardPanel *self) { - CcKeyboardPanelPrivate *priv; - GError *error = NULL; + GtkCssProvider *provider; - priv = self->priv = KEYBOARD_PANEL_PRIVATE (self); g_resources_register (cc_keyboard_get_resource ()); - priv->builder = gtk_builder_new (); + gtk_widget_init_template (GTK_WIDGET (self)); - if (gtk_builder_add_from_resource (priv->builder, - "/org/gnome/control-center/keyboard/gnome-keyboard-panel.ui", - &error) == 0) - { - g_warning ("Could not load UI: %s", error->message); - g_clear_error (&error); - g_object_unref (priv->builder); - priv->builder = NULL; - } + /* Custom CSS */ + provider = gtk_css_provider_new (); + gtk_css_provider_load_from_data (provider, custom_css, -1, NULL); + + gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1); + + g_object_unref (provider); + + /* Shortcut manager */ + self->manager = cc_keyboard_manager_new (); + + /* Use a sizegroup to make the accelerator labels the same width */ + self->accelerator_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + + /* Shortcut editor dialog */ + self->shortcut_editor = cc_keyboard_shortcut_editor_new (self->manager); + + g_signal_connect_swapped (self->manager, + "shortcut-added", + G_CALLBACK (add_item), + self); + + g_signal_connect_swapped (self->manager, + "shortcut-removed", + G_CALLBACK (remove_item), + self); + + cc_keyboard_manager_load_shortcuts (self->manager); + + /* Shortcut editor dialog */ + self->shortcut_editor = cc_keyboard_shortcut_editor_new (self->manager); + + /* Setup the shortcuts listbox */ + gtk_list_box_set_sort_func (GTK_LIST_BOX (self->listbox), + sort_function, + self, + NULL); + + gtk_list_box_set_header_func (GTK_LIST_BOX (self->listbox), + header_function, + self, + NULL); + + gtk_list_box_set_filter_func (GTK_LIST_BOX (self->listbox), + filter_function, + self, + NULL); + + gtk_list_box_set_placeholder (GTK_LIST_BOX (self->listbox), self->empty_search_placeholder); } + diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-panel.h gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-panel.h --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-panel.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-panel.h 2016-08-12 12:43:57.000000000 +0000 @@ -23,48 +23,15 @@ #define _CC_KEYBOARD_PANEL_H #include +#include G_BEGIN_DECLS -#define CC_TYPE_KEYBOARD_PANEL cc_keyboard_panel_get_type() +#define CC_TYPE_KEYBOARD_PANEL (cc_keyboard_panel_get_type()) -#define CC_KEYBOARD_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanel)) +G_DECLARE_FINAL_TYPE (CcKeyboardPanel, cc_keyboard_panel, CC, KEYBOARD_PANEL, CcPanel) -#define CC_KEYBOARD_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass)) - -#define CC_IS_KEYBOARD_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - CC_TYPE_KEYBOARD_PANEL)) - -#define CC_IS_KEYBOARD_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - CC_TYPE_KEYBOARD_PANEL)) - -#define CC_KEYBOARD_PANEL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - CC_TYPE_KEYBOARD_PANEL, CcKeyboardPanelClass)) - -typedef struct _CcKeyboardPanel CcKeyboardPanel; -typedef struct _CcKeyboardPanelClass CcKeyboardPanelClass; -typedef struct _CcKeyboardPanelPrivate CcKeyboardPanelPrivate; - -struct _CcKeyboardPanel -{ - CcPanel parent; - - CcKeyboardPanelPrivate *priv; -}; - -struct _CcKeyboardPanelClass -{ - CcPanelClass parent_class; -}; - -GType cc_keyboard_panel_get_type (void) G_GNUC_CONST; +CcKeyboardItem* cc_keyboard_panel_create_custom_item (CcKeyboardPanel *self); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-resources.c gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-resources.c --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-resources.c 2016-10-11 14:27:15.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-resources.c 2016-10-11 12:14:44.000000000 +0000 @@ -6,160 +6,2164 @@ # define SECTION #endif -static const SECTION union { const guint8 data[9808]; const double alignment; void * const ptr;} cc_keyboard_resource_data = { { +static const SECTION union { const guint8 data[34164]; const double alignment; void * const ptr;} cc_keyboard_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x06, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0xce, 0xd7, 0x2c, 0x8d, 0x03, 0x00, 0x00, 0x00, - 0xc8, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, - 0xd8, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, - 0x8b, 0x2e, 0x14, 0x66, 0x04, 0x00, 0x00, 0x00, - 0xdc, 0x00, 0x00, 0x00, 0x17, 0x00, 0x76, 0x00, - 0xf8, 0x00, 0x00, 0x00, 0x24, 0x26, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0xb0, 0xb7, 0x24, 0x30, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0x08, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, + 0x31, 0x1b, 0xc2, 0xfc, 0x07, 0x00, 0x00, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x1b, 0x00, 0x76, 0x00, + 0x28, 0x01, 0x00, 0x00, 0x4f, 0x40, 0x00, 0x00, + 0xaa, 0x3b, 0xf3, 0xdc, 0x07, 0x00, 0x00, 0x00, + 0x4f, 0x40, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0x68, 0x40, 0x00, 0x00, 0xe8, 0x73, 0x00, 0x00, + 0x8b, 0x2e, 0x14, 0x66, 0x07, 0x00, 0x00, 0x00, + 0xe8, 0x73, 0x00, 0x00, 0x17, 0x00, 0x76, 0x00, + 0x00, 0x74, 0x00, 0x00, 0x36, 0x85, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 0x05, 0x00, 0x00, 0x00, - 0x24, 0x26, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x28, 0x26, 0x00, 0x00, 0x2c, 0x26, 0x00, 0x00, - 0xb0, 0xb7, 0x24, 0x30, 0x02, 0x00, 0x00, 0x00, - 0x2c, 0x26, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0x34, 0x26, 0x00, 0x00, 0x38, 0x26, 0x00, 0x00, - 0x4e, 0xbf, 0xfb, 0x73, 0x00, 0x00, 0x00, 0x00, - 0x38, 0x26, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, - 0x44, 0x26, 0x00, 0x00, 0x48, 0x26, 0x00, 0x00, + 0x36, 0x85, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x3c, 0x85, 0x00, 0x00, 0x40, 0x85, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0x48, 0x26, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0x4c, 0x26, 0x00, 0x00, 0x50, 0x26, 0x00, 0x00, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2d, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, - 0x72, 0x64, 0x2d, 0x70, 0x61, 0x6e, 0x65, 0x6c, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x85, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x44, 0x85, 0x00, 0x00, 0x48, 0x85, 0x00, 0x00, + 0xce, 0xd7, 0x2c, 0x8d, 0x00, 0x00, 0x00, 0x00, + 0x48, 0x85, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, + 0x58, 0x85, 0x00, 0x00, 0x5c, 0x85, 0x00, 0x00, + 0x4e, 0xbf, 0xfb, 0x73, 0x06, 0x00, 0x00, 0x00, + 0x5c, 0x85, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, + 0x68, 0x85, 0x00, 0x00, 0x74, 0x85, 0x00, 0x00, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x2d, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x2e, 0x73, 0x76, 0x67, 0x00, + 0x17, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x20, 0x73, 0x74, 0x61, + 0x6e, 0x64, 0x61, 0x6c, 0x6f, 0x6e, 0x65, 0x3d, + 0x22, 0x6e, 0x6f, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x21, 0x2d, 0x2d, 0x20, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, + 0x20, 0x49, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x20, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3a, + 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, + 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f, + 0x72, 0x67, 0x2f, 0x29, 0x20, 0x2d, 0x2d, 0x3e, + 0x0a, 0x3c, 0x73, 0x76, 0x67, 0x20, 0x78, 0x6d, + 0x6c, 0x6e, 0x73, 0x3a, 0x64, 0x63, 0x3d, 0x22, + 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, + 0x75, 0x72, 0x6c, 0x2e, 0x6f, 0x72, 0x67, 0x2f, + 0x64, 0x63, 0x2f, 0x65, 0x6c, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x2f, 0x31, 0x2e, 0x31, 0x2f, + 0x22, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, + 0x63, 0x63, 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, + 0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6e, + 0x73, 0x23, 0x22, 0x20, 0x78, 0x6d, 0x6c, 0x6e, + 0x73, 0x3a, 0x72, 0x64, 0x66, 0x3d, 0x22, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, + 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x31, 0x39, 0x39, 0x39, 0x2f, 0x30, 0x32, + 0x2f, 0x32, 0x32, 0x2d, 0x72, 0x64, 0x66, 0x2d, + 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x2d, 0x6e, + 0x73, 0x23, 0x22, 0x20, 0x78, 0x6d, 0x6c, 0x6e, + 0x73, 0x3a, 0x73, 0x76, 0x67, 0x3d, 0x22, 0x68, + 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, + 0x77, 0x2e, 0x77, 0x33, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x32, 0x30, 0x30, 0x30, 0x2f, 0x73, 0x76, + 0x67, 0x22, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, + 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x77, 0x33, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x32, 0x30, 0x30, 0x30, + 0x2f, 0x73, 0x76, 0x67, 0x22, 0x20, 0x78, 0x6d, + 0x6c, 0x6e, 0x73, 0x3a, 0x73, 0x6f, 0x64, 0x69, + 0x70, 0x6f, 0x64, 0x69, 0x3d, 0x22, 0x68, 0x74, + 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x73, 0x6f, 0x64, + 0x69, 0x70, 0x6f, 0x64, 0x69, 0x2e, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x66, 0x6f, 0x72, 0x67, + 0x65, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x44, 0x54, + 0x44, 0x2f, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, + 0x64, 0x69, 0x2d, 0x30, 0x2e, 0x64, 0x74, 0x64, + 0x22, 0x20, 0x78, 0x6d, 0x6c, 0x6e, 0x73, 0x3a, + 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, + 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, + 0x67, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, + 0x61, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x22, 0x20, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x3d, 0x22, 0x32, 0x35, + 0x36, 0x22, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3d, 0x22, 0x37, 0x32, 0x22, 0x20, 0x76, + 0x69, 0x65, 0x77, 0x42, 0x6f, 0x78, 0x3d, 0x22, + 0x30, 0x20, 0x30, 0x20, 0x32, 0x35, 0x36, 0x20, + 0x37, 0x32, 0x2e, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x31, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x76, 0x67, 0x33, 0x36, 0x31, 0x31, 0x22, 0x20, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x31, 0x2e, 0x31, 0x22, 0x20, 0x69, 0x6e, + 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x30, 0x2e, 0x39, 0x31, 0x20, 0x72, 0x31, 0x33, + 0x37, 0x32, 0x35, 0x22, 0x20, 0x73, 0x6f, 0x64, + 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x64, 0x6f, + 0x63, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6b, 0x65, 0x79, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2d, 0x73, 0x68, + 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x2e, 0x73, + 0x76, 0x67, 0x22, 0x3e, 0x3c, 0x64, 0x65, 0x66, + 0x73, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, + 0x66, 0x73, 0x33, 0x36, 0x31, 0x33, 0x22, 0x2f, + 0x3e, 0x3c, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, + 0x64, 0x69, 0x3a, 0x6e, 0x61, 0x6d, 0x65, 0x64, + 0x76, 0x69, 0x65, 0x77, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x62, 0x61, 0x73, 0x65, 0x22, 0x20, 0x70, + 0x61, 0x67, 0x65, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3d, 0x22, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x22, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3d, 0x22, + 0x23, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x22, + 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3d, 0x22, + 0x31, 0x2e, 0x30, 0x22, 0x20, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x70, 0x61, + 0x67, 0x65, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x3d, 0x22, 0x30, 0x2e, 0x30, 0x22, 0x20, + 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, + 0x3a, 0x70, 0x61, 0x67, 0x65, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3d, 0x22, 0x32, 0x22, 0x20, + 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, + 0x3a, 0x7a, 0x6f, 0x6f, 0x6d, 0x3d, 0x22, 0x32, + 0x2e, 0x38, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x78, 0x3d, + 0x22, 0x31, 0x33, 0x37, 0x2e, 0x39, 0x38, 0x39, + 0x39, 0x37, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x79, 0x3d, + 0x22, 0x33, 0x34, 0x2e, 0x36, 0x36, 0x33, 0x36, + 0x30, 0x32, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x64, 0x6f, 0x63, + 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x2d, 0x75, 0x6e, + 0x69, 0x74, 0x73, 0x3d, 0x22, 0x70, 0x78, 0x22, + 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x3a, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, + 0x74, 0x2d, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x3d, + 0x22, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x31, 0x22, + 0x20, 0x73, 0x68, 0x6f, 0x77, 0x67, 0x72, 0x69, + 0x64, 0x3d, 0x22, 0x66, 0x61, 0x6c, 0x73, 0x65, + 0x22, 0x20, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x3d, + 0x22, 0x70, 0x78, 0x22, 0x20, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x3d, 0x22, 0x31, 0x33, 0x36, 0x36, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x3d, 0x22, 0x37, 0x30, 0x34, 0x22, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x78, + 0x3d, 0x22, 0x30, 0x22, 0x20, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x79, 0x3d, 0x22, + 0x32, 0x37, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x77, 0x69, 0x6e, + 0x64, 0x6f, 0x77, 0x2d, 0x6d, 0x61, 0x78, 0x69, + 0x6d, 0x69, 0x7a, 0x65, 0x64, 0x3d, 0x22, 0x31, + 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x33, 0x36, 0x31, 0x36, 0x22, 0x3e, 0x3c, + 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, 0x3e, + 0x3c, 0x63, 0x63, 0x3a, 0x57, 0x6f, 0x72, 0x6b, + 0x20, 0x72, 0x64, 0x66, 0x3a, 0x61, 0x62, 0x6f, + 0x75, 0x74, 0x3d, 0x22, 0x22, 0x3e, 0x3c, 0x64, + 0x63, 0x3a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x3e, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2f, 0x73, + 0x76, 0x67, 0x2b, 0x78, 0x6d, 0x6c, 0x3c, 0x2f, + 0x64, 0x63, 0x3a, 0x66, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x3e, 0x3c, 0x64, 0x63, 0x3a, 0x74, 0x79, + 0x70, 0x65, 0x20, 0x72, 0x64, 0x66, 0x3a, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3d, + 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, + 0x70, 0x75, 0x72, 0x6c, 0x2e, 0x6f, 0x72, 0x67, + 0x2f, 0x64, 0x63, 0x2f, 0x64, 0x63, 0x6d, 0x69, + 0x74, 0x79, 0x70, 0x65, 0x2f, 0x53, 0x74, 0x69, + 0x6c, 0x6c, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x2f, 0x3e, 0x3c, 0x64, 0x63, 0x3a, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x63, 0x3a, 0x57, 0x6f, 0x72, 0x6b, 0x3e, 0x3c, + 0x2f, 0x72, 0x64, 0x66, 0x3a, 0x52, 0x44, 0x46, + 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, + 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x67, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x3d, 0x22, 0x43, + 0x61, 0x6d, 0x61, 0x64, 0x61, 0x20, 0x31, 0x22, + 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x3a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x6d, + 0x6f, 0x64, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x79, + 0x65, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x31, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, + 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x65, 0x28, 0x30, 0x2c, 0x2d, + 0x39, 0x38, 0x30, 0x2e, 0x33, 0x36, 0x32, 0x31, + 0x36, 0x29, 0x22, 0x3e, 0x3c, 0x67, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x33, 0x37, 0x31, 0x35, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, + 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x28, 0x2d, + 0x35, 0x30, 0x33, 0x2e, 0x32, 0x33, 0x34, 0x31, + 0x35, 0x2c, 0x36, 0x38, 0x39, 0x2e, 0x39, 0x34, + 0x36, 0x35, 0x38, 0x29, 0x22, 0x3e, 0x3c, 0x70, + 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, + 0x20, 0x35, 0x30, 0x39, 0x2e, 0x36, 0x36, 0x33, + 0x36, 0x33, 0x2c, 0x33, 0x32, 0x35, 0x2e, 0x34, + 0x37, 0x36, 0x32, 0x37, 0x20, 0x63, 0x20, 0x35, + 0x2e, 0x35, 0x33, 0x30, 0x30, 0x32, 0x2c, 0x31, + 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, + 0x2e, 0x35, 0x31, 0x33, 0x38, 0x39, 0x2c, 0x31, + 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, + 0x2e, 0x32, 0x39, 0x33, 0x35, 0x39, 0x2c, 0x30, + 0x20, 0x30, 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, + 0x2c, 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, + 0x33, 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, + 0x36, 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, + 0x35, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x38, 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, + 0x37, 0x35, 0x31, 0x2c, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, + 0x2d, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, + 0x32, 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x2c, 0x30, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, + 0x2c, 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, + 0x37, 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, + 0x37, 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, + 0x37, 0x35, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, + 0x35, 0x32, 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, + 0x32, 0x35, 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, + 0x38, 0x32, 0x31, 0x36, 0x31, 0x20, 0x30, 0x2e, + 0x36, 0x39, 0x35, 0x31, 0x38, 0x2c, 0x2d, 0x31, + 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x2c, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, + 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x61, 0x74, 0x68, 0x32, 0x37, 0x32, 0x37, 0x35, + 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, + 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, + 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, + 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, + 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, + 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, + 0x3d, 0x22, 0x6d, 0x20, 0x35, 0x34, 0x33, 0x2e, + 0x36, 0x32, 0x31, 0x34, 0x36, 0x2c, 0x33, 0x32, + 0x35, 0x2e, 0x34, 0x37, 0x36, 0x32, 0x37, 0x20, + 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, 0x2c, 0x31, + 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, + 0x2e, 0x35, 0x31, 0x33, 0x38, 0x37, 0x2c, 0x31, + 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, + 0x2e, 0x32, 0x39, 0x33, 0x35, 0x37, 0x2c, 0x30, + 0x20, 0x30, 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, + 0x2c, 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, + 0x33, 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, + 0x38, 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, + 0x35, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x38, 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, + 0x37, 0x35, 0x33, 0x2c, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x33, 0x2c, 0x30, 0x20, 0x2d, + 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, + 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, + 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, + 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, 0x37, + 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, 0x38, + 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, + 0x35, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, + 0x32, 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, + 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, + 0x35, 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, + 0x32, 0x31, 0x36, 0x31, 0x20, 0x30, 0x2e, 0x36, + 0x39, 0x35, 0x31, 0x38, 0x2c, 0x2d, 0x31, 0x2e, + 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x33, 0x2c, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, 0x7a, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, + 0x68, 0x32, 0x37, 0x32, 0x37, 0x37, 0x22, 0x20, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, + 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, + 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, + 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, + 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, + 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, + 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, + 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, + 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, + 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, + 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, + 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, + 0x6d, 0x20, 0x35, 0x37, 0x37, 0x2e, 0x35, 0x37, + 0x39, 0x32, 0x37, 0x2c, 0x33, 0x32, 0x35, 0x2e, + 0x34, 0x37, 0x36, 0x32, 0x37, 0x20, 0x63, 0x20, + 0x35, 0x2e, 0x35, 0x33, 0x2c, 0x31, 0x2e, 0x34, + 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, + 0x31, 0x33, 0x38, 0x37, 0x2c, 0x31, 0x2e, 0x34, + 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x32, + 0x39, 0x33, 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, + 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, + 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, 0x33, 0x20, + 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, + 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, 0x20, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, + 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, + 0x33, 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, + 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, + 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, + 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, + 0x2e, 0x33, 0x35, 0x32, 0x38, 0x37, 0x20, 0x31, + 0x2e, 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, + 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, + 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, + 0x36, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, + 0x32, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x38, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x32, 0x37, + 0x32, 0x37, 0x39, 0x22, 0x20, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, + 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, + 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, + 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, + 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, + 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x36, + 0x31, 0x31, 0x2e, 0x31, 0x32, 0x33, 0x32, 0x36, + 0x2c, 0x33, 0x32, 0x35, 0x2e, 0x34, 0x37, 0x36, + 0x32, 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, + 0x33, 0x30, 0x30, 0x32, 0x2c, 0x31, 0x2e, 0x34, + 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, + 0x31, 0x33, 0x38, 0x39, 0x2c, 0x31, 0x2e, 0x34, + 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x32, + 0x39, 0x33, 0x35, 0x39, 0x2c, 0x30, 0x20, 0x30, + 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, + 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, 0x33, 0x20, + 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, 0x36, 0x2c, + 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, 0x20, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, + 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, + 0x31, 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, + 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, 0x2d, 0x32, + 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, + 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, + 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, + 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, 0x37, 0x20, + 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, 0x37, 0x2c, + 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, + 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, + 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, + 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, + 0x31, 0x36, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, + 0x35, 0x31, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, + 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x38, 0x2c, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, 0x7a, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, + 0x68, 0x35, 0x32, 0x31, 0x38, 0x22, 0x20, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, + 0x35, 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, + 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, + 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, + 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, + 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, + 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, + 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, + 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, + 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, + 0x20, 0x36, 0x34, 0x35, 0x2e, 0x30, 0x38, 0x31, + 0x30, 0x39, 0x2c, 0x33, 0x32, 0x35, 0x2e, 0x34, + 0x37, 0x36, 0x32, 0x37, 0x20, 0x63, 0x20, 0x35, + 0x2e, 0x35, 0x33, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, + 0x33, 0x38, 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, + 0x33, 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, + 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x33, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, + 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, + 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, + 0x33, 0x35, 0x32, 0x38, 0x37, 0x20, 0x31, 0x2e, + 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, + 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, 0x2c, 0x2d, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x35, + 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, + 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, + 0x39, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x31, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x20, 0x7a, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x35, + 0x32, 0x32, 0x30, 0x22, 0x20, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, + 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, + 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, + 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, + 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, + 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x36, + 0x37, 0x39, 0x2e, 0x30, 0x33, 0x38, 0x39, 0x2c, + 0x33, 0x32, 0x35, 0x2e, 0x34, 0x37, 0x36, 0x32, + 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, + 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, 0x37, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, + 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, 0x35, 0x37, + 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, 0x30, 0x37, + 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x31, 0x39, + 0x38, 0x31, 0x33, 0x20, 0x31, 0x2e, 0x34, 0x33, + 0x33, 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x36, 0x37, + 0x31, 0x38, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x20, 0x6c, 0x20, 0x31, 0x2e, + 0x39, 0x39, 0x37, 0x35, 0x33, 0x2c, 0x31, 0x33, + 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x2c, 0x30, + 0x20, 0x2d, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, + 0x36, 0x32, 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x30, 0x20, + 0x63, 0x20, 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, + 0x33, 0x2c, 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, + 0x38, 0x37, 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, + 0x36, 0x38, 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, + 0x35, 0x37, 0x35, 0x20, 0x31, 0x2e, 0x39, 0x39, + 0x37, 0x35, 0x31, 0x2c, 0x2d, 0x31, 0x33, 0x2e, + 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, + 0x31, 0x32, 0x35, 0x36, 0x35, 0x2c, 0x2d, 0x30, + 0x2e, 0x38, 0x32, 0x31, 0x36, 0x31, 0x20, 0x30, + 0x2e, 0x36, 0x39, 0x35, 0x32, 0x31, 0x2c, 0x2d, + 0x31, 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x31, 0x2c, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, + 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x61, 0x74, 0x68, 0x35, 0x32, 0x32, 0x32, + 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, + 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, + 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, + 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, + 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, + 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, + 0x3d, 0x22, 0x6d, 0x20, 0x37, 0x31, 0x32, 0x2e, + 0x35, 0x38, 0x32, 0x38, 0x39, 0x2c, 0x33, 0x32, + 0x35, 0x2e, 0x34, 0x37, 0x36, 0x32, 0x37, 0x20, + 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, 0x30, 0x30, + 0x32, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, + 0x39, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, 0x35, + 0x39, 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, 0x30, + 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x31, + 0x39, 0x38, 0x31, 0x33, 0x20, 0x31, 0x2e, 0x34, + 0x33, 0x33, 0x30, 0x36, 0x2c, 0x30, 0x2e, 0x36, + 0x37, 0x31, 0x38, 0x35, 0x20, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x38, 0x20, 0x6c, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, 0x2c, 0x31, + 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, + 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, 0x32, + 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, + 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, 0x36, + 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, 0x33, + 0x35, 0x32, 0x38, 0x37, 0x20, 0x31, 0x2e, 0x33, + 0x33, 0x31, 0x36, 0x37, 0x2c, 0x2d, 0x38, 0x2e, + 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, 0x2e, + 0x39, 0x39, 0x37, 0x35, 0x31, 0x2c, 0x2d, 0x31, + 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, + 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x35, 0x2c, + 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, 0x31, + 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, 0x39, + 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, 0x38, + 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x38, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x34, 0x38, + 0x32, 0x39, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, + 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, + 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x36, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x32, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, + 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, + 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, + 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, + 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, + 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, + 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, + 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x35, 0x31, + 0x36, 0x2e, 0x31, 0x39, 0x30, 0x34, 0x34, 0x2c, + 0x33, 0x33, 0x35, 0x2e, 0x32, 0x36, 0x36, 0x34, + 0x38, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x30, 0x30, 0x32, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x31, 0x20, 0x31, 0x38, 0x2e, 0x35, + 0x31, 0x33, 0x38, 0x39, 0x2c, 0x31, 0x2e, 0x34, + 0x31, 0x38, 0x35, 0x31, 0x20, 0x32, 0x34, 0x2e, + 0x32, 0x39, 0x33, 0x36, 0x2c, 0x30, 0x20, 0x30, + 0x2e, 0x38, 0x30, 0x37, 0x32, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x36, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, + 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, + 0x36, 0x36, 0x35, 0x38, 0x34, 0x2c, 0x2d, 0x34, + 0x2e, 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, + 0x2e, 0x33, 0x33, 0x31, 0x36, 0x37, 0x2c, 0x2d, + 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, + 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, + 0x36, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, + 0x31, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, + 0x33, 0x36, 0x36, 0x32, 0x22, 0x20, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, + 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, + 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, + 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, + 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, + 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, + 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, + 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, + 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, + 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, + 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x35, 0x35, 0x30, 0x2e, 0x31, 0x34, 0x38, 0x32, + 0x37, 0x2c, 0x33, 0x33, 0x35, 0x2e, 0x32, 0x36, + 0x36, 0x34, 0x38, 0x20, 0x63, 0x20, 0x35, 0x2e, + 0x35, 0x33, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, + 0x35, 0x31, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, + 0x33, 0x38, 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, + 0x39, 0x33, 0x35, 0x38, 0x2c, 0x30, 0x20, 0x30, + 0x2e, 0x38, 0x30, 0x37, 0x32, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x37, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, + 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, + 0x36, 0x35, 0x38, 0x34, 0x2c, 0x2d, 0x34, 0x2e, + 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, + 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, + 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x2d, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, + 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, + 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, + 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x36, + 0x36, 0x34, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, + 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, + 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, + 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, + 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, + 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, + 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, + 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, + 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, + 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, + 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x35, 0x38, + 0x34, 0x2e, 0x31, 0x30, 0x36, 0x30, 0x38, 0x2c, + 0x33, 0x33, 0x35, 0x2e, 0x32, 0x36, 0x36, 0x34, + 0x38, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x31, + 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, + 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, + 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, + 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, + 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, 0x2e, + 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, 0x2e, + 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, 0x2c, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, + 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, 0x32, + 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, + 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, 0x36, + 0x35, 0x38, 0x34, 0x2c, 0x2d, 0x34, 0x2e, 0x33, + 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, 0x33, + 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, 0x2e, + 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, 0x2e, + 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x2d, 0x31, + 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, + 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, 0x2c, + 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, 0x31, + 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, + 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x2c, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x61, 0x74, 0x68, 0x33, 0x36, 0x36, 0x36, + 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, + 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, + 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, + 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, + 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, + 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, + 0x3d, 0x22, 0x6d, 0x20, 0x36, 0x31, 0x37, 0x2e, + 0x36, 0x35, 0x30, 0x30, 0x37, 0x2c, 0x33, 0x33, + 0x35, 0x2e, 0x32, 0x36, 0x36, 0x34, 0x38, 0x20, + 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, 0x30, 0x30, + 0x32, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x31, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, + 0x38, 0x39, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, + 0x35, 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, + 0x33, 0x35, 0x39, 0x2c, 0x30, 0x20, 0x30, 0x2e, + 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x36, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x38, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, + 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, + 0x36, 0x36, 0x35, 0x38, 0x34, 0x2c, 0x2d, 0x34, + 0x2e, 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, + 0x2e, 0x33, 0x33, 0x31, 0x36, 0x37, 0x2c, 0x2d, + 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, + 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, + 0x36, 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, + 0x31, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, + 0x33, 0x36, 0x36, 0x38, 0x22, 0x20, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, + 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, + 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, + 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, + 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, + 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, + 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, + 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, + 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, + 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, + 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x36, 0x35, 0x31, 0x2e, 0x36, 0x30, 0x37, 0x39, + 0x2c, 0x33, 0x33, 0x35, 0x2e, 0x32, 0x36, 0x36, + 0x34, 0x38, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, + 0x33, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x31, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, + 0x38, 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, + 0x35, 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, + 0x33, 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, + 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, + 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, + 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, + 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, + 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, + 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x2d, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, + 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, + 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, + 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x36, + 0x37, 0x30, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, + 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, + 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, + 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, + 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, + 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, + 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, + 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, + 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, + 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, + 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, + 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, + 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x36, 0x38, + 0x35, 0x2e, 0x35, 0x36, 0x35, 0x37, 0x31, 0x2c, + 0x33, 0x33, 0x35, 0x2e, 0x32, 0x36, 0x36, 0x34, + 0x38, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x31, + 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, + 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, + 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, + 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, + 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, 0x2e, + 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, 0x2e, + 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, 0x2c, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, + 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, 0x32, + 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, + 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, 0x36, + 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, 0x33, + 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, 0x33, + 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, 0x2e, + 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, 0x2e, + 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x2d, 0x31, + 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, + 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, 0x2c, + 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, 0x31, + 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, + 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x2c, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x61, 0x74, 0x68, 0x33, 0x36, 0x37, 0x32, + 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, + 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, + 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, + 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, + 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, + 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, + 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, + 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, + 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, + 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, + 0x3d, 0x22, 0x6d, 0x20, 0x37, 0x31, 0x39, 0x2e, + 0x31, 0x30, 0x39, 0x37, 0x2c, 0x33, 0x33, 0x35, + 0x2e, 0x32, 0x36, 0x36, 0x34, 0x38, 0x20, 0x63, + 0x20, 0x35, 0x2e, 0x35, 0x33, 0x30, 0x30, 0x32, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x31, + 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, + 0x39, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x31, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, + 0x35, 0x39, 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, + 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, + 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, 0x2e, + 0x34, 0x33, 0x33, 0x30, 0x36, 0x2c, 0x30, 0x2e, + 0x36, 0x37, 0x31, 0x38, 0x36, 0x20, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, 0x2c, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x38, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, + 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, + 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, + 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, + 0x33, 0x33, 0x31, 0x36, 0x37, 0x2c, 0x2d, 0x38, + 0x2e, 0x37, 0x30, 0x35, 0x37, 0x35, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x2d, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, + 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, + 0x31, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, + 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, + 0x36, 0x37, 0x34, 0x22, 0x20, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x36, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x32, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, + 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, + 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, + 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, + 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x35, + 0x32, 0x35, 0x2e, 0x39, 0x38, 0x30, 0x36, 0x36, + 0x2c, 0x33, 0x34, 0x35, 0x2e, 0x30, 0x35, 0x36, + 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x30, 0x30, 0x32, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, + 0x33, 0x38, 0x39, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, + 0x33, 0x35, 0x39, 0x2c, 0x30, 0x20, 0x30, 0x2e, + 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x36, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x38, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, + 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, 0x30, + 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, + 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, + 0x2e, 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, + 0x2e, 0x33, 0x33, 0x31, 0x36, 0x37, 0x2c, 0x2d, + 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x36, 0x20, + 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x32, 0x2c, + 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, + 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, + 0x36, 0x32, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, + 0x31, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x38, 0x2c, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, + 0x33, 0x36, 0x37, 0x36, 0x22, 0x20, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, + 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, + 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, + 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, + 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, + 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, + 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, + 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, + 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, + 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, + 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x35, 0x35, 0x39, 0x2e, 0x39, 0x33, 0x38, 0x34, + 0x39, 0x2c, 0x33, 0x34, 0x35, 0x2e, 0x30, 0x35, + 0x36, 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, + 0x33, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, + 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, + 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, 0x35, + 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, 0x30, + 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x31, + 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, 0x2e, 0x34, + 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x36, + 0x37, 0x31, 0x38, 0x35, 0x20, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, 0x2c, 0x31, + 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x2c, + 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, 0x32, 0x38, + 0x38, 0x36, 0x32, 0x2c, 0x30, 0x20, 0x2d, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x30, + 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, 0x36, 0x35, + 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, 0x33, 0x35, + 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, 0x33, 0x33, + 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, 0x2e, 0x37, + 0x30, 0x35, 0x37, 0x36, 0x20, 0x31, 0x2e, 0x39, + 0x39, 0x37, 0x35, 0x31, 0x2c, 0x2d, 0x31, 0x33, + 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, 0x30, + 0x2e, 0x31, 0x32, 0x35, 0x36, 0x35, 0x2c, 0x2d, + 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, 0x32, 0x20, + 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, 0x39, 0x2c, + 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, + 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x33, 0x31, + 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x36, 0x37, + 0x38, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, + 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, + 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, + 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, + 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, + 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, + 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, + 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, + 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, + 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, + 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, + 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, + 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, + 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, + 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, + 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, + 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x35, 0x39, 0x33, + 0x2e, 0x38, 0x39, 0x36, 0x33, 0x2c, 0x33, 0x34, + 0x35, 0x2e, 0x30, 0x35, 0x36, 0x37, 0x20, 0x63, + 0x20, 0x35, 0x2e, 0x35, 0x33, 0x2c, 0x31, 0x2e, + 0x34, 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, + 0x35, 0x31, 0x33, 0x38, 0x37, 0x2c, 0x31, 0x2e, + 0x34, 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, + 0x32, 0x39, 0x33, 0x35, 0x37, 0x2c, 0x30, 0x20, + 0x30, 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, + 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, + 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, 0x38, + 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, + 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, + 0x35, 0x33, 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, + 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, + 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, 0x2c, + 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, + 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, + 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, + 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, + 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, 0x36, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, + 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, + 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, + 0x36, 0x35, 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, + 0x31, 0x36, 0x32, 0x20, 0x30, 0x2e, 0x36, 0x39, + 0x35, 0x32, 0x31, 0x2c, 0x2d, 0x31, 0x2e, 0x37, + 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x33, 0x31, 0x2c, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, + 0x68, 0x33, 0x36, 0x38, 0x30, 0x22, 0x20, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, + 0x35, 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, + 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, + 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, + 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, + 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, + 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, + 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, + 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, + 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, + 0x20, 0x36, 0x32, 0x37, 0x2e, 0x34, 0x34, 0x30, + 0x32, 0x39, 0x2c, 0x33, 0x34, 0x35, 0x2e, 0x30, + 0x35, 0x36, 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, + 0x35, 0x33, 0x30, 0x30, 0x32, 0x2c, 0x31, 0x2e, + 0x34, 0x31, 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, + 0x35, 0x31, 0x33, 0x38, 0x39, 0x2c, 0x31, 0x2e, + 0x34, 0x31, 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, + 0x32, 0x39, 0x33, 0x35, 0x39, 0x2c, 0x30, 0x20, + 0x30, 0x2e, 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, + 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, + 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, 0x36, + 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, + 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, + 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, + 0x35, 0x31, 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, + 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, 0x2d, + 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, 0x32, + 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x39, 0x2c, 0x30, 0x20, 0x63, 0x20, + 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, 0x2c, + 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, 0x38, + 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, 0x37, + 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, 0x37, + 0x36, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, + 0x31, 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, 0x35, + 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, 0x32, + 0x35, 0x36, 0x35, 0x2c, 0x2d, 0x30, 0x2e, 0x38, + 0x32, 0x31, 0x36, 0x32, 0x20, 0x30, 0x2e, 0x36, + 0x39, 0x35, 0x31, 0x39, 0x2c, 0x2d, 0x31, 0x2e, + 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x2d, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x7a, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, + 0x74, 0x68, 0x33, 0x36, 0x38, 0x32, 0x22, 0x20, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, 0x6c, + 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, + 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x31, + 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, 0x39, 0x37, + 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, + 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, 0x74, + 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, 0x73, + 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, 0x6f, + 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, 0x6e, + 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, 0x63, + 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, 0x6b, + 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, 0x6f, + 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2d, + 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, 0x72, + 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, + 0x6d, 0x20, 0x36, 0x36, 0x31, 0x2e, 0x33, 0x39, + 0x38, 0x31, 0x32, 0x2c, 0x33, 0x34, 0x35, 0x2e, + 0x30, 0x35, 0x36, 0x37, 0x20, 0x63, 0x20, 0x35, + 0x2e, 0x35, 0x33, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x31, 0x38, 0x2e, 0x35, 0x31, + 0x33, 0x38, 0x37, 0x2c, 0x31, 0x2e, 0x34, 0x31, + 0x38, 0x35, 0x20, 0x32, 0x34, 0x2e, 0x32, 0x39, + 0x33, 0x35, 0x37, 0x2c, 0x30, 0x20, 0x30, 0x2e, + 0x38, 0x30, 0x37, 0x32, 0x31, 0x2c, 0x2d, 0x30, + 0x2e, 0x31, 0x39, 0x38, 0x31, 0x32, 0x20, 0x31, + 0x2e, 0x34, 0x33, 0x33, 0x30, 0x38, 0x2c, 0x30, + 0x2e, 0x36, 0x37, 0x31, 0x38, 0x35, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, 0x6c, + 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, 0x35, 0x33, + 0x2c, 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, + 0x33, 0x20, 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x32, 0x38, 0x2e, + 0x32, 0x38, 0x38, 0x36, 0x33, 0x2c, 0x30, 0x20, + 0x2d, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x38, + 0x2c, 0x30, 0x20, 0x63, 0x20, 0x30, 0x2e, 0x36, + 0x36, 0x35, 0x38, 0x33, 0x2c, 0x2d, 0x34, 0x2e, + 0x33, 0x35, 0x32, 0x38, 0x38, 0x20, 0x31, 0x2e, + 0x33, 0x33, 0x31, 0x36, 0x38, 0x2c, 0x2d, 0x38, + 0x2e, 0x37, 0x30, 0x35, 0x37, 0x36, 0x20, 0x31, + 0x2e, 0x39, 0x39, 0x37, 0x35, 0x31, 0x2c, 0x2d, + 0x31, 0x33, 0x2e, 0x30, 0x35, 0x38, 0x36, 0x33, + 0x20, 0x30, 0x2e, 0x31, 0x32, 0x35, 0x36, 0x34, + 0x2c, 0x2d, 0x30, 0x2e, 0x38, 0x32, 0x31, 0x36, + 0x32, 0x20, 0x30, 0x2e, 0x36, 0x39, 0x35, 0x31, + 0x39, 0x2c, 0x2d, 0x31, 0x2e, 0x37, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x33, 0x31, 0x2c, 0x2d, 0x31, 0x2e, 0x35, 0x30, + 0x30, 0x32, 0x39, 0x20, 0x7a, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, + 0x36, 0x38, 0x34, 0x22, 0x20, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x3a, 0x23, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, 0x70, + 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, 0x3b, + 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x23, + 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x35, 0x39, + 0x39, 0x39, 0x39, 0x39, 0x37, 0x39, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x6d, 0x69, + 0x74, 0x65, 0x72, 0x6c, 0x69, 0x6d, 0x69, 0x74, + 0x3a, 0x34, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x64, 0x61, 0x73, 0x68, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, + 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, + 0x31, 0x22, 0x20, 0x73, 0x6f, 0x64, 0x69, 0x70, + 0x6f, 0x64, 0x69, 0x3a, 0x6e, 0x6f, 0x64, 0x65, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x3d, 0x22, 0x73, + 0x73, 0x73, 0x63, 0x63, 0x63, 0x63, 0x73, 0x73, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x61, 0x74, + 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, 0x36, + 0x39, 0x35, 0x2e, 0x33, 0x35, 0x35, 0x39, 0x33, + 0x2c, 0x33, 0x34, 0x35, 0x2e, 0x30, 0x35, 0x36, + 0x37, 0x20, 0x63, 0x20, 0x35, 0x2e, 0x35, 0x33, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, + 0x31, 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, 0x37, + 0x2c, 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, + 0x32, 0x34, 0x2e, 0x32, 0x39, 0x33, 0x35, 0x37, + 0x2c, 0x30, 0x20, 0x30, 0x2e, 0x38, 0x30, 0x37, + 0x32, 0x2c, 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, + 0x31, 0x32, 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, + 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, + 0x38, 0x35, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, + 0x32, 0x39, 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, + 0x39, 0x37, 0x35, 0x33, 0x2c, 0x31, 0x33, 0x2e, + 0x30, 0x35, 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x33, 0x2c, 0x30, 0x20, + 0x2d, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, + 0x2c, 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, + 0x38, 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, + 0x38, 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, + 0x37, 0x36, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, + 0x35, 0x31, 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, + 0x32, 0x35, 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, + 0x38, 0x32, 0x31, 0x36, 0x32, 0x20, 0x30, 0x2e, + 0x36, 0x39, 0x35, 0x32, 0x31, 0x2c, 0x2d, 0x31, + 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x33, 0x31, 0x2c, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, + 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x61, 0x74, 0x68, 0x33, 0x36, 0x38, 0x36, 0x22, + 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x31, 0x2e, 0x35, 0x39, 0x39, 0x39, 0x39, 0x39, + 0x37, 0x39, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, + 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, + 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, + 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, + 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, + 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, + 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, + 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, + 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, + 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, + 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, + 0x3c, 0x70, 0x61, 0x74, 0x68, 0x20, 0x64, 0x3d, + 0x22, 0x6d, 0x20, 0x37, 0x32, 0x38, 0x2e, 0x38, + 0x39, 0x39, 0x39, 0x32, 0x2c, 0x33, 0x34, 0x35, + 0x2e, 0x30, 0x35, 0x36, 0x37, 0x20, 0x63, 0x20, + 0x35, 0x2e, 0x35, 0x33, 0x30, 0x30, 0x32, 0x2c, + 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x31, + 0x38, 0x2e, 0x35, 0x31, 0x33, 0x38, 0x39, 0x2c, + 0x31, 0x2e, 0x34, 0x31, 0x38, 0x35, 0x20, 0x32, + 0x34, 0x2e, 0x32, 0x39, 0x33, 0x35, 0x39, 0x2c, + 0x30, 0x20, 0x30, 0x2e, 0x38, 0x30, 0x37, 0x32, + 0x2c, 0x2d, 0x30, 0x2e, 0x31, 0x39, 0x38, 0x31, + 0x32, 0x20, 0x31, 0x2e, 0x34, 0x33, 0x33, 0x30, + 0x36, 0x2c, 0x30, 0x2e, 0x36, 0x37, 0x31, 0x38, + 0x35, 0x20, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x2c, 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, + 0x39, 0x20, 0x6c, 0x20, 0x31, 0x2e, 0x39, 0x39, + 0x37, 0x35, 0x31, 0x2c, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x2d, 0x31, 0x2e, + 0x35, 0x30, 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, + 0x2d, 0x32, 0x38, 0x2e, 0x32, 0x38, 0x38, 0x36, + 0x33, 0x2c, 0x30, 0x20, 0x2d, 0x31, 0x2e, 0x35, + 0x30, 0x30, 0x32, 0x38, 0x2c, 0x30, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x36, 0x36, 0x35, 0x38, 0x33, + 0x2c, 0x2d, 0x34, 0x2e, 0x33, 0x35, 0x32, 0x38, + 0x38, 0x20, 0x31, 0x2e, 0x33, 0x33, 0x31, 0x36, + 0x36, 0x2c, 0x2d, 0x38, 0x2e, 0x37, 0x30, 0x35, + 0x37, 0x36, 0x20, 0x31, 0x2e, 0x39, 0x39, 0x37, + 0x35, 0x31, 0x2c, 0x2d, 0x31, 0x33, 0x2e, 0x30, + 0x35, 0x38, 0x36, 0x33, 0x20, 0x30, 0x2e, 0x31, + 0x32, 0x35, 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, + 0x38, 0x32, 0x31, 0x36, 0x32, 0x20, 0x30, 0x2e, + 0x36, 0x39, 0x35, 0x31, 0x39, 0x2c, 0x2d, 0x31, + 0x2e, 0x37, 0x30, 0x36, 0x38, 0x31, 0x20, 0x31, + 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x2c, 0x2d, + 0x31, 0x2e, 0x35, 0x30, 0x30, 0x32, 0x39, 0x20, + 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x61, 0x74, 0x68, 0x33, 0x36, 0x38, 0x38, 0x22, + 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x66, 0x66, + 0x66, 0x66, 0x66, 0x66, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, 0x74, + 0x79, 0x3a, 0x31, 0x3b, 0x73, 0x74, 0x72, 0x6f, + 0x6b, 0x65, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x31, 0x2e, 0x36, 0x30, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x32, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x6c, + 0x69, 0x6d, 0x69, 0x74, 0x3a, 0x34, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x64, 0x61, + 0x73, 0x68, 0x61, 0x72, 0x72, 0x61, 0x79, 0x3a, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, + 0x6f, 0x6b, 0x65, 0x2d, 0x6f, 0x70, 0x61, 0x63, + 0x69, 0x74, 0x79, 0x3a, 0x31, 0x22, 0x20, 0x73, + 0x6f, 0x64, 0x69, 0x70, 0x6f, 0x64, 0x69, 0x3a, + 0x6e, 0x6f, 0x64, 0x65, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x3d, 0x22, 0x73, 0x73, 0x73, 0x63, 0x63, + 0x63, 0x63, 0x73, 0x73, 0x22, 0x20, 0x69, 0x6e, + 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x63, + 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x6f, 0x72, + 0x2d, 0x63, 0x75, 0x72, 0x76, 0x61, 0x74, 0x75, + 0x72, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x2f, 0x3e, + 0x3c, 0x67, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x33, 0x37, 0x31, 0x33, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, + 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, + 0x31, 0x2e, 0x33, 0x35, 0x39, 0x37, 0x35, 0x32, + 0x2c, 0x30, 0x2c, 0x30, 0x2c, 0x31, 0x2e, 0x33, + 0x35, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x34, 0x31, + 0x38, 0x2e, 0x30, 0x39, 0x33, 0x33, 0x36, 0x2c, + 0x2d, 0x36, 0x37, 0x31, 0x2e, 0x30, 0x38, 0x35, + 0x32, 0x35, 0x29, 0x22, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x39, 0x35, 0x2e, 0x32, 0x35, 0x30, 0x32, 0x35, + 0x37, 0x2c, 0x37, 0x31, 0x35, 0x2e, 0x31, 0x30, + 0x39, 0x33, 0x33, 0x20, 0x30, 0x2c, 0x31, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x39, 0x20, 0x63, 0x20, + 0x2d, 0x31, 0x2e, 0x33, 0x31, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x31, 0x31, 0x33, 0x20, + 0x2d, 0x35, 0x2e, 0x30, 0x32, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x32, 0x32, 0x37, 0x20, + 0x30, 0x2c, 0x30, 0x2e, 0x30, 0x33, 0x34, 0x31, + 0x20, 0x30, 0x2e, 0x30, 0x31, 0x32, 0x32, 0x32, + 0x2c, 0x30, 0x2e, 0x32, 0x37, 0x38, 0x31, 0x32, + 0x20, 0x30, 0x2e, 0x31, 0x34, 0x30, 0x32, 0x36, + 0x36, 0x2c, 0x30, 0x2e, 0x35, 0x35, 0x36, 0x32, + 0x31, 0x20, 0x30, 0x2e, 0x33, 0x34, 0x30, 0x39, + 0x30, 0x32, 0x2c, 0x30, 0x2e, 0x37, 0x34, 0x39, + 0x39, 0x39, 0x20, 0x6c, 0x20, 0x35, 0x2e, 0x36, + 0x39, 0x33, 0x30, 0x36, 0x31, 0x2c, 0x35, 0x2e, + 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x35, 0x2e, + 0x36, 0x35, 0x38, 0x39, 0x37, 0x2c, 0x2d, 0x35, + 0x2e, 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x32, 0x39, + 0x2c, 0x2d, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x33, + 0x32, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, 0x38, + 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x34, 0x39, 0x34, + 0x37, 0x33, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x37, 0x38, + 0x34, 0x31, 0x33, 0x20, 0x6c, 0x20, 0x30, 0x2c, + 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, 0x39, + 0x20, 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, + 0x38, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x2d, 0x30, + 0x2e, 0x32, 0x38, 0x39, 0x34, 0x31, 0x2c, 0x30, + 0x20, 0x2d, 0x30, 0x2e, 0x35, 0x37, 0x38, 0x38, + 0x31, 0x2c, 0x30, 0x2e, 0x31, 0x30, 0x31, 0x35, + 0x36, 0x20, 0x2d, 0x30, 0x2e, 0x37, 0x38, 0x34, + 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x34, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x32, 0x2c, 0x34, 0x2e, + 0x31, 0x35, 0x39, 0x30, 0x31, 0x20, 0x2d, 0x34, + 0x2e, 0x31, 0x32, 0x34, 0x39, 0x31, 0x33, 0x2c, + 0x2d, 0x34, 0x2e, 0x31, 0x35, 0x39, 0x30, 0x31, + 0x20, 0x63, 0x20, 0x2d, 0x30, 0x2e, 0x32, 0x31, + 0x32, 0x33, 0x31, 0x39, 0x2c, 0x2d, 0x30, 0x2e, + 0x32, 0x32, 0x39, 0x38, 0x39, 0x20, 0x2d, 0x30, + 0x2e, 0x35, 0x31, 0x31, 0x38, 0x39, 0x38, 0x2c, + 0x2d, 0x30, 0x2e, 0x33, 0x33, 0x30, 0x37, 0x31, + 0x20, 0x2d, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x31, + 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x33, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x31, + 0x2e, 0x30, 0x39, 0x30, 0x38, 0x38, 0x36, 0x2c, + 0x30, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x37, 0x31, + 0x35, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x23, 0x62, 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, + 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x76, + 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, + 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, + 0x72, 0x65, 0x74, 0x63, 0x68, 0x3a, 0x6e, 0x6f, + 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x6d, + 0x65, 0x64, 0x69, 0x75, 0x6d, 0x3b, 0x6c, 0x69, + 0x6e, 0x65, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, + 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x27, 0x41, 0x6e, + 0x64, 0x61, 0x6c, 0x65, 0x20, 0x4d, 0x6f, 0x6e, + 0x6f, 0x27, 0x3b, 0x2d, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x2d, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, + 0x27, 0x41, 0x6e, 0x64, 0x61, 0x6c, 0x65, 0x20, + 0x4d, 0x6f, 0x6e, 0x6f, 0x27, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x69, 0x6e, 0x64, 0x65, 0x6e, + 0x74, 0x3a, 0x30, 0x3b, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3b, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x64, + 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x6c, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x2d, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x66, 0x6f, 0x72, 0x6d, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x6c, 0x74, 0x72, 0x3b, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2d, 0x70, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x3a, 0x74, 0x62, 0x3b, 0x77, 0x72, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x3a, 0x6c, 0x72, 0x2d, 0x74, 0x62, 0x3b, + 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6e, 0x63, + 0x68, 0x6f, 0x72, 0x3a, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, + 0x79, 0x3a, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x66, 0x6c, 0x6f, + 0x77, 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x3b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x3a, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x31, 0x30, + 0x30, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x7a, 0x65, + 0x72, 0x6f, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x37, 0x38, + 0x31, 0x32, 0x34, 0x39, 0x38, 0x38, 0x3b, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x72, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x65, 0x6e, 0x61, 0x62, 0x6c, + 0x65, 0x2d, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x6e, 0x65, 0x77, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x72, 0x65, 0x63, + 0x74, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x39, 0x39, 0x39, + 0x37, 0x34, 0x35, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x74, 0x33, 0x37, 0x31, + 0x37, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x30, 0x22, + 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x23, 0x62, + 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, 0x64, 0x69, + 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3a, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x3b, 0x6f, 0x76, 0x65, + 0x72, 0x66, 0x6c, 0x6f, 0x77, 0x3a, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x31, 0x30, 0x30, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x32, 0x3b, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x2d, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, + 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61, + 0x74, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x28, 0x2d, 0x31, 0x2c, + 0x31, 0x29, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x38, 0x31, + 0x37, 0x37, 0x31, 0x38, 0x22, 0x20, 0x78, 0x3d, + 0x22, 0x2d, 0x31, 0x30, 0x32, 0x2e, 0x33, 0x34, + 0x31, 0x30, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, + 0x37, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x37, 0x34, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x67, 0x3e, + 0x3c, 0x67, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x33, 0x37, 0x34, 0x30, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, + 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, + 0x31, 0x2e, 0x33, 0x35, 0x39, 0x37, 0x35, 0x32, + 0x2c, 0x30, 0x2c, 0x30, 0x2c, 0x31, 0x2e, 0x33, + 0x35, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x34, 0x39, + 0x32, 0x2e, 0x31, 0x32, 0x31, 0x39, 0x38, 0x2c, + 0x2d, 0x36, 0x36, 0x31, 0x2e, 0x32, 0x39, 0x35, + 0x30, 0x34, 0x29, 0x22, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x39, 0x35, 0x2e, 0x32, 0x35, 0x30, 0x32, 0x35, + 0x37, 0x2c, 0x37, 0x31, 0x35, 0x2e, 0x31, 0x30, + 0x39, 0x33, 0x33, 0x20, 0x30, 0x2c, 0x31, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x39, 0x20, 0x63, 0x20, + 0x2d, 0x31, 0x2e, 0x33, 0x31, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x31, 0x31, 0x33, 0x20, + 0x2d, 0x35, 0x2e, 0x30, 0x32, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x32, 0x32, 0x37, 0x20, + 0x30, 0x2c, 0x30, 0x2e, 0x30, 0x33, 0x34, 0x31, + 0x20, 0x30, 0x2e, 0x30, 0x31, 0x32, 0x32, 0x32, + 0x2c, 0x30, 0x2e, 0x32, 0x37, 0x38, 0x31, 0x32, + 0x20, 0x30, 0x2e, 0x31, 0x34, 0x30, 0x32, 0x36, + 0x36, 0x2c, 0x30, 0x2e, 0x35, 0x35, 0x36, 0x32, + 0x31, 0x20, 0x30, 0x2e, 0x33, 0x34, 0x30, 0x39, + 0x30, 0x32, 0x2c, 0x30, 0x2e, 0x37, 0x34, 0x39, + 0x39, 0x39, 0x20, 0x6c, 0x20, 0x35, 0x2e, 0x36, + 0x39, 0x33, 0x30, 0x36, 0x31, 0x2c, 0x35, 0x2e, + 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x35, 0x2e, + 0x36, 0x35, 0x38, 0x39, 0x37, 0x2c, 0x2d, 0x35, + 0x2e, 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x32, 0x39, + 0x2c, 0x2d, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x33, + 0x32, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, 0x38, + 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x34, 0x39, 0x34, + 0x37, 0x33, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x37, 0x38, + 0x34, 0x31, 0x33, 0x20, 0x6c, 0x20, 0x30, 0x2c, + 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, 0x39, + 0x20, 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, + 0x38, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x2d, 0x30, + 0x2e, 0x32, 0x38, 0x39, 0x34, 0x31, 0x2c, 0x30, + 0x20, 0x2d, 0x30, 0x2e, 0x35, 0x37, 0x38, 0x38, + 0x31, 0x2c, 0x30, 0x2e, 0x31, 0x30, 0x31, 0x35, + 0x36, 0x20, 0x2d, 0x30, 0x2e, 0x37, 0x38, 0x34, + 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x34, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x32, 0x2c, 0x34, 0x2e, + 0x31, 0x35, 0x39, 0x30, 0x31, 0x20, 0x2d, 0x34, + 0x2e, 0x31, 0x32, 0x34, 0x39, 0x31, 0x33, 0x2c, + 0x2d, 0x34, 0x2e, 0x31, 0x35, 0x39, 0x30, 0x31, + 0x20, 0x63, 0x20, 0x2d, 0x30, 0x2e, 0x32, 0x31, + 0x32, 0x33, 0x31, 0x39, 0x2c, 0x2d, 0x30, 0x2e, + 0x32, 0x32, 0x39, 0x38, 0x39, 0x20, 0x2d, 0x30, + 0x2e, 0x35, 0x31, 0x31, 0x38, 0x39, 0x38, 0x2c, + 0x2d, 0x30, 0x2e, 0x33, 0x33, 0x30, 0x37, 0x31, + 0x20, 0x2d, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x31, + 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x33, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x31, + 0x2e, 0x30, 0x39, 0x30, 0x38, 0x38, 0x36, 0x2c, + 0x30, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x37, 0x34, + 0x32, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x23, 0x62, 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, + 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x76, + 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, + 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, + 0x72, 0x65, 0x74, 0x63, 0x68, 0x3a, 0x6e, 0x6f, + 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x6d, + 0x65, 0x64, 0x69, 0x75, 0x6d, 0x3b, 0x6c, 0x69, + 0x6e, 0x65, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, + 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x27, 0x41, 0x6e, + 0x64, 0x61, 0x6c, 0x65, 0x20, 0x4d, 0x6f, 0x6e, + 0x6f, 0x27, 0x3b, 0x2d, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x2d, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, + 0x27, 0x41, 0x6e, 0x64, 0x61, 0x6c, 0x65, 0x20, + 0x4d, 0x6f, 0x6e, 0x6f, 0x27, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x69, 0x6e, 0x64, 0x65, 0x6e, + 0x74, 0x3a, 0x30, 0x3b, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3b, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x64, + 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x6c, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x2d, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x66, 0x6f, 0x72, 0x6d, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x6c, 0x74, 0x72, 0x3b, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2d, 0x70, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x3a, 0x74, 0x62, 0x3b, 0x77, 0x72, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x3a, 0x6c, 0x72, 0x2d, 0x74, 0x62, 0x3b, + 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6e, 0x63, + 0x68, 0x6f, 0x72, 0x3a, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, + 0x79, 0x3a, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x66, 0x6c, 0x6f, + 0x77, 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x3b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x3a, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x31, 0x30, + 0x30, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x7a, 0x65, + 0x72, 0x6f, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x37, 0x38, + 0x31, 0x32, 0x34, 0x39, 0x38, 0x38, 0x3b, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x72, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x65, 0x6e, 0x61, 0x62, 0x6c, + 0x65, 0x2d, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x6e, 0x65, 0x77, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x72, 0x65, 0x63, + 0x74, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x39, 0x39, 0x39, + 0x37, 0x34, 0x35, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x74, 0x33, 0x37, 0x34, + 0x34, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x30, 0x22, + 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x23, 0x62, + 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, 0x64, 0x69, + 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3a, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x3b, 0x6f, 0x76, 0x65, + 0x72, 0x66, 0x6c, 0x6f, 0x77, 0x3a, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x31, 0x30, 0x30, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x32, 0x3b, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x2d, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, + 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61, + 0x74, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x28, 0x2d, 0x31, 0x2c, + 0x31, 0x29, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x38, 0x31, + 0x37, 0x37, 0x31, 0x38, 0x22, 0x20, 0x78, 0x3d, + 0x22, 0x2d, 0x31, 0x30, 0x32, 0x2e, 0x33, 0x34, + 0x31, 0x30, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, + 0x37, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x37, 0x34, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x67, 0x3e, + 0x3c, 0x67, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x33, 0x37, 0x34, 0x36, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, + 0x22, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, 0x28, + 0x31, 0x2e, 0x33, 0x35, 0x39, 0x37, 0x35, 0x32, + 0x2c, 0x30, 0x2c, 0x30, 0x2c, 0x31, 0x2e, 0x33, + 0x35, 0x39, 0x37, 0x35, 0x32, 0x2c, 0x35, 0x39, + 0x33, 0x2e, 0x35, 0x38, 0x31, 0x36, 0x31, 0x2c, + 0x2d, 0x36, 0x36, 0x31, 0x2e, 0x32, 0x39, 0x35, + 0x30, 0x34, 0x29, 0x22, 0x3e, 0x3c, 0x70, 0x61, + 0x74, 0x68, 0x20, 0x64, 0x3d, 0x22, 0x6d, 0x20, + 0x39, 0x35, 0x2e, 0x32, 0x35, 0x30, 0x32, 0x35, + 0x37, 0x2c, 0x37, 0x31, 0x35, 0x2e, 0x31, 0x30, + 0x39, 0x33, 0x33, 0x20, 0x30, 0x2c, 0x31, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x39, 0x20, 0x63, 0x20, + 0x2d, 0x31, 0x2e, 0x33, 0x31, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x31, 0x31, 0x33, 0x20, + 0x2d, 0x35, 0x2e, 0x30, 0x32, 0x65, 0x2d, 0x34, + 0x2c, 0x30, 0x2e, 0x30, 0x32, 0x32, 0x37, 0x20, + 0x30, 0x2c, 0x30, 0x2e, 0x30, 0x33, 0x34, 0x31, + 0x20, 0x30, 0x2e, 0x30, 0x31, 0x32, 0x32, 0x32, + 0x2c, 0x30, 0x2e, 0x32, 0x37, 0x38, 0x31, 0x32, + 0x20, 0x30, 0x2e, 0x31, 0x34, 0x30, 0x32, 0x36, + 0x36, 0x2c, 0x30, 0x2e, 0x35, 0x35, 0x36, 0x32, + 0x31, 0x20, 0x30, 0x2e, 0x33, 0x34, 0x30, 0x39, + 0x30, 0x32, 0x2c, 0x30, 0x2e, 0x37, 0x34, 0x39, + 0x39, 0x39, 0x20, 0x6c, 0x20, 0x35, 0x2e, 0x36, + 0x39, 0x33, 0x30, 0x36, 0x31, 0x2c, 0x35, 0x2e, + 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x35, 0x2e, + 0x36, 0x35, 0x38, 0x39, 0x37, 0x2c, 0x2d, 0x35, + 0x2e, 0x37, 0x36, 0x31, 0x32, 0x34, 0x20, 0x63, + 0x20, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x32, 0x39, + 0x2c, 0x2d, 0x30, 0x2e, 0x32, 0x30, 0x35, 0x33, + 0x32, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, 0x38, + 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x34, 0x39, 0x34, + 0x37, 0x33, 0x20, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x2c, 0x2d, 0x30, 0x2e, 0x37, 0x38, + 0x34, 0x31, 0x33, 0x20, 0x6c, 0x20, 0x30, 0x2c, + 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, 0x39, + 0x20, 0x2d, 0x31, 0x2e, 0x30, 0x39, 0x30, 0x38, + 0x38, 0x2c, 0x30, 0x20, 0x63, 0x20, 0x2d, 0x30, + 0x2e, 0x32, 0x38, 0x39, 0x34, 0x31, 0x2c, 0x30, + 0x20, 0x2d, 0x30, 0x2e, 0x35, 0x37, 0x38, 0x38, + 0x31, 0x2c, 0x30, 0x2e, 0x31, 0x30, 0x31, 0x35, + 0x36, 0x20, 0x2d, 0x30, 0x2e, 0x37, 0x38, 0x34, + 0x30, 0x38, 0x2c, 0x30, 0x2e, 0x33, 0x30, 0x36, + 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x34, 0x2e, + 0x30, 0x39, 0x30, 0x38, 0x32, 0x2c, 0x34, 0x2e, + 0x31, 0x35, 0x39, 0x30, 0x31, 0x20, 0x2d, 0x34, + 0x2e, 0x31, 0x32, 0x34, 0x39, 0x31, 0x33, 0x2c, + 0x2d, 0x34, 0x2e, 0x31, 0x35, 0x39, 0x30, 0x31, + 0x20, 0x63, 0x20, 0x2d, 0x30, 0x2e, 0x32, 0x31, + 0x32, 0x33, 0x31, 0x39, 0x2c, 0x2d, 0x30, 0x2e, + 0x32, 0x32, 0x39, 0x38, 0x39, 0x20, 0x2d, 0x30, + 0x2e, 0x35, 0x31, 0x31, 0x38, 0x39, 0x38, 0x2c, + 0x2d, 0x30, 0x2e, 0x33, 0x33, 0x30, 0x37, 0x31, + 0x20, 0x2d, 0x30, 0x2e, 0x38, 0x31, 0x38, 0x31, + 0x36, 0x34, 0x2c, 0x2d, 0x30, 0x2e, 0x33, 0x30, + 0x36, 0x38, 0x31, 0x20, 0x6c, 0x20, 0x2d, 0x31, + 0x2e, 0x30, 0x39, 0x30, 0x38, 0x38, 0x36, 0x2c, + 0x30, 0x20, 0x7a, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x61, 0x74, 0x68, 0x33, 0x37, 0x34, + 0x38, 0x22, 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x23, 0x62, 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, + 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x76, + 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, + 0x6e, 0x74, 0x2d, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x73, 0x74, + 0x72, 0x65, 0x74, 0x63, 0x68, 0x3a, 0x6e, 0x6f, + 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x6d, + 0x65, 0x64, 0x69, 0x75, 0x6d, 0x3b, 0x6c, 0x69, + 0x6e, 0x65, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x3b, 0x66, 0x6f, 0x6e, 0x74, 0x2d, 0x66, 0x61, + 0x6d, 0x69, 0x6c, 0x79, 0x3a, 0x27, 0x41, 0x6e, + 0x64, 0x61, 0x6c, 0x65, 0x20, 0x4d, 0x6f, 0x6e, + 0x6f, 0x27, 0x3b, 0x2d, 0x69, 0x6e, 0x6b, 0x73, + 0x63, 0x61, 0x70, 0x65, 0x2d, 0x66, 0x6f, 0x6e, + 0x74, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, + 0x27, 0x41, 0x6e, 0x64, 0x61, 0x6c, 0x65, 0x20, + 0x4d, 0x6f, 0x6e, 0x6f, 0x27, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x69, 0x6e, 0x64, 0x65, 0x6e, + 0x74, 0x3a, 0x30, 0x3b, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x3a, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3b, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x64, 0x65, 0x63, 0x6f, 0x72, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x64, + 0x65, 0x63, 0x6f, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2d, 0x6c, 0x69, 0x6e, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x6c, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x2d, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x3a, 0x6e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x3b, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x3a, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3b, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x66, 0x6f, 0x72, 0x6d, 0x3a, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x6c, 0x74, 0x72, 0x3b, + 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x2d, 0x70, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x3a, 0x74, 0x62, 0x3b, 0x77, 0x72, 0x69, + 0x74, 0x69, 0x6e, 0x67, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x3a, 0x6c, 0x72, 0x2d, 0x74, 0x62, 0x3b, + 0x74, 0x65, 0x78, 0x74, 0x2d, 0x61, 0x6e, 0x63, + 0x68, 0x6f, 0x72, 0x3a, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3b, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, + 0x79, 0x3a, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x66, 0x6c, 0x6f, + 0x77, 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x3b, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x3a, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x3a, 0x23, 0x30, 0x30, 0x30, 0x31, 0x30, + 0x30, 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x6f, + 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x3a, 0x31, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x2d, 0x72, 0x75, + 0x6c, 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x7a, 0x65, + 0x72, 0x6f, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x31, 0x2e, 0x37, 0x38, + 0x31, 0x32, 0x34, 0x39, 0x38, 0x38, 0x3b, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x72, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x65, 0x6e, 0x61, 0x62, 0x6c, + 0x65, 0x2d, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x6e, 0x65, 0x77, + 0x22, 0x20, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, + 0x70, 0x65, 0x3a, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x6f, 0x72, 0x2d, 0x63, 0x75, 0x72, + 0x76, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3d, 0x22, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x72, 0x65, 0x63, + 0x74, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x3d, 0x22, 0x31, 0x31, 0x2e, 0x39, 0x39, 0x39, + 0x37, 0x34, 0x35, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x74, 0x33, 0x37, 0x35, + 0x30, 0x22, 0x20, 0x72, 0x78, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x72, 0x79, 0x3d, 0x22, 0x30, 0x22, + 0x20, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3d, 0x22, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x23, 0x62, + 0x65, 0x62, 0x65, 0x62, 0x65, 0x3b, 0x64, 0x69, + 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3a, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x3b, 0x6f, 0x76, 0x65, + 0x72, 0x66, 0x6c, 0x6f, 0x77, 0x3a, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x3b, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x3a, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x3b, 0x66, 0x69, 0x6c, 0x6c, 0x3a, 0x23, 0x30, + 0x30, 0x30, 0x31, 0x30, 0x30, 0x3b, 0x66, 0x69, + 0x6c, 0x6c, 0x2d, 0x6f, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x3a, 0x31, 0x3b, 0x66, 0x69, 0x6c, + 0x6c, 0x2d, 0x72, 0x75, 0x6c, 0x65, 0x3a, 0x6e, + 0x6f, 0x6e, 0x7a, 0x65, 0x72, 0x6f, 0x3b, 0x73, + 0x74, 0x72, 0x6f, 0x6b, 0x65, 0x3a, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x73, 0x74, 0x72, 0x6f, 0x6b, + 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, + 0x32, 0x3b, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, + 0x3a, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x2d, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, + 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61, + 0x74, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x28, 0x2d, 0x31, 0x2c, + 0x31, 0x29, 0x22, 0x20, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x3d, 0x22, 0x32, 0x2e, 0x31, 0x38, 0x31, + 0x37, 0x37, 0x31, 0x38, 0x22, 0x20, 0x78, 0x3d, + 0x22, 0x2d, 0x31, 0x30, 0x32, 0x2e, 0x33, 0x34, + 0x31, 0x30, 0x32, 0x22, 0x20, 0x79, 0x3d, 0x22, + 0x37, 0x30, 0x38, 0x2e, 0x39, 0x32, 0x37, 0x34, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x67, 0x3e, + 0x3c, 0x2f, 0x67, 0x3e, 0x3c, 0x2f, 0x67, 0x3e, + 0x3c, 0x2f, 0x73, 0x76, 0x67, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x73, + 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x2d, + 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x2e, 0x75, + 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x70, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, - 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, - 0x77, 0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, + 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, + 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x33, 0x2e, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x43, 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, + 0x22, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, - 0x22, 0x3e, 0x32, 0x35, 0x30, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, - 0x31, 0x30, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x32, - 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, - 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x32, 0x30, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, - 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x2d, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x72, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, + 0x34, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x30, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x20, 0x53, - 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x2d, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x67, + 0x74, 0x6b, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x5f, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x6f, + 0x6e, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x22, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3d, 0x22, 0x43, 0x63, 0x4b, 0x65, 0x79, 0x62, + 0x6f, 0x61, 0x72, 0x64, 0x53, 0x68, 0x6f, 0x72, + 0x74, 0x63, 0x75, 0x74, 0x45, 0x64, 0x69, 0x74, + 0x6f, 0x72, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, + 0x70, 0x65, 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, - 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x2d, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, - 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x43, 0x61, 0x6e, 0x63, - 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x74, 0x61, 0x63, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, + 0x61, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -168,62 +2172,27 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x65, - 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x2d, 0x73, 0x68, 0x6f, 0x72, - 0x74, 0x63, 0x75, 0x74, 0x2d, 0x6f, 0x6b, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x41, 0x64, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -232,73 +2201,93 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x65, - 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, + 0x61, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, - 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, - 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, + 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x74, 0x61, 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, + 0x72, 0x64, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x63, + 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, - 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x63, 0x72, + 0x6f, 0x73, 0x73, 0x66, 0x61, 0x64, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -315,64 +2304,978 @@ 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x3e, 0x2f, + 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x6e, 0x6f, 0x6d, + 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x2f, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, + 0x64, 0x2f, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2d, + 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, + 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x2e, 0x73, 0x76, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, + 0x65, 0x73, 0x73, 0x20, 0x45, 0x73, 0x63, 0x20, + 0x74, 0x6f, 0x20, 0x63, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x63, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x2d, 0x73, 0x68, 0x6f, + 0x72, 0x74, 0x63, 0x75, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x6c, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x73, 0x61, + 0x62, 0x6c, 0x65, 0x64, 0x2d, 0x74, 0x65, 0x78, + 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x44, 0x69, + 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, + 0x65, 0x73, 0x65, 0x74, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x6c, 0x69, 0x65, 0x66, 0x22, 0x3e, 0x6e, + 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x65, 0x64, 0x69, 0x74, 0x2d, 0x63, + 0x6c, 0x65, 0x61, 0x72, 0x2d, 0x73, 0x79, 0x6d, + 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, + 0x22, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x69, + 0x74, 0x65, 0x6d, 0x5f, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, + 0x43, 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, + 0x6c, 0x69, 0x63, 0x74, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, + 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, + 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x32, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x6d, 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x65, 0x64, 0x69, 0x74, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x6f, + 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, + 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, + 0x77, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x6c, + 0x69, 0x63, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, + 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x31, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, 0x68, + 0x61, 0x72, 0x73, 0x22, 0x3e, 0x32, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, + 0x65, 0x22, 0x20, 0x62, 0x69, 0x6e, 0x64, 0x2d, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3d, 0x22, + 0x65, 0x64, 0x69, 0x74, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x62, 0x69, 0x6e, + 0x64, 0x2d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x22, 0x20, 0x62, 0x69, 0x6e, 0x64, + 0x2d, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x3d, 0x22, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x7c, + 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x2d, 0x62, + 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x6f, 0x74, 0x69, 0x66, 0x79, 0x3a, 0x3a, 0x74, + 0x65, 0x78, 0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 0x61, + 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, + 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x53, + 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x45, + 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, 0x20, 0x73, + 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, + 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, + 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, 0x62, 0x69, + 0x6e, 0x64, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x3d, 0x22, 0x65, 0x64, 0x69, 0x74, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, 0x62, + 0x69, 0x6e, 0x64, 0x2d, 0x66, 0x6c, 0x61, 0x67, + 0x73, 0x3d, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x7c, 0x69, 0x6e, 0x76, 0x65, 0x72, + 0x74, 0x2d, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, + 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, + 0x3a, 0x3a, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, + 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, + 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x63, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x5f, 0x63, + 0x62, 0x22, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3d, 0x22, 0x43, 0x63, 0x4b, 0x65, 0x79, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x53, 0x68, 0x6f, + 0x72, 0x74, 0x63, 0x75, 0x74, 0x45, 0x64, 0x69, + 0x74, 0x6f, 0x72, 0x22, 0x20, 0x73, 0x77, 0x61, + 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x67, + 0x67, 0x6c, 0x65, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x64, 0x69, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x64, + 0x69, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x3a, 0x3a, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x65, + 0x64, 0x69, 0x74, 0x5f, 0x63, 0x75, 0x73, 0x74, + 0x6f, 0x6d, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, + 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, + 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, + 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x74, + 0x61, 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, + 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, + 0x5f, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x68, + 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, 0x74, 0x20, + 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, + 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, + 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x3d, 0x22, 0x63, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, + 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, + 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x53, + 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x45, + 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, 0x20, 0x73, + 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x73, + 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x68, 0x6f, 0x72, + 0x74, 0x63, 0x75, 0x74, 0x5f, 0x61, 0x63, 0x63, + 0x65, 0x6c, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x73, + 0x61, 0x62, 0x6c, 0x65, 0x64, 0x2d, 0x74, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, + 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, + 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, + 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x3d, 0x22, 0x65, 0x64, 0x69, + 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x20, 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x66, 0x6c, + 0x61, 0x67, 0x73, 0x3d, 0x22, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x7c, 0x69, 0x6e, 0x76, + 0x65, 0x72, 0x74, 0x2d, 0x62, 0x6f, 0x6f, 0x6c, + 0x65, 0x61, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x73, + 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, + 0x43, 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x73, + 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x63, + 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -385,51 +3288,89 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x4e, 0x61, 0x6d, 0x65, 0x3a, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x63, - 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2d, 0x73, 0x68, - 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x2d, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, 0x74, + 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, + 0x65, 0x77, 0x20, 0x73, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x34, 0x22, 0x3e, 0x3c, 0x70, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x22, 0x3e, 0x2f, 0x6f, 0x72, 0x67, + 0x2f, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x6b, 0x65, + 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2f, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6b, 0x65, 0x79, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2d, 0x73, 0x68, + 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x2e, 0x73, + 0x76, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -442,104 +3383,204 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x50, 0x72, 0x65, 0x73, 0x73, + 0x20, 0x45, 0x73, 0x63, 0x20, 0x74, 0x6f, 0x20, + 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x2e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x63, 0x68, 0x61, 0x6e, 0x67, + 0x65, 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, + 0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, - 0x5f, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x3a, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, - 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x5f, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, + 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, + 0x22, 0x43, 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, + 0x61, 0x72, 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, + 0x63, 0x75, 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, + 0x72, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, + 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, + 0x64, 0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x64, + 0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, + 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x53, + 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x45, + 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, 0x20, 0x73, + 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, + 0x74, 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, - 0x75, 0x74, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x2d, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, - 0x3e, 0xe2, 0x80, 0xa2, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, + 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, - 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, - 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -552,105 +3593,52 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, - 0x72, 0x22, 0x3e, 0xe2, 0x80, 0xa2, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, + 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x72, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, + 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, + 0x63, 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, + 0x64, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, + 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x2d, - 0x36, 0x22, 0x3e, 0x63, 0x75, 0x73, 0x74, 0x6f, - 0x6d, 0x2d, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, - 0x75, 0x74, 0x2d, 0x63, 0x61, 0x6e, 0x63, 0x65, - 0x6c, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, - 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, - 0x22, 0x2d, 0x35, 0x22, 0x3e, 0x63, 0x75, 0x73, - 0x74, 0x6f, 0x6d, 0x2d, 0x73, 0x68, 0x6f, 0x72, - 0x74, 0x63, 0x75, 0x74, 0x2d, 0x6f, 0x6b, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 0x2f, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, - 0x74, 0x63, 0x75, 0x74, 0x73, 0x5f, 0x70, 0x61, - 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x65, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -658,197 +3646,251 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, + 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, + 0x65, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, + 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, + 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, + 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, + 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x22, 0x20, + 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, + 0x73, 0x74, 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x64, 0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x73, 0x65, 0x74, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2d, 0x6b, 0x65, + 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2d, 0x70, + 0x61, 0x6e, 0x65, 0x6c, 0x2e, 0x75, 0x69, 0x00, + 0x26, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, - 0x75, 0x74, 0x73, 0x5f, 0x76, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, - 0x72, 0x74, 0x63, 0x75, 0x74, 0x73, 0x5f, 0x67, - 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, - 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x5f, 0x73, 0x77, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, + 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, + 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, + 0x77, 0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, + 0x22, 0x3e, 0x32, 0x35, 0x30, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, + 0x31, 0x30, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, + 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x32, + 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, - 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, - 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, - 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, - 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, + 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x32, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x73, 0x5f, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x74, 0x65, 0x6d, + 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x43, 0x63, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x50, + 0x61, 0x6e, 0x65, 0x6c, 0x22, 0x20, 0x70, 0x61, + 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x43, 0x63, + 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6b, + 0x65, 0x79, 0x2d, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, + 0x22, 0x67, 0x74, 0x6b, 0x5f, 0x73, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x5f, 0x62, 0x61, 0x72, 0x5f, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x5f, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x5f, 0x62, 0x61, 0x72, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, - 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, - 0x65, 0x76, 0x69, 0x65, 0x77, 0x2d, 0x73, 0x65, - 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x31, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, - 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x5f, 0x73, 0x77, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, - 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, - 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, - 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x5f, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, - 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x47, 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x5f, 0x6d, 0x6f, 0x64, + 0x65, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, + 0x64, 0x22, 0x20, 0x62, 0x69, 0x6e, 0x64, 0x2d, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3d, 0x22, + 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x62, + 0x69, 0x6e, 0x64, 0x2d, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, 0x62, 0x69, + 0x6e, 0x64, 0x2d, 0x66, 0x6c, 0x61, 0x67, 0x73, + 0x3d, 0x22, 0x62, 0x69, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, + 0x63, 0x68, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, + 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, + 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, + 0x3a, 0x3a, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, + 0x22, 0x67, 0x74, 0x6b, 0x5f, 0x6c, 0x69, 0x73, + 0x74, 0x5f, 0x62, 0x6f, 0x78, 0x5f, 0x69, 0x6e, + 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, + 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, + 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, + 0x22, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -860,266 +3902,271 @@ 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x75, 0x6c, 0x65, 0x73, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, + 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x22, 0x3e, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, - 0x65, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, - 0x77, 0x2d, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x32, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x70, 0x61, 0x67, + 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x74, 0x75, + 0x72, 0x61, 0x6c, 0x5f, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x72, 0x6f, 0x70, 0x61, 0x67, + 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x74, 0x75, + 0x72, 0x61, 0x6c, 0x5f, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, - 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, - 0x63, 0x75, 0x74, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, - 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x33, + 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, - 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x2d, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x22, 0x3e, 0x69, 0x63, - 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, - 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x61, 0x64, 0x64, 0x2d, - 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, - 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, - 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, - 0x69, 0x73, 0x74, 0x2d, 0x61, 0x64, 0x64, 0x2d, - 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, - 0x20, 0x53, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, - 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, - 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, - 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x3e, 0x32, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x2d, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x68, 0x6f, + 0x72, 0x74, 0x63, 0x75, 0x74, 0x5f, 0x72, 0x6f, + 0x77, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x64, 0x22, 0x20, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x50, + 0x61, 0x6e, 0x65, 0x6c, 0x22, 0x20, 0x73, 0x77, + 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, + 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x64, 0x64, + 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, 0x74, 0x2d, - 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x2d, 0x73, - 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x6d, 0x6f, - 0x76, 0x65, 0x20, 0x53, 0x68, 0x6f, 0x72, 0x74, - 0x63, 0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, - 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, + 0x22, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, + 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x61, 0x64, 0x64, + 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, + 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x2d, 0x73, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x2d, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 0x70, 0x74, + 0x79, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, - 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -1131,108 +4178,106 @@ 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x54, 0x6f, 0x20, 0x65, - 0x64, 0x69, 0x74, 0x20, 0x61, 0x20, 0x73, 0x68, - 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x2c, 0x20, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x72, 0x6f, 0x77, 0x20, 0x61, 0x6e, - 0x64, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x20, 0x64, - 0x6f, 0x77, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x6e, 0x65, 0x77, 0x20, 0x6b, 0x65, 0x79, 0x73, - 0x20, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x65, 0x73, - 0x73, 0x20, 0x42, 0x61, 0x63, 0x6b, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x63, - 0x6c, 0x65, 0x61, 0x72, 0x2e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, + 0x78, 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x3e, 0x37, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x65, 0x64, 0x69, 0x74, 0x2d, 0x66, + 0x69, 0x6e, 0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, - 0x3e, 0x66, 0x69, 0x6c, 0x6c, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, - 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x37, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x6f, 0x20, + 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, + 0x20, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, + 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, 0x34, 0x34, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2f, - 0x03, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, - 0x2f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x79, 0x20, 0x61, 0x20, 0x64, 0x69, 0x66, 0x66, + 0x65, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, + 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6f, 0x72, + 0x67, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2f, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x6b, 0x65, 0x79, 0x62, + 0x6f, 0x61, 0x72, 0x64, 0x2f, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { cc_keyboard_resource_data.data, sizeof (cc_keyboard_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-shortcut-editor.c gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-shortcut-editor.c --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-shortcut-editor.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-shortcut-editor.c 2016-10-10 16:17:24.000000000 +0000 @@ -0,0 +1,952 @@ +/* cc-keyboard-shortcut-editor.h + * + * Copyright (C) 2016 Endless, Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: Georges Basile Stavracas Neto + */ + +#include +#include + +#include "cc-keyboard-shortcut-editor.h" +#include "keyboard-shortcuts.h" + +struct _CcKeyboardShortcutEditor +{ + GtkDialog parent; + + GtkWidget *add_button; + GtkWidget *cancel_button; + GtkWidget *command_entry; + GtkWidget *custom_shortcut_accel_label; + GtkWidget *custom_shortcut_stack; + GtkWidget *edit_button; + GtkWidget *headerbar; + GtkWidget *name_entry; + GtkWidget *new_shortcut_conflict_label; + GtkWidget *remove_button; + GtkWidget *replace_button; + GtkWidget *reset_button; + GtkWidget *set_button; + GtkWidget *shortcut_accel_label; + GtkWidget *shortcut_conflict_label; + GtkWidget *standard_shortcut_stack; + GtkWidget *stack; + GtkWidget *top_info_label; + + CcShortcutEditorMode mode; + + CcKeyboardManager *manager; + CcKeyboardItem *item; + GBinding *reset_item_binding; + + CcKeyboardItem *collision_item; + + /* Custom shortcuts */ + GdkDevice *grab_pointer; + guint grab_idle_id; + + guint custom_keycode; + guint custom_keyval; + GdkModifierType custom_mask; + gboolean custom_is_modifier; + gboolean edited : 1; +}; + +static void command_entry_changed_cb (CcKeyboardShortcutEditor *self); +static void name_entry_changed_cb (CcKeyboardShortcutEditor *self); + +G_DEFINE_TYPE (CcKeyboardShortcutEditor, cc_keyboard_shortcut_editor, GTK_TYPE_DIALOG) + +enum +{ + PROP_0, + PROP_KEYBOARD_ITEM, + PROP_MANAGER, + N_PROPS +}; + +typedef enum +{ + HEADER_MODE_NONE, + HEADER_MODE_ADD, + HEADER_MODE_SET, + HEADER_MODE_REPLACE, + HEADER_MODE_CUSTOM_CANCEL, + HEADER_MODE_CUSTOM_EDIT +} HeaderMode; + +static GParamSpec *properties [N_PROPS] = { NULL, }; + +static void +apply_custom_item_fields (CcKeyboardShortcutEditor *self, + CcKeyboardItem *item) +{ + /* Only setup the binding when it was actually edited */ + if (self->edited) + { + gchar *binding; + + item->keycode = self->custom_keycode; + item->keyval = self->custom_keyval; + item->mask = self->custom_mask; + + if (item->keycode == 0 && item->keyval == 0 && item->mask == 0) + binding = g_strdup (""); + else + binding = gtk_accelerator_name_with_keycode (NULL, + item->keyval, + item->keycode, + item->mask); + + g_object_set (G_OBJECT (item), "binding", binding, NULL); + + g_free (binding); + } + + /* Set the keyboard shortcut name and command for custom entries */ + if (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + { + g_settings_set_string (item->settings, "name", gtk_entry_get_text (GTK_ENTRY (self->name_entry))); + g_settings_set_string (item->settings, "command", gtk_entry_get_text (GTK_ENTRY (self->command_entry))); + } +} + +static void +clear_custom_entries (CcKeyboardShortcutEditor *self) +{ + g_signal_handlers_block_by_func (self->command_entry, command_entry_changed_cb, self); + g_signal_handlers_block_by_func (self->name_entry, name_entry_changed_cb, self); + + gtk_entry_set_text (GTK_ENTRY (self->name_entry), ""); + gtk_entry_set_text (GTK_ENTRY (self->command_entry), ""); + + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->custom_shortcut_accel_label), ""); + gtk_label_set_label (GTK_LABEL (self->new_shortcut_conflict_label), ""); + gtk_label_set_label (GTK_LABEL (self->shortcut_conflict_label), ""); + + self->custom_keycode = 0; + self->custom_keyval = 0; + self->custom_mask = 0; + self->custom_is_modifier = TRUE; + self->edited = FALSE; + + self->collision_item = NULL; + + g_signal_handlers_unblock_by_func (self->command_entry, command_entry_changed_cb, self); + g_signal_handlers_unblock_by_func (self->name_entry, name_entry_changed_cb, self); +} + +static void +cancel_editing (CcKeyboardShortcutEditor *self) +{ + cc_keyboard_shortcut_editor_set_item (self, NULL); + clear_custom_entries (self); + + gtk_widget_hide (GTK_WIDGET (self)); +} + +static gboolean +is_custom_shortcut (CcKeyboardShortcutEditor *self) +{ + return !g_str_equal (gtk_stack_get_visible_child_name (GTK_STACK (self->stack)), "edit"); +} + +static void +grab_seat (CcKeyboardShortcutEditor *self) +{ + GdkGrabStatus status; + GdkDevice *pointer; + GdkDevice *device; + GdkWindow *window; + GList *seats; + + window = gtk_widget_get_window (GTK_WIDGET (self)); + if (!window) + return; + + seats = gdk_display_list_seats (gdk_window_get_display (window)); + if (!seats) + return; + + device = gdk_seat_get_keyboard (seats->data); + g_list_free (seats); + + if (!device) { + g_debug ("Keyboard grab unsuccessful, no keyboard in seat"); + return; + } + + if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) + pointer = gdk_device_get_associated_device (device); + else + pointer = device; + + status = gdk_seat_grab (gdk_device_get_seat (pointer), + window, + GDK_SEAT_CAPABILITY_KEYBOARD, + FALSE, + NULL, + NULL, + NULL, + NULL); + + if (status != GDK_GRAB_SUCCESS) + return; + + self->grab_pointer = pointer; + + gtk_grab_add (GTK_WIDGET (self)); +} + +static void +release_grab (CcKeyboardShortcutEditor *self) +{ + if (self->grab_pointer) + { + gdk_seat_ungrab (gdk_device_get_seat (self->grab_pointer)); + self->grab_pointer = NULL; + + gtk_grab_remove (GTK_WIDGET (self)); + } +} + +static void +update_shortcut (CcKeyboardShortcutEditor *self) +{ + if (!self->item) + return; + + /* Setup the binding */ + apply_custom_item_fields (self, self->item); + + /* Eventually disable the conflict shortcut */ + if (self->collision_item) + cc_keyboard_manager_disable_shortcut (self->manager, self->collision_item); + + /* Cleanup whatever was set before */ + clear_custom_entries (self); + + cc_keyboard_shortcut_editor_set_item (self, NULL); +} + +static GtkShortcutLabel* +get_current_shortcut_label (CcKeyboardShortcutEditor *self) +{ + if (is_custom_shortcut (self)) + return GTK_SHORTCUT_LABEL (self->custom_shortcut_accel_label); + + return GTK_SHORTCUT_LABEL (self->shortcut_accel_label); +} + +static void +set_header_mode (CcKeyboardShortcutEditor *self, + HeaderMode mode) +{ + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->headerbar), mode == HEADER_MODE_CUSTOM_EDIT); + + gtk_widget_set_visible (self->add_button, mode == HEADER_MODE_ADD); + gtk_widget_set_visible (self->cancel_button, mode != HEADER_MODE_NONE && + mode != HEADER_MODE_CUSTOM_EDIT); + gtk_widget_set_visible (self->replace_button, mode == HEADER_MODE_REPLACE); + gtk_widget_set_visible (self->set_button, mode == HEADER_MODE_SET); +} + +static void +setup_custom_shortcut (CcKeyboardShortcutEditor *self) +{ + GtkShortcutLabel *shortcut_label; + CcKeyboardItem *collision_item; + HeaderMode mode; + gboolean is_custom; + gboolean valid, accel_valid; + gchar *accel; + + is_custom = is_custom_shortcut (self); + accel_valid = is_valid_binding (self->custom_keyval, self->custom_mask, self->custom_keycode) && + is_valid_accel (self->custom_keyval, self->custom_mask) && + !self->custom_is_modifier; + if (is_empty_binding (self->custom_keyval, self->custom_mask, self->custom_keycode)) + accel_valid = TRUE; + valid = accel_valid; + + /* Additional checks for custom shortcuts */ + if (is_custom) + { + if (accel_valid) + { + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "custom"); + gtk_stack_set_visible_child_name (GTK_STACK (self->custom_shortcut_stack), "label"); + gtk_widget_show (self->edit_button); + } + + valid = accel_valid && + gtk_entry_get_text_length (GTK_ENTRY (self->name_entry)) > 0 && + gtk_entry_get_text_length (GTK_ENTRY (self->command_entry)) > 0; + } + + gtk_widget_set_sensitive (self->replace_button, valid); + gtk_widget_set_sensitive (self->add_button, valid); + if (valid) + set_header_mode (self, HEADER_MODE_ADD); + else + set_header_mode (self, is_custom ? HEADER_MODE_CUSTOM_CANCEL : HEADER_MODE_NONE); + + /* Nothing else to do if the shortcut is invalid */ + if (!accel_valid) + return; + + /* Valid shortcut, show it in the standard page */ + if (!is_custom) + gtk_stack_set_visible_child_name (GTK_STACK (self->standard_shortcut_stack), "main"); + + shortcut_label = get_current_shortcut_label (self); + + collision_item = cc_keyboard_manager_get_collision (self->manager, + self->item, + self->custom_keyval, + self->custom_mask, + self->custom_keycode); + + accel = gtk_accelerator_name (self->custom_keyval, self->custom_mask); + + + /* Setup the accelerator label */ + gtk_shortcut_label_set_accelerator (shortcut_label, accel); + + /* + * When the user finishes typing the new shortcut, it gets immediately + * applied and the toggle button gets inactive. + */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), FALSE); + + self->edited = TRUE; + + release_grab (self); + + /* + * Oops! Looks like the accelerator is already being used, so we + * must warn the user and let it be very clear that adding this + * shortcut will disable the other. + */ + gtk_widget_set_visible (self->new_shortcut_conflict_label, collision_item != NULL); + + if (collision_item) + { + GtkWidget *label; + gchar *friendly_accelerator; + gchar *collision_text; + + friendly_accelerator = convert_keysym_state_to_string (self->custom_keyval, + self->custom_mask, + self->custom_keycode); + + collision_text = g_strdup_printf (_("%s is already being used for %s. If you " + "replace it, %s will be disabled"), + friendly_accelerator, + collision_item->description, + collision_item->description); + + label = is_custom_shortcut (self) ? self->new_shortcut_conflict_label : self->shortcut_conflict_label; + + gtk_label_set_markup (GTK_LABEL (label), collision_text); + + g_free (friendly_accelerator); + g_free (collision_text); + } + + /* + * When there is a collision between the current shortcut and another shortcut, + * and we're editing an existing shortcut (rather than creating a new one), setup + * the headerbar to display "Cancel" and "Replace". Otherwise, make sure to set + * only the close button again. + */ + if (collision_item) + { + mode = HEADER_MODE_REPLACE; + } + else + { + if (self->mode == CC_SHORTCUT_EDITOR_EDIT) + mode = is_custom ? HEADER_MODE_CUSTOM_EDIT : HEADER_MODE_SET; + else + mode = is_custom ? HEADER_MODE_ADD : HEADER_MODE_SET; + } + + set_header_mode (self, mode); + + self->collision_item = collision_item; + + g_free (accel); +} + +static void +add_button_clicked_cb (CcKeyboardShortcutEditor *self) +{ + CcKeyboardItem *item; + + item = cc_keyboard_manager_create_custom_shortcut (self->manager); + + /* Apply the custom shortcut setup at the new item */ + apply_custom_item_fields (self, item); + + /* Eventually disable the conflict shortcut */ + if (self->collision_item) + cc_keyboard_manager_disable_shortcut (self->manager, self->collision_item); + + /* Cleanup everything once we're done */ + clear_custom_entries (self); + + cc_keyboard_manager_add_custom_shortcut (self->manager, item); + + gtk_widget_hide (GTK_WIDGET (self)); +} + +static void +cancel_button_clicked_cb (GtkWidget *button, + CcKeyboardShortcutEditor *self) +{ + cancel_editing (self); +} + +static void +change_custom_shortcut_button_clicked_cb (CcKeyboardShortcutEditor *self) +{ + /* + * Setting the edit button to active performs a grab and let the + * shortcut editor dialog know we're actually editing a shortcut. + */ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), TRUE); + + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "change-shortcut"); + set_header_mode (self, HEADER_MODE_NONE); +} + +static void +command_entry_changed_cb (CcKeyboardShortcutEditor *self) +{ + setup_custom_shortcut (self); +} + +static void +edit_custom_shortcut_button_toggled_cb (CcKeyboardShortcutEditor *self, + GParamSpec *pspec, + GtkToggleButton *button) +{ + if (gtk_toggle_button_get_active (button)) + grab_seat (self); + else + release_grab (self); +} + +static void +name_entry_changed_cb (CcKeyboardShortcutEditor *self) +{ + setup_custom_shortcut (self); +} + +static void +remove_button_clicked_cb (CcKeyboardShortcutEditor *self) +{ + gtk_widget_hide (GTK_WIDGET (self)); + + cc_keyboard_manager_remove_custom_shortcut (self->manager, self->item); +} + +static void +replace_button_clicked_cb (CcKeyboardShortcutEditor *self) +{ + update_shortcut (self); + + gtk_widget_hide (GTK_WIDGET (self)); +} + +static void +reset_item_clicked_cb (CcKeyboardShortcutEditor *self) +{ + gchar *accel; + + /* Reset first, then update the shortcut */ + cc_keyboard_manager_reset_shortcut (self->manager, self->item); + + accel = gtk_accelerator_name (self->item->keyval, self->item->mask); + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->shortcut_accel_label), accel); + + g_free (accel); +} + +static void +set_button_clicked_cb (CcKeyboardShortcutEditor *self) +{ + update_shortcut (self); + gtk_widget_hide (GTK_WIDGET (self)); +} + +static void +setup_keyboard_item (CcKeyboardShortcutEditor *self, + CcKeyboardItem *item) +{ + gboolean is_custom; + gchar *accel; + gchar *text; + + if (!item) + return; + + is_custom = item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH; + accel = gtk_accelerator_name (item->keyval, item->mask); + + /* Headerbar */ + gtk_header_bar_set_title (GTK_HEADER_BAR (self->headerbar), + is_custom ? _("Set Custom Shortcut") : _("Set Shortcut")); + + set_header_mode (self, is_custom ? HEADER_MODE_CUSTOM_EDIT : HEADER_MODE_NONE); + + gtk_widget_hide (self->add_button); + gtk_widget_hide (self->cancel_button); + gtk_widget_hide (self->replace_button); + + /* Setup the top label */ + text = g_strdup_printf (_("Enter new shortcut to change %s."), item->description); + + gtk_label_set_markup (GTK_LABEL (self->top_info_label), text); + + /* Accelerator labels */ + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->shortcut_accel_label), accel); + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->custom_shortcut_accel_label), accel); + + g_clear_pointer (&self->reset_item_binding, g_binding_unbind); + self->reset_item_binding = g_object_bind_property (item, + "is-value-default", + self->reset_button, + "visible", + G_BINDING_DEFAULT | G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE); + + /* Setup the custom entries */ + if (is_custom) + { + g_signal_handlers_block_by_func (self->command_entry, command_entry_changed_cb, self); + g_signal_handlers_block_by_func (self->name_entry, name_entry_changed_cb, self); + + /* Name entry */ + gtk_entry_set_text (GTK_ENTRY (self->name_entry), item->description); + gtk_widget_set_sensitive (self->name_entry, item->desc_editable); + + /* Command entry */ + gtk_entry_set_text (GTK_ENTRY (self->command_entry), item->command); + gtk_widget_set_sensitive (self->command_entry, item->cmd_editable); + + gtk_widget_show (self->remove_button); + + g_signal_handlers_unblock_by_func (self->command_entry, command_entry_changed_cb, self); + g_signal_handlers_unblock_by_func (self->name_entry, name_entry_changed_cb, self); + } + + g_free (accel); + g_free (text); + + /* Show the apropriate view */ + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), is_custom ? "custom" : "edit"); + + if (!is_custom) + gtk_stack_set_visible_child_name (GTK_STACK (self->standard_shortcut_stack), "change-shortcut"); +} + +static void +cc_keyboard_shortcut_editor_finalize (GObject *object) +{ + CcKeyboardShortcutEditor *self = (CcKeyboardShortcutEditor *)object; + + g_clear_object (&self->item); + g_clear_object (&self->manager); + + g_clear_pointer (&self->reset_item_binding, g_binding_unbind); + + G_OBJECT_CLASS (cc_keyboard_shortcut_editor_parent_class)->finalize (object); +} + +static void +cc_keyboard_shortcut_editor_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (object); + + switch (prop_id) + { + case PROP_KEYBOARD_ITEM: + g_value_set_object (value, self->item); + break; + + case PROP_MANAGER: + g_value_set_object (value, self->manager); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static void +cc_keyboard_shortcut_editor_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (object); + + switch (prop_id) + { + case PROP_KEYBOARD_ITEM: + cc_keyboard_shortcut_editor_set_item (self, g_value_get_object (value)); + break; + + case PROP_MANAGER: + g_set_object (&self->manager, g_value_get_object (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static gboolean +cc_keyboard_shortcut_editor_key_press_event (GtkWidget *widget, + GdkEventKey *event) +{ + CcKeyboardShortcutEditor *self; + GdkModifierType real_mask; + gboolean is_custom; + gboolean editing; + guint keyval_lower; + + self = CC_KEYBOARD_SHORTCUT_EDITOR (widget); + + is_custom = is_custom_shortcut (self); + editing = !is_custom || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->edit_button)); + + if (!editing) + return GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->key_press_event (widget, event); + + real_mask = event->state & gtk_accelerator_get_default_mod_mask (); + + keyval_lower = gdk_keyval_to_lower (event->keyval); + + /* Normalise */ + if (keyval_lower == GDK_KEY_ISO_Left_Tab) + keyval_lower = GDK_KEY_Tab; + + /* Put shift back if it changed the case of the key, not otherwise. */ + if (keyval_lower != event->keyval) + real_mask |= GDK_SHIFT_MASK; + + if (keyval_lower == GDK_KEY_Sys_Req && + (real_mask & GDK_MOD1_MASK) != 0) + { + /* HACK: we don't want to use SysRq as a keybinding (but we do + * want Alt+Print), so we avoid translation from Alt+Print to SysRq */ + keyval_lower = GDK_KEY_Print; + } + + /* A single Escape press cancels the editing */ + if (!event->is_modifier && real_mask == 0 && keyval_lower == GDK_KEY_Escape) + { + self->edited = FALSE; + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), FALSE); + release_grab (self); + + cancel_editing (self); + + return GDK_EVENT_STOP; + } + + /* Backspace disables the current shortcut */ + if (!event->is_modifier && real_mask == 0 && keyval_lower == GDK_KEY_BackSpace) + { + self->edited = TRUE; + self->custom_is_modifier = FALSE; + self->custom_keycode = 0; + self->custom_keyval = 0; + self->custom_mask = 0; + + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->custom_shortcut_accel_label), ""); + gtk_shortcut_label_set_accelerator (GTK_SHORTCUT_LABEL (self->shortcut_accel_label), ""); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), FALSE); + release_grab (self); + + self->edited = FALSE; + + setup_custom_shortcut (self); + + return GDK_EVENT_STOP; + } + + self->custom_is_modifier = event->is_modifier; + self->custom_keycode = event->hardware_keycode; + self->custom_keyval = keyval_lower; + self->custom_mask = real_mask; + + /* CapsLock isn't supported as a keybinding modifier, so keep it from confusing us */ + self->custom_mask &= ~GDK_LOCK_MASK; + + setup_custom_shortcut (self); + + return GDK_EVENT_STOP; +} + +static void +cc_keyboard_shortcut_editor_close (GtkDialog *dialog) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (dialog); + + if (self->mode == CC_SHORTCUT_EDITOR_EDIT) + update_shortcut (self); + + GTK_DIALOG_CLASS (cc_keyboard_shortcut_editor_parent_class)->close (dialog); +} + +static void +cc_keyboard_shortcut_editor_response (GtkDialog *dialog, + gint response_id) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (dialog); + + if (response_id == GTK_RESPONSE_DELETE_EVENT && + self->mode == CC_SHORTCUT_EDITOR_EDIT) + { + update_shortcut (self); + } +} + +static gboolean +grab_idle (gpointer data) +{ + CcKeyboardShortcutEditor *self = data; + + if (self->item && self->item->type != CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH) + grab_seat (self); + + self->grab_idle_id = 0; + + return G_SOURCE_REMOVE; +} + +static void +cc_keyboard_shortcut_editor_show (GtkWidget *widget) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (widget); + + /* Map before grabbing, so that the window is visible */ + GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->show (widget); + + self->grab_idle_id = g_timeout_add (100, grab_idle, self); +} + +static void +cc_keyboard_shortcut_editor_unrealize (GtkWidget *widget) +{ + CcKeyboardShortcutEditor *self = CC_KEYBOARD_SHORTCUT_EDITOR (widget); + + if (self->grab_idle_id) { + g_source_remove (self->grab_idle_id); + self->grab_idle_id = 0; + } + + release_grab (self); + + GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->unrealize (widget); +} + +static void +cc_keyboard_shortcut_editor_class_init (CcKeyboardShortcutEditorClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = cc_keyboard_shortcut_editor_finalize; + object_class->get_property = cc_keyboard_shortcut_editor_get_property; + object_class->set_property = cc_keyboard_shortcut_editor_set_property; + + widget_class->show = cc_keyboard_shortcut_editor_show; + widget_class->unrealize = cc_keyboard_shortcut_editor_unrealize; + widget_class->key_press_event = cc_keyboard_shortcut_editor_key_press_event; + + dialog_class->close = cc_keyboard_shortcut_editor_close; + dialog_class->response = cc_keyboard_shortcut_editor_response; + + /** + * CcKeyboardShortcutEditor:keyboard-item: + * + * The current keyboard shortcut being edited. + */ + properties[PROP_KEYBOARD_ITEM] = g_param_spec_object ("keyboard-item", + "Keyboard item", + "The keyboard item being edited", + CC_TYPE_KEYBOARD_ITEM, + G_PARAM_READWRITE); + + /** + * CcKeyboardShortcutEditor:panel: + * + * The current keyboard panel. + */ + properties[PROP_MANAGER] = g_param_spec_object ("manager", + "Keyboard manager", + "The keyboard manager", + CC_TYPE_KEYBOARD_MANAGER, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + + g_object_class_install_properties (object_class, N_PROPS, properties); + + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/keyboard/shortcut-editor.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, add_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, cancel_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, command_entry); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, custom_shortcut_accel_label); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, custom_shortcut_stack); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, edit_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, headerbar); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, name_entry); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, new_shortcut_conflict_label); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, remove_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, replace_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, reset_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, set_button); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, shortcut_accel_label); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, shortcut_conflict_label); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, standard_shortcut_stack); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, stack); + gtk_widget_class_bind_template_child (widget_class, CcKeyboardShortcutEditor, top_info_label); + + gtk_widget_class_bind_template_callback (widget_class, add_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, cancel_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, change_custom_shortcut_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, command_entry_changed_cb); + gtk_widget_class_bind_template_callback (widget_class, edit_custom_shortcut_button_toggled_cb); + gtk_widget_class_bind_template_callback (widget_class, name_entry_changed_cb); + gtk_widget_class_bind_template_callback (widget_class, remove_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, replace_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, reset_item_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, set_button_clicked_cb); +} + +static void +cc_keyboard_shortcut_editor_init (CcKeyboardShortcutEditor *self) +{ + gtk_widget_init_template (GTK_WIDGET (self)); + + self->mode = CC_SHORTCUT_EDITOR_EDIT; + self->custom_is_modifier = TRUE; + + gtk_widget_set_direction (self->custom_shortcut_accel_label, GTK_TEXT_DIR_LTR); + gtk_widget_set_direction (self->shortcut_accel_label, GTK_TEXT_DIR_LTR); +} + +/** + * cc_keyboard_shortcut_editor_new: + * + * Creates a new #CcKeyboardShortcutEditor. + * + * Returns: (transfer full): a newly created #CcKeyboardShortcutEditor. + */ +GtkWidget* +cc_keyboard_shortcut_editor_new (CcKeyboardManager *manager) +{ + return g_object_new (CC_TYPE_KEYBOARD_SHORTCUT_EDITOR, + "manager", manager, + "use-header-bar", 1, + NULL); +} + +/** + * cc_keyboard_shortcut_editor_get_item: + * @self: a #CcKeyboardShortcutEditor + * + * Retrieves the current keyboard shortcut being edited. + * + * Returns: (transfer none)(nullable): a #CcKeyboardItem + */ +CcKeyboardItem* +cc_keyboard_shortcut_editor_get_item (CcKeyboardShortcutEditor *self) +{ + g_return_val_if_fail (CC_IS_KEYBOARD_SHORTCUT_EDITOR (self), NULL); + + return self->item; +} + +/** + * cc_keyboard_shortcut_editor_set_item: + * @self: a #CcKeyboardShortcutEditor + * @item: a #CcKeyboardItem + * + * Sets the current keyboard shortcut to be edited. + */ +void +cc_keyboard_shortcut_editor_set_item (CcKeyboardShortcutEditor *self, + CcKeyboardItem *item) +{ + g_return_if_fail (CC_IS_KEYBOARD_SHORTCUT_EDITOR (self)); + + if (!g_set_object (&self->item, item)) + return; + + setup_keyboard_item (self, item); + + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_KEYBOARD_ITEM]); +} + +CcShortcutEditorMode +cc_keyboard_shortcut_editor_get_mode (CcKeyboardShortcutEditor *self) +{ + g_return_val_if_fail (CC_IS_KEYBOARD_SHORTCUT_EDITOR (self), 0); + + return self->mode; +} + +void +cc_keyboard_shortcut_editor_set_mode (CcKeyboardShortcutEditor *self, + CcShortcutEditorMode mode) +{ + gboolean is_create_mode; + + g_return_if_fail (CC_IS_KEYBOARD_SHORTCUT_EDITOR (self)); + + self->mode = mode; + is_create_mode = mode == CC_SHORTCUT_EDITOR_CREATE; + + gtk_widget_set_visible (self->new_shortcut_conflict_label, is_create_mode); + gtk_stack_set_visible_child_name (GTK_STACK (self->custom_shortcut_stack), + is_create_mode ? "button" : "label"); + + if (mode == CC_SHORTCUT_EDITOR_CREATE) + { + /* Cleanup whatever was set before */ + clear_custom_entries (self); + + set_header_mode (self, HEADER_MODE_CUSTOM_CANCEL); + gtk_header_bar_set_title (GTK_HEADER_BAR (self->headerbar), _("Add Custom Shortcut")); + + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "custom"); + + gtk_widget_hide (self->remove_button); + gtk_widget_hide (self->edit_button); + } +} diff -Nru gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-shortcut-editor.h gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-shortcut-editor.h --- gnome-control-center-3.20.2/panels/keyboard/cc-keyboard-shortcut-editor.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/cc-keyboard-shortcut-editor.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,56 @@ +/* cc-keyboard-shortcut-editor.h + * + * Copyright (C) 2016 Endless, Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authors: Georges Basile Stavracas Neto + */ + +#ifndef CC_KEYBOARD_SHORTCUT_EDITOR_H +#define CC_KEYBOARD_SHORTCUT_EDITOR_H + +#include + +#include "cc-keyboard-item.h" +#include "cc-keyboard-manager.h" + +G_BEGIN_DECLS + +#define CC_TYPE_KEYBOARD_SHORTCUT_EDITOR (cc_keyboard_shortcut_editor_get_type()) + +typedef enum +{ + CC_SHORTCUT_EDITOR_CREATE, + CC_SHORTCUT_EDITOR_EDIT +} CcShortcutEditorMode; + +G_DECLARE_FINAL_TYPE (CcKeyboardShortcutEditor, cc_keyboard_shortcut_editor, CC, KEYBOARD_SHORTCUT_EDITOR, GtkDialog) + +GtkWidget* cc_keyboard_shortcut_editor_new (CcKeyboardManager *manager); + +CcKeyboardItem* cc_keyboard_shortcut_editor_get_item (CcKeyboardShortcutEditor *self); + +void cc_keyboard_shortcut_editor_set_item (CcKeyboardShortcutEditor *self, + CcKeyboardItem *item); + +CcShortcutEditorMode cc_keyboard_shortcut_editor_get_mode (CcKeyboardShortcutEditor *self); + +void cc_keyboard_shortcut_editor_set_mode (CcKeyboardShortcutEditor *self, + CcShortcutEditorMode mode); + +G_END_DECLS + +#endif /* CC_KEYBOARD_SHORTCUT_EDITOR_H */ + diff -Nru gnome-control-center-3.20.2/panels/keyboard/enter-keyboard-shortcut.svg gnome-control-center-3.22.1/panels/keyboard/enter-keyboard-shortcut.svg --- gnome-control-center-3.20.2/panels/keyboard/enter-keyboard-shortcut.svg 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/enter-keyboard-shortcut.svg 2016-09-27 12:37:36.000000000 +0000 @@ -0,0 +1,245 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gnome-control-center-3.20.2/panels/keyboard/gnome-keybindings.its gnome-control-center-3.22.1/panels/keyboard/gnome-keybindings.its --- gnome-control-center-3.20.2/panels/keyboard/gnome-keybindings.its 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/gnome-keybindings.its 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,11 @@ + + + + + + + + + + diff -Nru gnome-control-center-3.20.2/panels/keyboard/gnome-keybindings.loc gnome-control-center-3.22.1/panels/keyboard/gnome-keybindings.loc --- gnome-control-center-3.20.2/panels/keyboard/gnome-keybindings.loc 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/gnome-keybindings.loc 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,6 @@ + + + + + + diff -Nru gnome-control-center-3.20.2/panels/keyboard/gnome-keyboard-panel.desktop.in.in gnome-control-center-3.22.1/panels/keyboard/gnome-keyboard-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/keyboard/gnome-keyboard-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/gnome-keyboard-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Keyboard +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Key­board _Comment=View and change keyboard shortcuts and set your typing preferences Exec=gnome-control-center keyboard Icon=input-keyboard @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/keyboard/gnome-keyboard-panel.ui gnome-control-center-3.22.1/panels/keyboard/gnome-keyboard-panel.ui --- gnome-control-center-3.20.2/panels/keyboard/gnome-keyboard-panel.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/gnome-keyboard-panel.ui 2016-09-27 12:37:36.000000000 +0000 @@ -8,296 +8,131 @@ 200 200 - + + + True + + + + True + system-search-symbolic + + + + + True + False + center + center + True + True + 18 + vertical + 6 + + + True + False + 72 + edit-find-symbolic + + + + + + True + False + No keyboard shortcut found + + + + + + + + + True + False + Try a different search + + + + diff -Nru gnome-control-center-3.20.2/panels/keyboard/keyboard.gresource.xml gnome-control-center-3.22.1/panels/keyboard/keyboard.gresource.xml --- gnome-control-center-3.20.2/panels/keyboard/keyboard.gresource.xml 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/keyboard.gresource.xml 2016-09-27 12:37:36.000000000 +0000 @@ -1,6 +1,8 @@ + enter-keyboard-shortcut.svg gnome-keyboard-panel.ui + shortcut-editor.ui diff -Nru gnome-control-center-3.20.2/panels/keyboard/keyboard-shortcuts.c gnome-control-center-3.22.1/panels/keyboard/keyboard-shortcuts.c --- gnome-control-center-3.20.2/panels/keyboard/keyboard-shortcuts.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/keyboard-shortcuts.c 2016-09-27 12:37:36.000000000 +0000 @@ -25,290 +25,15 @@ #include #include "keyboard-shortcuts.h" -#include "cc-keyboard-item.h" #include "cc-keyboard-option.h" #include "wm-common.h" -#ifdef GDK_WINDOWING_X11 -#include -#endif - -#define BINDINGS_SCHEMA "org.gnome.settings-daemon.plugins.media-keys" -#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings" -#define CUSTOM_SHORTCUTS_ID "custom" -#define WID(builder, name) (GTK_WIDGET (gtk_builder_get_object (builder, name))) - -typedef struct { - /* The untranslated name, combine with ->package to translate */ - char *name; - /* The group of keybindings (system or application) */ - char *group; - /* The gettext package to use to translate the section title */ - char *package; - /* Name of the window manager the keys would apply to */ - char *wm_name; - /* The GSettings schema for the whole file, if any */ - char *schema; - /* an array of KeyListEntry */ - GArray *entries; -} KeyList; - -typedef struct -{ - CcKeyboardItemType type; - char *schema; /* GSettings schema name, if any */ - char *description; /* description for GSettings types */ - char *name; /* GSettings schema path, or GSettings key name depending on type */ - char *reverse_entry; - gboolean is_reversed; - gboolean hidden; -} KeyListEntry; - -typedef enum -{ - SHORTCUT_TYPE_KEY_ENTRY, - SHORTCUT_TYPE_XKB_OPTION, -} ShortcutType; - -enum -{ - DETAIL_DESCRIPTION_COLUMN, - DETAIL_KEYENTRY_COLUMN, - DETAIL_TYPE_COLUMN, - DETAIL_N_COLUMNS -}; - -enum -{ - SECTION_DESCRIPTION_COLUMN, - SECTION_ID_COLUMN, - SECTION_GROUP_COLUMN, - SECTION_N_COLUMNS -}; - -static GRegex *pictures_regex = NULL; -static GSettings *binding_settings = NULL; -static GtkWidget *custom_shortcut_dialog = NULL; -static GtkWidget *custom_shortcut_name_entry = NULL; -static GtkWidget *custom_shortcut_command_entry = NULL; -static GtkWidget *custom_shortcut_ok_button = NULL; -static GHashTable *kb_system_sections = NULL; -static GHashTable *kb_apps_sections = NULL; -static GHashTable *kb_user_sections = NULL; -static gpointer wm_changed_id = NULL; - -static void -free_key_array (GPtrArray *keys) -{ - if (keys != NULL) - { - gint i; - - for (i = 0; i < keys->len; i++) - { - CcKeyboardItem *item; - - item = g_ptr_array_index (keys, i); - - g_object_unref (item); - } - - g_ptr_array_free (keys, TRUE); - } -} - -static GHashTable * -get_hash_for_group (BindingGroupType group) -{ - GHashTable *hash; - - switch (group) - { - case BINDING_GROUP_SYSTEM: - hash = kb_system_sections; - break; - case BINDING_GROUP_APPS: - hash = kb_apps_sections; - break; - case BINDING_GROUP_USER: - hash = kb_user_sections; - break; - default: - hash = NULL; - } - return hash; -} - -static gboolean -have_key_for_group (int group, const gchar *name) -{ - GHashTableIter iter; - GPtrArray *keys; - gint i; - - g_hash_table_iter_init (&iter, get_hash_for_group (group)); - while (g_hash_table_iter_next (&iter, NULL, (gpointer *)&keys)) - { - for (i = 0; i < keys->len; i++) - { - CcKeyboardItem *item = g_ptr_array_index (keys, i); - - if (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS && - g_strcmp0 (name, item->key) == 0) - { - return TRUE; - } - - return FALSE; - } - } - - return FALSE; -} - -static gboolean -keybinding_key_changed_foreach (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - CcKeyboardItem *item) -{ - CcKeyboardItem *tmp_item; - - gtk_tree_model_get (item->model, iter, - DETAIL_KEYENTRY_COLUMN, &tmp_item, - -1); - - if (item == tmp_item) - { - gtk_tree_model_row_changed (item->model, path, iter); - return TRUE; - } - return FALSE; -} - -static void -item_changed (CcKeyboardItem *item, - GParamSpec *pspec, - gpointer user_data) -{ - /* update the model */ - gtk_tree_model_foreach (item->model, (GtkTreeModelForeachFunc) keybinding_key_changed_foreach, item); -} - - -static void -append_section (GtkBuilder *builder, - const gchar *title, - const gchar *id, - BindingGroupType group, - const KeyListEntry *keys_list) -{ - GPtrArray *keys_array; - GtkTreeModel *sort_model; - GtkTreeModel *model, *shortcut_model; - GtkTreeIter iter; - gint i; - GHashTable *hash; - gboolean is_new; - - hash = get_hash_for_group (group); - if (!hash) - return; - - sort_model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "section_treeview"))); - model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); - - shortcut_model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); - - /* Add all CcKeyboardItems for this section */ - is_new = FALSE; - keys_array = g_hash_table_lookup (hash, id); - if (keys_array == NULL) - { - keys_array = g_ptr_array_new (); - is_new = TRUE; - } - - GHashTable *reverse_items = g_hash_table_new (g_str_hash, g_str_equal); - - for (i = 0; keys_list != NULL && keys_list[i].name != NULL; i++) - { - CcKeyboardItem *item; - gboolean ret; - - if (have_key_for_group (group, keys_list[i].name)) - continue; - - item = cc_keyboard_item_new (keys_list[i].type); - switch (keys_list[i].type) - { - case CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH: - ret = cc_keyboard_item_load_from_gsettings_path (item, keys_list[i].name, FALSE); - break; - case CC_KEYBOARD_ITEM_TYPE_GSETTINGS: - ret = cc_keyboard_item_load_from_gsettings (item, - keys_list[i].description, - keys_list[i].schema, - keys_list[i].name); - if (ret && keys_list[i].reverse_entry != NULL) - { - CcKeyboardItem *reverse_item; - reverse_item = g_hash_table_lookup (reverse_items, - keys_list[i].reverse_entry); - if (reverse_item != NULL) - { - cc_keyboard_item_add_reverse_item (item, - reverse_item, - keys_list[i].is_reversed); - } - else - { - g_hash_table_insert (reverse_items, - keys_list[i].name, - item); - } - } - break; - default: - g_assert_not_reached (); - } - - if (ret == FALSE) - { - /* We don't actually want to popup a dialog - just skip this one */ - g_object_unref (item); - continue; - } - - cc_keyboard_item_set_hidden (item, keys_list[i].hidden); - item->model = shortcut_model; - - g_signal_connect (G_OBJECT (item), "notify", - G_CALLBACK (item_changed), NULL); - - g_ptr_array_add (keys_array, item); - } - - g_hash_table_destroy (reverse_items); - - /* Add the keys to the hash table */ - if (is_new) - { - g_hash_table_insert (hash, g_strdup (id), keys_array); - - /* Append the section to the left tree view */ - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - SECTION_DESCRIPTION_COLUMN, title, - SECTION_ID_COLUMN, id, - SECTION_GROUP_COLUMN, group, - -1); - } -} +#define CUSTOM_KEYS_BASENAME "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings" static char * replace_pictures_folder (const char *description) { + GRegex *pictures_regex; const char *path; char *dirname; char *ret; @@ -319,11 +44,15 @@ if (strstr (description, "$PICTURES") == NULL) return g_strdup (description); + pictures_regex = g_regex_new ("\\$PICTURES", 0, 0, NULL); path = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); dirname = g_filename_display_basename (path); ret = g_regex_replace (pictures_regex, description, -1, 0, dirname, 0, NULL); + + g_regex_unref (pictures_regex); g_free (dirname); + if (ret == NULL) return g_strdup (description); @@ -485,36 +214,187 @@ g_array_append_val (keylist->entries, key); } +void +fill_xkb_options_shortcuts (GtkTreeModel *model) +{ + GList *l; + GtkTreeIter iter; + + for (l = cc_keyboard_option_get_all (); l; l = l->next) + { + CcKeyboardOption *option = l->data; + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + DETAIL_DESCRIPTION_COLUMN, cc_keyboard_option_get_description (option), + DETAIL_KEYENTRY_COLUMN, option, + DETAIL_TYPE_COLUMN, SHORTCUT_TYPE_XKB_OPTION, + -1); + } +} + +static const guint forbidden_keyvals[] = { + /* Navigation keys */ + GDK_KEY_Home, + GDK_KEY_Left, + GDK_KEY_Up, + GDK_KEY_Right, + GDK_KEY_Down, + GDK_KEY_Page_Up, + GDK_KEY_Page_Down, + GDK_KEY_End, + GDK_KEY_Tab, + + /* Return */ + GDK_KEY_KP_Enter, + GDK_KEY_Return, + + GDK_KEY_Mode_switch +}; + static gboolean -strv_contains (char **strv, - char *str) +keyval_is_forbidden (guint keyval) { - char **p = strv; - for (p = strv; *p; p++) - if (strcmp (*p, str) == 0) + guint i; + + for (i = 0; i < G_N_ELEMENTS(forbidden_keyvals); i++) { + if (keyval == forbidden_keyvals[i]) return TRUE; + } + + return FALSE; +} + +gboolean +is_valid_binding (guint keyval, + GdkModifierType mask, + guint keycode) +{ + if ((mask == 0 || mask == GDK_SHIFT_MASK) && keycode != 0) + { + if ((keyval >= GDK_KEY_a && keyval <= GDK_KEY_z) + || (keyval >= GDK_KEY_A && keyval <= GDK_KEY_Z) + || (keyval >= GDK_KEY_0 && keyval <= GDK_KEY_9) + || (keyval >= GDK_KEY_kana_fullstop && keyval <= GDK_KEY_semivoicedsound) + || (keyval >= GDK_KEY_Arabic_comma && keyval <= GDK_KEY_Arabic_sukun) + || (keyval >= GDK_KEY_Serbian_dje && keyval <= GDK_KEY_Cyrillic_HARDSIGN) + || (keyval >= GDK_KEY_Greek_ALPHAaccent && keyval <= GDK_KEY_Greek_omega) + || (keyval >= GDK_KEY_hebrew_doublelowline && keyval <= GDK_KEY_hebrew_taf) + || (keyval >= GDK_KEY_Thai_kokai && keyval <= GDK_KEY_Thai_lekkao) + || (keyval >= GDK_KEY_Hangul_Kiyeog && keyval <= GDK_KEY_Hangul_J_YeorinHieuh) + || (keyval == GDK_KEY_space && mask == 0) + || keyval_is_forbidden (keyval)) { + return FALSE; + } + } + return TRUE; +} +gboolean +is_empty_binding (guint keyval, + GdkModifierType mask, + guint keycode) +{ + if (keyval == 0 && + mask == 0 && + keycode == 0) + return TRUE; return FALSE; } +gboolean +is_valid_accel (guint keyval, + GdkModifierType mask) +{ + /* Unlike gtk_accelerator_valid(), we want to allow Tab when combined + * with some modifiers (Alt+Tab and friends) + */ + return gtk_accelerator_valid (keyval, mask) || + (keyval == GDK_KEY_Tab && mask != 0); +} + +gchar* +find_free_settings_path (GSettings *settings) +{ + char **used_names; + char *dir = NULL; + int i, num, n_names; + + used_names = g_settings_get_strv (settings, "custom-keybindings"); + n_names = g_strv_length (used_names); + + for (num = 0; dir == NULL; num++) + { + char *tmp; + gboolean found = FALSE; + + tmp = g_strdup_printf ("%s/custom%d/", CUSTOM_KEYS_BASENAME, num); + for (i = 0; i < n_names && !found; i++) + found = strcmp (used_names[i], tmp) == 0; + + if (!found) + dir = tmp; + else + g_free (tmp); + } + g_strfreev (used_names); + + return dir; +} + +static gboolean +poke_xkb_option_row (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer option) +{ + gpointer item; + + gtk_tree_model_get (model, iter, + DETAIL_KEYENTRY_COLUMN, &item, + -1); + + if (item != option) + return FALSE; + + gtk_tree_model_row_changed (model, path, iter); + return TRUE; +} + static void -append_sections_from_file (GtkBuilder *builder, const gchar *path, const char *datadir, gchar **wm_keybindings) +xkb_option_changed (CcKeyboardOption *option, + gpointer data) { + GtkTreeModel *model = data; + + gtk_tree_model_foreach (model, poke_xkb_option_row, option); +} + +void +setup_keyboard_options (GtkListStore *store) +{ + GList *l; + + for (l = cc_keyboard_option_get_all (); l; l = l->next) + g_signal_connect (l->data, "changed", + G_CALLBACK (xkb_option_changed), store); +} + +KeyList* +parse_keylist_from_file (const gchar *path) +{ + KeyList *keylist; GError *err = NULL; char *buf; gsize buf_len; - KeyList *keylist; - KeyListEntry *keys; - KeyListEntry key = { 0, }; - const char *title; - int group; guint i; + GMarkupParseContext *ctx; GMarkupParser parser = { parse_start_tag, NULL, NULL, NULL, NULL }; /* Parse file */ if (!g_file_get_contents (path, &buf, &buf_len, &err)) - return; + return NULL; keylist = g_new0 (KeyList, 1); keylist->entries = g_array_new (FALSE, TRUE, sizeof (KeyListEntry)); @@ -527,8 +407,10 @@ g_free (keylist->name); g_free (keylist->package); g_free (keylist->wm_name); + for (i = 0; i < keylist->entries->len; i++) g_free (((KeyListEntry *) &(keylist->entries->data[i]))->name); + g_array_free (keylist->entries, TRUE); g_free (keylist); keylist = NULL; @@ -536,1664 +418,34 @@ g_markup_parse_context_free (ctx); g_free (buf); - if (keylist == NULL) - return; + return keylist; +} + +/* + * Stolen from GtkCellRendererAccel: + * https://git.gnome.org/browse/gtk+/tree/gtk/gtkcellrendereraccel.c#n261 + */ +gchar* +convert_keysym_state_to_string (guint keysym, + GdkModifierType mask, + guint keycode) +{ + gchar *name; - /* If there's no keys to add, or the settings apply to a window manager - * that's not the one we're running */ - if (keylist->entries->len == 0 - || (keylist->wm_name != NULL && !strv_contains (wm_keybindings, keylist->wm_name)) - || keylist->name == NULL) + if (keysym == 0 && keycode == 0) { - g_free (keylist->name); - g_free (keylist->package); - g_free (keylist->wm_name); - g_array_free (keylist->entries, TRUE); - g_free (keylist); - return; - } - - /* Empty KeyListEntry to end the array */ - key.name = NULL; - g_array_append_val (keylist->entries, key); - - keys = (KeyListEntry *) g_array_free (keylist->entries, FALSE); - if (keylist->package) - { - char *localedir; - - localedir = g_build_filename (datadir, "locale", NULL); - bindtextdomain (keylist->package, localedir); - g_free (localedir); - - title = dgettext (keylist->package, keylist->name); - } else { - title = _(keylist->name); - } - if (keylist->group && strcmp (keylist->group, "system") == 0) - group = BINDING_GROUP_SYSTEM; - else - group = BINDING_GROUP_APPS; - - append_section (builder, title, keylist->name, group, keys); - - g_free (keylist->name); - g_free (keylist->package); - g_free (keylist->wm_name); - g_free (keylist->schema); - g_free (keylist->group); - - for (i = 0; keys[i].name != NULL; i++) { - KeyListEntry *entry = &keys[i]; - g_free (entry->schema); - g_free (entry->description); - g_free (entry->name); - g_free (entry->reverse_entry); - } - g_free (keys); - - g_free (keylist); -} - -static void -append_sections_from_gsettings (GtkBuilder *builder) -{ - char **custom_paths; - GArray *entries; - KeyListEntry key = { 0, }; - int i; - - /* load custom shortcuts from GSettings */ - entries = g_array_new (FALSE, TRUE, sizeof (KeyListEntry)); - - custom_paths = g_settings_get_strv (binding_settings, "custom-keybindings"); - for (i = 0; custom_paths[i]; i++) - { - key.name = g_strdup (custom_paths[i]); - if (!have_key_for_group (BINDING_GROUP_USER, key.name)) - { - key.type = CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH; - g_array_append_val (entries, key); - } - else - g_free (key.name); - } - g_strfreev (custom_paths); - - if (entries->len > 0) - { - KeyListEntry *keys; - int i; - - /* Empty KeyListEntry to end the array */ - key.name = NULL; - g_array_append_val (entries, key); - - keys = (KeyListEntry *) entries->data; - append_section (builder, _("Custom Shortcuts"), CUSTOM_SHORTCUTS_ID, BINDING_GROUP_USER, keys); - for (i = 0; i < entries->len; ++i) - { - g_free (keys[i].name); - } - } - else - { - append_section (builder, _("Custom Shortcuts"), CUSTOM_SHORTCUTS_ID, BINDING_GROUP_USER, NULL); - } - - g_array_free (entries, TRUE); -} - -static void -reload_sections (CcPanel *panel) -{ - GtkBuilder *builder; - gchar **wm_keybindings; - gchar *default_wm_keybindings[] = { "Mutter", "GNOME Shell", NULL }; - GDir *dir; - GtkTreeModel *sort_model; - GtkTreeModel *section_model; - GtkTreeModel *shortcut_model; - const gchar * const * data_dirs; - guint i; - GtkTreeView *section_treeview; - GtkTreeSelection *selection; - GtkTreeIter iter; - GHashTable *loaded_files; - const char *section_to_set; - - builder = g_object_get_data (G_OBJECT (panel), "builder"); - - section_treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "section_treeview")); - sort_model = gtk_tree_view_get_model (section_treeview); - section_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model)); - - shortcut_model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); - /* FIXME: get current selection and keep it after refreshing */ - - /* Clear previous models and hash tables */ - gtk_list_store_clear (GTK_LIST_STORE (section_model)); - gtk_list_store_clear (GTK_LIST_STORE (shortcut_model)); - if (kb_system_sections != NULL) - g_hash_table_destroy (kb_system_sections); - kb_system_sections = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - (GDestroyNotify) free_key_array); - - if (kb_apps_sections != NULL) - g_hash_table_destroy (kb_apps_sections); - kb_apps_sections = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - (GDestroyNotify) free_key_array); - - if (kb_user_sections != NULL) - g_hash_table_destroy (kb_user_sections); - kb_user_sections = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - (GDestroyNotify) free_key_array); - - /* Load WM keybindings */ -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) - wm_keybindings = wm_common_get_current_keybindings (); -#endif - else - wm_keybindings = g_strdupv (default_wm_keybindings); - - loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - - data_dirs = g_get_system_data_dirs (); - for (i = 0; data_dirs[i] != NULL; i++) - { - char *dir_path; - const gchar *name; - - dir_path = g_build_filename (data_dirs[i], "gnome-control-center", "keybindings", NULL); - - dir = g_dir_open (dir_path, 0, NULL); - if (!dir) - { - g_free (dir_path); - continue; - } - - for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir)) - { - gchar *path; - - if (g_str_has_suffix (name, ".xml") == FALSE) - continue; - - if (g_hash_table_lookup (loaded_files, name) != NULL) - { - g_debug ("Not loading %s, it was already loaded from another directory", name); - continue; - } - - g_hash_table_insert (loaded_files, g_strdup (name), GINT_TO_POINTER (1)); - path = g_build_filename (dir_path, name, NULL); - append_sections_from_file (builder, path, data_dirs[i], wm_keybindings); - g_free (path); - } - g_free (dir_path); - g_dir_close (dir); - } - - g_hash_table_destroy (loaded_files); - g_strfreev (wm_keybindings); - - /* Add a separator */ - gtk_list_store_append (GTK_LIST_STORE (section_model), &iter); - gtk_list_store_set (GTK_LIST_STORE (section_model), &iter, - SECTION_DESCRIPTION_COLUMN, NULL, - SECTION_GROUP_COLUMN, BINDING_GROUP_SEPARATOR, - -1); - - /* Load custom keybindings */ - append_sections_from_gsettings (builder); - - /* Select the first item, or the requested section, if any */ - section_to_set = g_object_get_data (G_OBJECT (panel), "section-to-set"); - if (section_to_set != NULL) - { - if (keyboard_shortcuts_set_section (panel, section_to_set)) - { - g_object_set_data (G_OBJECT (panel), "section-to-set", NULL); - return; - } - } - g_assert (gtk_tree_model_get_iter_first (sort_model, &iter)); - selection = gtk_tree_view_get_selection (section_treeview); - gtk_tree_selection_select_iter (selection, &iter); - - g_object_set_data (G_OBJECT (panel), "section-to-set", NULL); -} - -static void -accel_set_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gpointer entry; - ShortcutType type; - - gtk_tree_model_get (model, iter, - DETAIL_KEYENTRY_COLUMN, &entry, - DETAIL_TYPE_COLUMN, &type, - -1); - - gtk_cell_renderer_set_visible (cell, FALSE); - - if (type == SHORTCUT_TYPE_XKB_OPTION && - GTK_IS_CELL_RENDERER_COMBO (cell)) - { - CcKeyboardOption *option = entry; - - gtk_cell_renderer_set_visible (cell, TRUE); - g_object_set (cell, - "model", cc_keyboard_option_get_store (option), - "text", cc_keyboard_option_get_current_value_description (option), - NULL); - } - else if (type == SHORTCUT_TYPE_KEY_ENTRY && - GTK_IS_CELL_RENDERER_TEXT (cell) && - !GTK_IS_CELL_RENDERER_COMBO (cell) && - entry != NULL) - { - CcKeyboardItem *item = entry; - - gtk_cell_renderer_set_visible (cell, TRUE); - - if (item->editable) - g_object_set (cell, - "editable", TRUE, - "accel-key", item->keyval, - "accel-mods", item->mask, - "keycode", item->keycode, - "style", PANGO_STYLE_NORMAL, - NULL); - else - g_object_set (cell, - "editable", FALSE, - "accel-key", item->keyval, - "accel-mods", item->mask, - "keycode", item->keycode, - "style", PANGO_STYLE_ITALIC, - NULL); - } -} - -static void -description_set_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - gchar *description; - CcKeyboardItem *item; - ShortcutType type; - - gtk_tree_model_get (model, iter, - DETAIL_DESCRIPTION_COLUMN, &description, - DETAIL_KEYENTRY_COLUMN, &item, - DETAIL_TYPE_COLUMN, &type, - -1); - - if (type == SHORTCUT_TYPE_XKB_OPTION) - { - g_object_set (cell, "text", description, NULL); - } - else - { - if (item != NULL) - g_object_set (cell, - "editable", FALSE, - "text", item->description != NULL ? - item->description : _(""), - NULL); - else - g_object_set (cell, - "editable", FALSE, NULL); - } - - g_free (description); -} - -static void -shortcut_selection_changed (GtkTreeSelection *selection, gpointer data) -{ - GtkWidget *button = data; - GtkTreeModel *model; - GtkTreeIter iter; - CcKeyboardItem *item; - gboolean can_remove; - ShortcutType type; - - can_remove = FALSE; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gtk_tree_model_get (model, &iter, - DETAIL_KEYENTRY_COLUMN, &item, - DETAIL_TYPE_COLUMN, &type, - -1); - if (type == SHORTCUT_TYPE_KEY_ENTRY && - item && item->command != NULL && item->editable) - can_remove = TRUE; - } - - gtk_widget_set_sensitive (button, can_remove); -} - -static void -fill_xkb_options_shortcuts (GtkTreeModel *model) -{ - GList *l; - GtkTreeIter iter; - - for (l = cc_keyboard_option_get_all (); l; l = l->next) - { - CcKeyboardOption *option = l->data; - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - DETAIL_DESCRIPTION_COLUMN, cc_keyboard_option_get_description (option), - DETAIL_KEYENTRY_COLUMN, option, - DETAIL_TYPE_COLUMN, SHORTCUT_TYPE_XKB_OPTION, - -1); - } -} - -static void -section_selection_changed (GtkTreeSelection *selection, gpointer data) -{ - GtkTreeIter iter; - GtkTreeModel *model; - GtkBuilder *builder = GTK_BUILDER (data); - - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - GPtrArray *keys; - GtkWidget *shortcut_treeview; - GtkTreeModel *shortcut_model; - gchar *id; - BindingGroupType group; - gint i; - - gtk_tree_model_get (model, &iter, - SECTION_ID_COLUMN, &id, - SECTION_GROUP_COLUMN, &group, -1); - - keys = g_hash_table_lookup (get_hash_for_group (group), id); - if (keys == NULL) - { - g_warning ("Can't find section %s in sections hash table.", id); - g_free (id); - return; - } - - gtk_widget_set_sensitive (WID (builder, "remove-toolbutton"), FALSE); - - /* Fill the shortcut treeview with the keys for the selected section */ - shortcut_treeview = GTK_WIDGET (gtk_builder_get_object (builder, "shortcut_treeview")); - shortcut_model = gtk_tree_view_get_model (GTK_TREE_VIEW (shortcut_treeview)); - gtk_list_store_clear (GTK_LIST_STORE (shortcut_model)); - - for (i = 0; i < keys->len; i++) - { - GtkTreeIter new_row; - CcKeyboardItem *item = g_ptr_array_index (keys, i); - - if (!cc_keyboard_item_is_hidden (item)) - { - gtk_list_store_append (GTK_LIST_STORE (shortcut_model), &new_row); - gtk_list_store_set (GTK_LIST_STORE (shortcut_model), &new_row, - DETAIL_DESCRIPTION_COLUMN, item->description, - DETAIL_KEYENTRY_COLUMN, item, - DETAIL_TYPE_COLUMN, SHORTCUT_TYPE_KEY_ENTRY, - -1); - } - } - - if (g_str_equal (id, "Typing")) - fill_xkb_options_shortcuts (shortcut_model); - - g_free (id); - } -} - -static gboolean -edit_custom_shortcut (CcKeyboardItem *item) -{ - gint result; - gboolean ret; - GSettings *settings; - - settings = g_settings_new_with_path (item->schema, item->gsettings_path); - - g_settings_bind (settings, "name", - G_OBJECT (custom_shortcut_name_entry), "text", - G_SETTINGS_BIND_DEFAULT); - gtk_widget_grab_focus (custom_shortcut_name_entry); - - g_settings_bind (settings, "command", - G_OBJECT (custom_shortcut_command_entry), "text", - G_SETTINGS_BIND_DEFAULT); - - g_settings_delay (settings); - - gtk_widget_set_sensitive (custom_shortcut_name_entry, - item->desc_editable); - gtk_widget_set_sensitive (custom_shortcut_command_entry, - item->cmd_editable); - gtk_window_present (GTK_WINDOW (custom_shortcut_dialog)); - result = gtk_dialog_run (GTK_DIALOG (custom_shortcut_dialog)); - switch (result) - { - case GTK_RESPONSE_OK: - g_settings_apply (settings); - ret = TRUE; - break; - default: - g_settings_revert (settings); - ret = FALSE; - break; - } - - g_settings_unbind (G_OBJECT (custom_shortcut_name_entry), "text"); - g_settings_unbind (G_OBJECT (custom_shortcut_command_entry), "text"); - - g_object_unref (settings); - - gtk_widget_hide (custom_shortcut_dialog); - - return ret; -} - -static gboolean -remove_custom_shortcut (GtkTreeModel *model, GtkTreeIter *iter) -{ - CcKeyboardItem *item; - GPtrArray *keys_array; - GVariantBuilder builder; - char **settings_paths; - int i; - - gtk_tree_model_get (model, iter, - DETAIL_KEYENTRY_COLUMN, &item, - -1); - - /* not a custom shortcut */ - g_assert (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH); - - g_settings_delay (item->settings); - g_settings_reset (item->settings, "name"); - g_settings_reset (item->settings, "command"); - g_settings_reset (item->settings, "binding"); - g_settings_apply (item->settings); - g_settings_sync (); - - settings_paths = g_settings_get_strv (binding_settings, "custom-keybindings"); - g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); - for (i = 0; settings_paths[i]; i++) - if (strcmp (settings_paths[i], item->gsettings_path) != 0) - g_variant_builder_add (&builder, "s", settings_paths[i]); - g_settings_set_value (binding_settings, - "custom-keybindings", g_variant_builder_end (&builder)); - g_strfreev (settings_paths); - g_object_unref (item); - - keys_array = g_hash_table_lookup (get_hash_for_group (BINDING_GROUP_USER), CUSTOM_SHORTCUTS_ID); - g_ptr_array_remove (keys_array, item); - - gtk_list_store_remove (GTK_LIST_STORE (model), iter); - - return TRUE; -} - -static void -update_custom_shortcut (GtkTreeModel *model, GtkTreeIter *iter) -{ - CcKeyboardItem *item; - - gtk_tree_model_get (model, iter, - DETAIL_KEYENTRY_COLUMN, &item, - -1); - - g_assert (item->type == CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH); - - edit_custom_shortcut (item); - if (item->command == NULL || item->command[0] == '\0') - { - remove_custom_shortcut (model, iter); - } - else - { - gtk_list_store_set (GTK_LIST_STORE (model), iter, - DETAIL_KEYENTRY_COLUMN, item, -1); - } -} - -static gboolean -start_editing_cb (GtkTreeView *tree_view, - GdkEventButton *event, - gpointer user_data) -{ - GtkTreePath *path; - GtkTreeViewColumn *column; - GtkCellRenderer *cell = user_data; - - if (event->window != gtk_tree_view_get_bin_window (tree_view)) - return FALSE; - - if (gtk_tree_view_get_path_at_pos (tree_view, - (gint) event->x, - (gint) event->y, - &path, &column, - NULL, NULL)) - { - GtkTreeModel *model; - GtkTreeIter iter; - CcKeyboardItem *item; - ShortcutType type; - - model = gtk_tree_view_get_model (tree_view); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, - DETAIL_KEYENTRY_COLUMN, &item, - DETAIL_TYPE_COLUMN, &type, - -1); - - if (type == SHORTCUT_TYPE_XKB_OPTION) - { - gtk_tree_path_free (path); - return FALSE; - } - - /* if only the accel can be edited on the selected row - * always select the accel column */ - if (item->desc_editable && - column == gtk_tree_view_get_column (tree_view, 0)) - { - gtk_widget_grab_focus (GTK_WIDGET (tree_view)); - gtk_tree_view_set_cursor (tree_view, - path, - column, - FALSE); - update_custom_shortcut (model, &iter); - } - else - { - gtk_widget_grab_focus (GTK_WIDGET (tree_view)); - gtk_tree_view_set_cursor_on_cell (tree_view, - path, - gtk_tree_view_get_column (tree_view, 1), - cell, - TRUE); - } - g_signal_stop_emission_by_name (tree_view, "button_press_event"); - gtk_tree_path_free (path); - } - return TRUE; -} - -static void -start_editing_kb_cb (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) -{ - GtkTreeModel *model; - GtkTreeIter iter; - CcKeyboardItem *item; - ShortcutType type; - GtkCellRenderer *cell = user_data; - - model = gtk_tree_view_get_model (treeview); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, - DETAIL_KEYENTRY_COLUMN, &item, - DETAIL_TYPE_COLUMN, &type, - -1); - - if (type == SHORTCUT_TYPE_XKB_OPTION) - return; - - /* if only the accel can be edited on the selected row - * always select the accel column */ - if (item->desc_editable && - column == gtk_tree_view_get_column (treeview, 0)) - { - gtk_widget_grab_focus (GTK_WIDGET (treeview)); - gtk_tree_view_set_cursor (treeview, - path, - column, - FALSE); - update_custom_shortcut (model, &iter); - } - else - { - gtk_widget_grab_focus (GTK_WIDGET (treeview)); - gtk_tree_view_set_cursor_on_cell (treeview, - path, - gtk_tree_view_get_column (treeview, 1), - cell, - TRUE); - } -} - -static const guint forbidden_keyvals[] = { - /* Navigation keys */ - GDK_KEY_Home, - GDK_KEY_Left, - GDK_KEY_Up, - GDK_KEY_Right, - GDK_KEY_Down, - GDK_KEY_Page_Up, - GDK_KEY_Page_Down, - GDK_KEY_End, - GDK_KEY_Tab, - - /* Return */ - GDK_KEY_KP_Enter, - GDK_KEY_Return, - - GDK_KEY_Mode_switch -}; - -static char* -binding_name (guint keyval, - guint keycode, - GdkModifierType mask, - gboolean translate) -{ - if (keyval != 0 || keycode != 0) - return translate ? - gtk_accelerator_get_label_with_keycode (NULL, keyval, keycode, mask) : - gtk_accelerator_name_with_keycode (NULL, keyval, keycode, mask); - else - return g_strdup (translate ? _("Disabled") : NULL); -} - -static gboolean -keyval_is_forbidden (guint keyval) -{ - guint i; - - for (i = 0; i < G_N_ELEMENTS(forbidden_keyvals); i++) { - if (keyval == forbidden_keyvals[i]) - return TRUE; - } - - return FALSE; -} - -typedef struct { - CcKeyboardItem *orig_item; - CcKeyboardItem *conflict_item; - guint new_keyval; - GdkModifierType new_mask; - guint new_keycode; -} CcUniquenessData; - -static gboolean -compare_keys_for_uniqueness (CcKeyboardItem *element, - CcUniquenessData *data) -{ - CcKeyboardItem *orig_item; - - orig_item = data->orig_item; - - /* no conflict for : blanks, different modifiers, or ourselves */ - if (element == NULL || data->new_mask != element->mask || - cc_keyboard_item_equal (orig_item, element)) - return FALSE; - - if (data->new_keyval != 0) { - if (data->new_keyval != element->keyval) - return FALSE; - } else if (element->keyval != 0 || data->new_keycode != element->keycode) - return FALSE; - - data->conflict_item = element; - - return TRUE; -} - -static gboolean -cb_check_for_uniqueness (gpointer key, - GPtrArray *keys_array, - CcUniquenessData *data) -{ - guint i; - - for (i = 0; i < keys_array->len; i++) - { - CcKeyboardItem *item; - - item = keys_array->pdata[i]; - if (compare_keys_for_uniqueness (item, data)) - return TRUE; - } - return FALSE; -} - -static CcKeyboardItem * -search_for_conflict_item (CcKeyboardItem *item, - guint keyval, - GdkModifierType mask, - guint keycode) -{ - CcUniquenessData data; - - data.orig_item = item; - data.new_keyval = keyval; - data.new_mask = mask; - data.new_keycode = keycode; - data.conflict_item = NULL; - - if (keyval != 0 || keycode != 0) /* any number of shortcuts can be disabled */ - { - BindingGroupType i; - - for (i = BINDING_GROUP_SYSTEM; i <= BINDING_GROUP_USER && data.conflict_item == NULL; i++) - { - GHashTable *table; - - table = get_hash_for_group (i); - if (!table) - continue; - g_hash_table_find (table, (GHRFunc) cb_check_for_uniqueness, &data); - } - } - - return data.conflict_item; -} - -static gboolean -is_valid_binding (guint keyval, - GdkModifierType mask, - guint keycode) -{ - if ((mask == 0 || mask == GDK_SHIFT_MASK) && keycode != 0) - { - if ((keyval >= GDK_KEY_a && keyval <= GDK_KEY_z) - || (keyval >= GDK_KEY_A && keyval <= GDK_KEY_Z) - || (keyval >= GDK_KEY_0 && keyval <= GDK_KEY_9) - || (keyval >= GDK_KEY_kana_fullstop && keyval <= GDK_KEY_semivoicedsound) - || (keyval >= GDK_KEY_Arabic_comma && keyval <= GDK_KEY_Arabic_sukun) - || (keyval >= GDK_KEY_Serbian_dje && keyval <= GDK_KEY_Cyrillic_HARDSIGN) - || (keyval >= GDK_KEY_Greek_ALPHAaccent && keyval <= GDK_KEY_Greek_omega) - || (keyval >= GDK_KEY_hebrew_doublelowline && keyval <= GDK_KEY_hebrew_taf) - || (keyval >= GDK_KEY_Thai_kokai && keyval <= GDK_KEY_Thai_lekkao) - || (keyval >= GDK_KEY_Hangul_Kiyeog && keyval <= GDK_KEY_Hangul_J_YeorinHieuh) - || (keyval == GDK_KEY_space && mask == 0) - || keyval_is_forbidden (keyval)) { - return FALSE; - } - } - return TRUE; -} - -static GtkResponseType -show_invalid_binding_dialog (GtkTreeView *view, - guint keyval, - GdkModifierType mask, - guint keycode) -{ - GtkWidget *dialog; - char *name; - - name = binding_name (keyval, keycode, mask, TRUE); - - dialog = - gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CANCEL, - _("The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n" - "Please try with a key such as Control, Alt or Shift at the same time."), - name); - - g_free (name); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - return GTK_RESPONSE_NONE; -} - -static GtkResponseType -show_conflict_item_dialog (GtkTreeView *view, - CcKeyboardItem *item, - CcKeyboardItem *conflict_item, - guint keyval, - GdkModifierType mask, - guint keycode) -{ - GtkWidget *dialog; - char *name; - int response; - - name = binding_name (keyval, keycode, mask, TRUE); - - dialog = - gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CANCEL, - _("The shortcut \"%s\" is already used for\n\"%s\""), - name, conflict_item->description); - g_free (name); - - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("If you reassign the shortcut to \"%s\", the \"%s\" shortcut " - "will be disabled."), - item->description, - conflict_item->description); - - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Reassign"), - GTK_RESPONSE_ACCEPT); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - return response; -} - -static GtkResponseType -show_reverse_item_dialog (GtkTreeView *view, - CcKeyboardItem *item, - CcKeyboardItem *reverse_item, - CcKeyboardItem *reverse_conflict_item, - guint keyval, - GdkModifierType mask, - guint keycode) -{ - GtkWidget *dialog; - char *name; - int response; - - name = binding_name (keyval, keycode, mask, TRUE); - - /* translators: - * This is the text you get in a dialogue when an action has an associated - * "reverse" action, for example Alt+Tab going in the opposite direction to - * Alt+Shift+Tab. - * - * An example text would be: - * The "Switch to next input source" shortcut has an associated "Switch to - * previous input source" shortcut. Do you want to automatically set it to - * "Shift+Ctrl+Alt+Space"? */ - dialog = - gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))), - GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CANCEL, - _("The \"%s\" shortcut has an associated \"%s\" shortcut. " - "Do you want to automatically set it to \"%s\"?"), - item->description, reverse_item->description, name); - - if (reverse_conflict_item != NULL) { - /* translators: - * This is the text you get in a dialogue when you try to use a shortcut - * that was already associated with another action, for example: - * "Alt+F4" is currently associated with "Close Window", ... */ - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("\"%s\" is currently associated with \"%s\", this shortcut will be" - " disabled if you move forward."), - name, reverse_conflict_item->description); - } - g_free (name); - - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("_Assign"), - GTK_RESPONSE_ACCEPT); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), - GTK_RESPONSE_ACCEPT); - - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - return response; -} - -static void -handle_reverse_item (CcKeyboardItem *item, - CcKeyboardItem *reverse_item, - guint keyval, - GdkModifierType mask, - guint keycode, - GtkTreeView *view) -{ - GtkResponseType response; - GdkModifierType reverse_mask; - - reverse_mask = mask ^ GDK_SHIFT_MASK; - - if (!is_valid_binding(keyval, reverse_mask, keycode)) - return; - - if ((reverse_item->keyval != keyval) - || (reverse_item->keycode != keycode) - || (reverse_item->mask != reverse_mask)) - { - CcKeyboardItem *reverse_conflict_item; - char *binding_str; - - reverse_conflict_item = search_for_conflict_item (reverse_item, keyval, - reverse_mask, - keycode); - - response = show_reverse_item_dialog (view, item, reverse_item, - reverse_conflict_item, - keyval, reverse_mask, - keycode); - if (response == GTK_RESPONSE_ACCEPT) - { - binding_str = binding_name (keyval, keycode, reverse_mask, FALSE); - g_object_set (G_OBJECT (reverse_item), "binding", binding_str, NULL); - g_free (binding_str); - - if (reverse_conflict_item != NULL) - g_object_set (G_OBJECT (reverse_conflict_item), - "binding", NULL, NULL); - } - else - { - /* The existing reverse binding may be conflicting with the binding - * we are setting. Other conflicts have already been handled in - * accel_edited_callback() - */ - CcKeyboardItem *conflict_item; - conflict_item = search_for_conflict_item (item, keyval, - mask, keycode); - if (conflict_item != NULL) - { - g_warn_if_fail (conflict_item == reverse_item); - g_object_set (G_OBJECT (conflict_item), - "binding", NULL, NULL); - } - } - } -} - -static void -accel_edited_callback (GtkCellRendererText *cell, - const char *path_string, - guint keyval, - GdkModifierType mask, - guint keycode, - GtkTreeView *view) -{ - GtkTreeModel *model; - GtkTreePath *path = gtk_tree_path_new_from_string (path_string); - GtkTreeIter iter; - CcKeyboardItem *item; - CcKeyboardItem *conflict_item; - CcKeyboardItem *reverse_item; - char *str; - - model = gtk_tree_view_get_model (view); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_path_free (path); - gtk_tree_model_get (model, &iter, - DETAIL_KEYENTRY_COLUMN, &item, - -1); - - /* sanity check */ - if (item == NULL) - return; - - /* CapsLock isn't supported as a keybinding modifier, so keep it from confusing us */ - mask &= ~GDK_LOCK_MASK; - - conflict_item = search_for_conflict_item (item, keyval, mask, keycode); - - /* Check for unmodified keys */ - if (!is_valid_binding (keyval, mask, keycode)) - { - show_invalid_binding_dialog (view, keyval, mask, keycode); - - /* set it back to its previous value. */ - g_object_set (G_OBJECT (cell), - "accel-key", item->keyval, - "keycode", item->keycode, - "accel-mods", item->mask, - NULL); - return; - } - - reverse_item = cc_keyboard_item_get_reverse_item (item); - - /* flag to see if the new accelerator was in use by something */ - if ((conflict_item != NULL) && (conflict_item != reverse_item)) - { - GtkResponseType response; - - response = show_conflict_item_dialog (view, item, conflict_item, - keyval, mask, keycode); - - if (response == GTK_RESPONSE_ACCEPT) - { - g_object_set (G_OBJECT (conflict_item), "binding", NULL, NULL); - - str = binding_name (keyval, keycode, mask, FALSE); - g_object_set (G_OBJECT (item), "binding", str, NULL); - - g_free (str); - if (reverse_item == NULL) - return; - } - else - { - /* set it back to its previous value. */ - g_object_set (G_OBJECT (cell), - "accel-key", item->keyval, - "keycode", item->keycode, - "accel-mods", item->mask, - NULL); - return; - } - - } - - str = binding_name (keyval, keycode, mask, FALSE); - g_object_set (G_OBJECT (item), "binding", str, NULL); - - g_free (str); - - if (reverse_item != NULL) - handle_reverse_item (item, reverse_item, keyval, mask, keycode, view); -} - -static void -accel_cleared_callback (GtkCellRendererText *cell, - const char *path_string, - gpointer data) -{ - GtkTreeView *view = (GtkTreeView *) data; - GtkTreePath *path = gtk_tree_path_new_from_string (path_string); - CcKeyboardItem *item; - GtkTreeIter iter; - GtkTreeModel *model; - - model = gtk_tree_view_get_model (view); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_path_free (path); - gtk_tree_model_get (model, &iter, - DETAIL_KEYENTRY_COLUMN, &item, - -1); - - /* sanity check */ - if (item == NULL) - return; - - /* Unset the key */ - g_object_set (G_OBJECT (item), "binding", NULL, NULL); -} - -static gchar * -find_free_settings_path () -{ - char **used_names; - char *dir = NULL; - int i, num, n_names; - - used_names = g_settings_get_strv (binding_settings, "custom-keybindings"); - n_names = g_strv_length (used_names); - - for (num = 0; dir == NULL; num++) - { - char *tmp; - gboolean found = FALSE; - - tmp = g_strdup_printf ("%s/custom%d/", CUSTOM_KEYS_BASENAME, num); - for (i = 0; i < n_names && !found; i++) - found = strcmp (used_names[i], tmp) == 0; - - if (!found) - dir = tmp; - else - g_free (tmp); - } - g_strfreev (used_names); - - return dir; -} - -static void -add_custom_shortcut (GtkTreeView *tree_view, - GtkTreeModel *model) -{ - CcKeyboardItem *item; - GtkTreePath *path; - gchar *settings_path; - - item = cc_keyboard_item_new (CC_KEYBOARD_ITEM_TYPE_GSETTINGS_PATH); - - settings_path = find_free_settings_path (); - cc_keyboard_item_load_from_gsettings_path (item, settings_path, TRUE); - g_free (settings_path); - - item->model = model; - - if (edit_custom_shortcut (item) && - item->command && item->command[0]) - { - GPtrArray *keys_array; - GtkTreeIter iter; - GHashTable *hash; - GVariantBuilder builder; - char **settings_paths; - int i; - - hash = get_hash_for_group (BINDING_GROUP_USER); - keys_array = g_hash_table_lookup (hash, CUSTOM_SHORTCUTS_ID); - if (keys_array == NULL) - { - keys_array = g_ptr_array_new (); - g_hash_table_insert (hash, g_strdup (CUSTOM_SHORTCUTS_ID), keys_array); - } - - g_ptr_array_add (keys_array, item); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, DETAIL_KEYENTRY_COLUMN, item, -1); - - settings_paths = g_settings_get_strv (binding_settings, "custom-keybindings"); - g_variant_builder_init (&builder, G_VARIANT_TYPE ("as")); - for (i = 0; settings_paths[i]; i++) - g_variant_builder_add (&builder, "s", settings_paths[i]); - g_variant_builder_add (&builder, "s", item->gsettings_path); - g_settings_set_value (binding_settings, "custom-keybindings", - g_variant_builder_end (&builder)); - - /* make the new shortcut visible */ - path = gtk_tree_model_get_path (model, &iter); - gtk_tree_view_expand_to_path (tree_view, path); - gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0, 0); - gtk_tree_path_free (path); - } - else - { - g_object_unref (item); - } -} - -static void -shortcut_entry_changed (GtkEntry *entry, - gpointer user_data) -{ - guint16 name_length; - guint16 command_length; - - name_length = gtk_entry_get_text_length (GTK_ENTRY (custom_shortcut_name_entry)); - command_length = gtk_entry_get_text_length (GTK_ENTRY (custom_shortcut_command_entry)); - - gtk_widget_set_sensitive (custom_shortcut_ok_button, - name_length > 0 && command_length > 0); -} - -static void -add_button_clicked (GtkWidget *button, - GtkBuilder *builder) -{ - GtkTreeView *treeview; - GtkTreeModel *model; - GtkTreeModel *section_model; - GtkTreeIter iter; - gboolean found, cont; - - treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, - "shortcut_treeview")); - model = gtk_tree_view_get_model (treeview); - - /* Select the Custom Shortcuts section - * before adding the shortcut itself */ - section_model = gtk_tree_view_get_model (GTK_TREE_VIEW (WID (builder, "section_treeview"))); - cont = gtk_tree_model_get_iter_first (section_model, &iter); - found = FALSE; - while (cont) - { - BindingGroupType group; - - gtk_tree_model_get (section_model, &iter, - SECTION_GROUP_COLUMN, &group, - -1); - - if (group == BINDING_GROUP_USER) - { - found = TRUE; - break; - } - cont = gtk_tree_model_iter_next (section_model, &iter); - } - if (found) - { - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID (builder, "section_treeview"))); - gtk_tree_selection_select_iter (selection, &iter); - } - - /* And add the shortcut */ - add_custom_shortcut (treeview, model); -} - -static void -remove_button_clicked (GtkWidget *button, - GtkBuilder *builder) -{ - GtkTreeView *treeview; - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - - treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, - "shortcut_treeview")); - model = gtk_tree_view_get_model (treeview); - - selection = gtk_tree_view_get_selection (treeview); - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - { - remove_custom_shortcut (model, &iter); - } -} - -static int -section_sort_item (GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer data) -{ - char *a_desc; - int a_group; - char *b_desc; - int b_group; - int ret; - - gtk_tree_model_get (model, a, - SECTION_DESCRIPTION_COLUMN, &a_desc, - SECTION_GROUP_COLUMN, &a_group, - -1); - gtk_tree_model_get (model, b, - SECTION_DESCRIPTION_COLUMN, &b_desc, - SECTION_GROUP_COLUMN, &b_group, - -1); - - if (a_group == b_group && a_desc && b_desc) - ret = g_utf8_collate (a_desc, b_desc); - else - ret = a_group - b_group; - - g_free (a_desc); - g_free (b_desc); - - return ret; -} - -static gboolean -sections_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - BindingGroupType type; - - gtk_tree_model_get (model, iter, SECTION_GROUP_COLUMN, &type, -1); - - return type == BINDING_GROUP_SEPARATOR; -} - -static void -xkb_options_combo_changed (GtkCellRendererCombo *combo, - gchar *model_path, - GtkTreeIter *model_iter, - gpointer data) -{ - GtkTreeView *shortcut_treeview; - GtkTreeModel *shortcut_model; - GtkTreeIter shortcut_iter; - GtkTreeSelection *selection; - CcKeyboardOption *option; - ShortcutType type; - GtkBuilder *builder = data; - - shortcut_treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview")); - selection = gtk_tree_view_get_selection (shortcut_treeview); - if (!gtk_tree_selection_get_selected (selection, &shortcut_model, &shortcut_iter)) - return; - - gtk_tree_model_get (shortcut_model, &shortcut_iter, - DETAIL_KEYENTRY_COLUMN, &option, - DETAIL_TYPE_COLUMN, &type, - -1); - - if (type != SHORTCUT_TYPE_XKB_OPTION) - return; - - cc_keyboard_option_set_selection (option, model_iter); -} - -static gboolean -poke_xkb_option_row (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer option) -{ - gpointer item; - - gtk_tree_model_get (model, iter, - DETAIL_KEYENTRY_COLUMN, &item, - -1); - - if (item != option) - return FALSE; - - gtk_tree_model_row_changed (model, path, iter); - return TRUE; -} - -static void -xkb_option_changed (CcKeyboardOption *option, - gpointer data) -{ - GtkTreeModel *model = data; - - gtk_tree_model_foreach (model, poke_xkb_option_row, option); -} - -static void -setup_keyboard_options (GtkListStore *store) -{ - GList *l; - - for (l = cc_keyboard_option_get_all (); l; l = l->next) - g_signal_connect (l->data, "changed", - G_CALLBACK (xkb_option_changed), store); -} - -static void -setup_dialog (CcPanel *panel, GtkBuilder *builder) -{ - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkWidget *widget; - GtkTreeView *treeview; - GtkTreeSelection *selection; - GList *focus_chain; - CcShell *shell; - GtkListStore *model; - GtkTreeModelSort *sort_model; - GtkStyleContext *context; - - gtk_widget_set_size_request (GTK_WIDGET (panel), -1, 400); - - /* Setup the section treeview */ - treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "section_treeview")); - gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (treeview), - sections_separator_func, - panel, - NULL); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Section"), - renderer, - "text", SECTION_DESCRIPTION_COLUMN, - NULL); - g_object_set (renderer, - "width-chars", 20, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); - - gtk_tree_view_append_column (treeview, column); - - model = gtk_list_store_new (SECTION_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); - sort_model = GTK_TREE_MODEL_SORT (gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model))); - gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (sort_model)); - g_object_unref (model); - - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sort_model), - SECTION_DESCRIPTION_COLUMN, - section_sort_item, - panel, - NULL); - - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), - SECTION_DESCRIPTION_COLUMN, - GTK_SORT_ASCENDING); - g_object_unref (sort_model); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - - g_signal_connect (selection, "changed", - G_CALLBACK (section_selection_changed), builder); - section_selection_changed (selection, builder); - - /* Setup the shortcut treeview */ - treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, - "shortcut_treeview")); - - binding_settings = g_settings_new (BINDINGS_SCHEMA); - - renderer = gtk_cell_renderer_text_new (); - g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - - column = gtk_tree_view_column_new_with_attributes (NULL, renderer, NULL); - gtk_tree_view_column_set_cell_data_func (column, renderer, description_set_func, NULL, NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_column_set_expand (column, TRUE); - - gtk_tree_view_append_column (treeview, column); - - renderer = (GtkCellRenderer *) g_object_new (GTK_TYPE_CELL_RENDERER_ACCEL, - "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_OTHER, - NULL); - - g_signal_connect (treeview, "button_press_event", - G_CALLBACK (start_editing_cb), renderer); - g_signal_connect (treeview, "row-activated", - G_CALLBACK (start_editing_kb_cb), renderer); - - g_signal_connect (renderer, "accel_edited", - G_CALLBACK (accel_edited_callback), - treeview); - g_signal_connect (renderer, "accel_cleared", - G_CALLBACK (accel_cleared_callback), - treeview); - - column = gtk_tree_view_column_new_with_attributes (NULL, renderer, NULL); - gtk_tree_view_column_set_cell_data_func (column, renderer, accel_set_func, NULL, NULL); - gtk_tree_view_column_set_resizable (column, FALSE); - gtk_tree_view_column_set_expand (column, FALSE); - - renderer = (GtkCellRenderer *) g_object_new (GTK_TYPE_CELL_RENDERER_COMBO, - "has-entry", FALSE, - "text-column", XKB_OPTION_DESCRIPTION_COLUMN, - "editable", TRUE, - "ellipsize", PANGO_ELLIPSIZE_END, - "width-chars", 25, - NULL); - g_signal_connect (renderer, "changed", - G_CALLBACK (xkb_options_combo_changed), builder); - - gtk_tree_view_column_pack_end (column, renderer, FALSE); - - gtk_tree_view_column_set_cell_data_func (column, renderer, accel_set_func, NULL, NULL); - - gtk_tree_view_append_column (treeview, column); - - model = gtk_list_store_new (DETAIL_N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT); - gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (model)); - g_object_unref (model); - - setup_keyboard_options (model); - - widget = GTK_WIDGET (gtk_builder_get_object (builder, "actions_swindow")); - context = gtk_widget_get_style_context (widget); - gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "shortcut-toolbar")); - context = gtk_widget_get_style_context (widget); - gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); - - /* set up the focus chain */ - focus_chain = g_list_append (NULL, WID (builder, "sections_swindow")); - focus_chain = g_list_append (focus_chain, WID (builder, "actions_swindow")); - focus_chain = g_list_append (focus_chain, WID (builder, "shortcut-toolbar")); - - widget = GTK_WIDGET (gtk_builder_get_object (builder, "shortcuts_grid")); - gtk_container_set_focus_chain (GTK_CONTAINER (widget), focus_chain); - g_list_free (focus_chain); - - /* set up the dialog */ - shell = cc_panel_get_shell (CC_PANEL (panel)); - widget = cc_shell_get_toplevel (shell); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - g_signal_connect (selection, "changed", - G_CALLBACK (shortcut_selection_changed), - WID (builder, "remove-toolbutton")); - - /* setup the custom shortcut dialog */ - custom_shortcut_dialog = WID (builder, - "custom-shortcut-dialog"); - custom_shortcut_ok_button = WID (builder, "custom-shortcut-ok-button"); - custom_shortcut_name_entry = WID (builder, - "custom-shortcut-name-entry"); - g_signal_connect (custom_shortcut_name_entry, "changed", - G_CALLBACK (shortcut_entry_changed), NULL); - custom_shortcut_command_entry = WID (builder, - "custom-shortcut-command-entry"); - g_signal_connect (custom_shortcut_command_entry, "changed", - G_CALLBACK (shortcut_entry_changed), NULL); - g_signal_connect (WID (builder, "add-toolbutton"), - "clicked", G_CALLBACK (add_button_clicked), builder); - g_signal_connect (WID (builder, "remove-toolbutton"), - "clicked", G_CALLBACK (remove_button_clicked), builder); - - gtk_dialog_set_default_response (GTK_DIALOG (custom_shortcut_dialog), - GTK_RESPONSE_OK); - - gtk_window_set_transient_for (GTK_WINDOW (custom_shortcut_dialog), - GTK_WINDOW (widget)); - - gtk_window_set_resizable (GTK_WINDOW (custom_shortcut_dialog), FALSE); -} - -static void -on_window_manager_change (const char *wm_name, CcPanel *panel) -{ - reload_sections (panel); -} - -void -keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder) -{ - g_object_set_data (G_OBJECT (panel), "builder", builder); -#ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) - wm_changed_id = wm_common_register_window_manager_change ((GFunc) on_window_manager_change, - panel); -#endif - pictures_regex = g_regex_new ("\\$PICTURES", 0, 0, NULL); - setup_dialog (panel, builder); - reload_sections (panel); -} - -gboolean -keyboard_shortcuts_set_section (CcPanel *panel, const char *section) -{ - GtkBuilder *builder; - GtkTreeModel *section_model; - GtkTreeIter iter; - gboolean found, cont; - - builder = g_object_get_data (G_OBJECT (panel), "builder"); - if (builder == NULL) - { - /* Remember the section name to be set later */ - g_object_set_data_full (G_OBJECT (panel), "section-to-set", g_strdup (section), g_free); - return TRUE; - } - section_model = gtk_tree_view_get_model (GTK_TREE_VIEW (WID (builder, "section_treeview"))); - cont = gtk_tree_model_get_iter_first (section_model, &iter); - found = FALSE; - while (cont) - { - char *id; - - gtk_tree_model_get (section_model, &iter, - SECTION_ID_COLUMN, &id, - -1); - - if (g_strcmp0 (id, section) == 0) - { - found = TRUE; - g_free (id); - break; - } - g_free (id); - cont = gtk_tree_model_iter_next (section_model, &iter); - } - if (found) - { - GtkTreeSelection *selection; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID (builder, "section_treeview"))); - gtk_tree_selection_select_iter (selection, &iter); + /* This label is displayed in a treeview cell displaying + * a disabled accelerator key combination. + */ + name = g_strdup (_("Disabled")); } else { - g_warning ("Could not find section '%s' to switch to.", section); - } - - return found; -} - -void -keyboard_shortcuts_dispose (CcPanel *panel) -{ - if (kb_system_sections != NULL) - { - g_hash_table_destroy (kb_system_sections); - kb_system_sections = NULL; - } - if (kb_apps_sections != NULL) - { - g_hash_table_destroy (kb_apps_sections); - kb_apps_sections = NULL; - } - if (kb_user_sections != NULL) - { - g_hash_table_destroy (kb_user_sections); - kb_user_sections = NULL; - } - if (pictures_regex != NULL) - { - g_regex_unref (pictures_regex); - pictures_regex = NULL; - } - - g_clear_object (&binding_settings); + name = gtk_accelerator_get_label_with_keycode (NULL, keysym, keycode, mask); - g_clear_pointer (&custom_shortcut_dialog, gtk_widget_destroy); - - if (wm_changed_id) - { - wm_common_unregister_window_manager_change (wm_changed_id); - wm_changed_id = NULL; + if (name == NULL) + name = gtk_accelerator_name_with_keycode (NULL, keysym, keycode, mask); } - cc_keyboard_option_clear_all (); + return name; } diff -Nru gnome-control-center-3.20.2/panels/keyboard/keyboard-shortcuts.h gnome-control-center-3.22.1/panels/keyboard/keyboard-shortcuts.h --- gnome-control-center-3.20.2/panels/keyboard/keyboard-shortcuts.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/keyboard-shortcuts.h 2016-09-27 12:37:36.000000000 +0000 @@ -21,6 +21,83 @@ #include #include -void keyboard_shortcuts_init (CcPanel *panel, GtkBuilder *builder); -gboolean keyboard_shortcuts_set_section (CcPanel *panel, const char *section); -void keyboard_shortcuts_dispose (CcPanel *panel); +#include "cc-keyboard-item.h" + +typedef struct { + /* The untranslated name, combine with ->package to translate */ + char *name; + /* The group of keybindings (system or application) */ + char *group; + /* The gettext package to use to translate the section title */ + char *package; + /* Name of the window manager the keys would apply to */ + char *wm_name; + /* The GSettings schema for the whole file, if any */ + char *schema; + /* an array of KeyListEntry */ + GArray *entries; +} KeyList; + +typedef struct +{ + CcKeyboardItemType type; + char *schema; /* GSettings schema name, if any */ + char *description; /* description for GSettings types */ + char *name; /* GSettings schema path, or GSettings key name depending on type */ + char *reverse_entry; + gboolean is_reversed; + gboolean hidden; +} KeyListEntry; + +typedef struct { + CcKeyboardItem *orig_item; + CcKeyboardItem *conflict_item; + guint new_keyval; + GdkModifierType new_mask; + guint new_keycode; +} CcUniquenessData; + +typedef enum +{ + SHORTCUT_TYPE_KEY_ENTRY, + SHORTCUT_TYPE_XKB_OPTION, +} ShortcutType; + +enum +{ + DETAIL_DESCRIPTION_COLUMN, + DETAIL_KEYENTRY_COLUMN, + DETAIL_TYPE_COLUMN, + DETAIL_N_COLUMNS +}; + +enum +{ + SECTION_DESCRIPTION_COLUMN, + SECTION_ID_COLUMN, + SECTION_GROUP_COLUMN, + SECTION_N_COLUMNS +}; + +gchar* find_free_settings_path (GSettings *settings); + +void fill_xkb_options_shortcuts (GtkTreeModel *model); + +void setup_keyboard_options (GtkListStore *store); + +gboolean is_valid_binding (guint keyval, + GdkModifierType mask, + guint keycode); + +gboolean is_empty_binding (guint keyval, + GdkModifierType mask, + guint keycode); + +gboolean is_valid_accel (guint keyval, + GdkModifierType mask); + +KeyList* parse_keylist_from_file (const gchar *path); + +gchar* convert_keysym_state_to_string (guint keysym, + GdkModifierType mask, + guint keycode); diff -Nru gnome-control-center-3.20.2/panels/keyboard/Makefile.am gnome-control-center-3.22.1/panels/keyboard/Makefile.am --- gnome-control-center-3.20.2/panels/keyboard/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -9,12 +9,16 @@ libkeyboard_la_SOURCES = \ $(BUILT_SOURCES) \ + cc-keyboard-manager.c \ + cc-keyboard-manager.h \ cc-keyboard-panel.c \ cc-keyboard-panel.h \ cc-keyboard-item.c \ cc-keyboard-item.h \ cc-keyboard-option.c \ cc-keyboard-option.h \ + cc-keyboard-shortcut-editor.c \ + cc-keyboard-shortcut-editor.h \ wm-common.c \ wm-common.h \ keyboard-shortcuts.c \ @@ -35,6 +39,9 @@ Desktop_in_files = gnome-keyboard-panel.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) +itsdir = $(datadir)/gettext/its +its_DATA = gnome-keybindings.loc gnome-keybindings.its + @INTLTOOL_XML_NOMERGE_RULE@ xmldir = $(pkgdatadir)/keybindings @@ -58,6 +65,11 @@ $(desktop_DATA) \ $(xml_DATA) \ $(BUILT_SOURCES) -EXTRA_DIST = $(xml_in_files) gnome-keybindings.pc.in $(resource_files) keyboard.gresource.xml +EXTRA_DIST = $(xml_in_files) \ + gnome-keybindings.its \ + gnome-keybindings.loc \ + gnome-keybindings.pc.in \ + $(resource_files) \ + keyboard.gresource.xml -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/keyboard/Makefile.in gnome-control-center-3.22.1/panels/keyboard/Makefile.in --- gnome-control-center-3.20.2/panels/keyboard/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -110,9 +110,11 @@ $(am__DEPENDENCIES_1) am__objects_1 = libkeyboard_la-cc-keyboard-resources.lo am_libkeyboard_la_OBJECTS = $(am__objects_1) \ + libkeyboard_la-cc-keyboard-manager.lo \ libkeyboard_la-cc-keyboard-panel.lo \ libkeyboard_la-cc-keyboard-item.lo \ libkeyboard_la-cc-keyboard-option.lo \ + libkeyboard_la-cc-keyboard-shortcut-editor.lo \ libkeyboard_la-wm-common.lo \ libkeyboard_la-keyboard-shortcuts.lo libkeyboard_la_OBJECTS = $(am_libkeyboard_la_OBJECTS) @@ -192,9 +194,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(desktopdir)" \ +am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(itsdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xmldir)" -DATA = $(desktop_DATA) $(pkgconfig_DATA) $(xml_DATA) +DATA = $(desktop_DATA) $(its_DATA) $(pkgconfig_DATA) $(xml_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -326,8 +328,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -464,12 +464,16 @@ libkeyboard_la_SOURCES = \ $(BUILT_SOURCES) \ + cc-keyboard-manager.c \ + cc-keyboard-manager.h \ cc-keyboard-panel.c \ cc-keyboard-panel.h \ cc-keyboard-item.c \ cc-keyboard-item.h \ cc-keyboard-option.c \ cc-keyboard-option.h \ + cc-keyboard-shortcut-editor.c \ + cc-keyboard-shortcut-editor.h \ wm-common.c \ wm-common.h \ keyboard-shortcuts.c \ @@ -481,6 +485,8 @@ desktopdir = $(datadir)/applications Desktop_in_files = gnome-keyboard-panel.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) +itsdir = $(datadir)/gettext/its +its_DATA = gnome-keybindings.loc gnome-keybindings.its xmldir = $(pkgdatadir)/keybindings xml_in_files = \ 00-multimedia.xml.in \ @@ -502,7 +508,13 @@ $(xml_DATA) \ $(BUILT_SOURCES) -EXTRA_DIST = $(xml_in_files) gnome-keybindings.pc.in $(resource_files) keyboard.gresource.xml +EXTRA_DIST = $(xml_in_files) \ + gnome-keybindings.its \ + gnome-keybindings.loc \ + gnome-keybindings.pc.in \ + $(resource_files) \ + keyboard.gresource.xml + all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -563,29 +575,34 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-item.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-option.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-panel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-resources.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-cc-keyboard-shortcut-editor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-keyboard-shortcuts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-wm-common.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -597,6 +614,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-cc-keyboard-resources.lo `test -f 'cc-keyboard-resources.c' || echo '$(srcdir)/'`cc-keyboard-resources.c +libkeyboard_la-cc-keyboard-manager.lo: cc-keyboard-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-cc-keyboard-manager.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-cc-keyboard-manager.Tpo -c -o libkeyboard_la-cc-keyboard-manager.lo `test -f 'cc-keyboard-manager.c' || echo '$(srcdir)/'`cc-keyboard-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeyboard_la-cc-keyboard-manager.Tpo $(DEPDIR)/libkeyboard_la-cc-keyboard-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-keyboard-manager.c' object='libkeyboard_la-cc-keyboard-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-cc-keyboard-manager.lo `test -f 'cc-keyboard-manager.c' || echo '$(srcdir)/'`cc-keyboard-manager.c + libkeyboard_la-cc-keyboard-panel.lo: cc-keyboard-panel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-cc-keyboard-panel.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-cc-keyboard-panel.Tpo -c -o libkeyboard_la-cc-keyboard-panel.lo `test -f 'cc-keyboard-panel.c' || echo '$(srcdir)/'`cc-keyboard-panel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeyboard_la-cc-keyboard-panel.Tpo $(DEPDIR)/libkeyboard_la-cc-keyboard-panel.Plo @@ -618,6 +642,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-cc-keyboard-option.lo `test -f 'cc-keyboard-option.c' || echo '$(srcdir)/'`cc-keyboard-option.c +libkeyboard_la-cc-keyboard-shortcut-editor.lo: cc-keyboard-shortcut-editor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-cc-keyboard-shortcut-editor.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-cc-keyboard-shortcut-editor.Tpo -c -o libkeyboard_la-cc-keyboard-shortcut-editor.lo `test -f 'cc-keyboard-shortcut-editor.c' || echo '$(srcdir)/'`cc-keyboard-shortcut-editor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeyboard_la-cc-keyboard-shortcut-editor.Tpo $(DEPDIR)/libkeyboard_la-cc-keyboard-shortcut-editor.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-keyboard-shortcut-editor.c' object='libkeyboard_la-cc-keyboard-shortcut-editor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-cc-keyboard-shortcut-editor.lo `test -f 'cc-keyboard-shortcut-editor.c' || echo '$(srcdir)/'`cc-keyboard-shortcut-editor.c + libkeyboard_la-wm-common.lo: wm-common.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-wm-common.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-wm-common.Tpo -c -o libkeyboard_la-wm-common.lo `test -f 'wm-common.c' || echo '$(srcdir)/'`wm-common.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkeyboard_la-wm-common.Tpo $(DEPDIR)/libkeyboard_la-wm-common.Plo @@ -658,6 +689,27 @@ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) +install-itsDATA: $(its_DATA) + @$(NORMAL_INSTALL) + @list='$(its_DATA)'; test -n "$(itsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(itsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(itsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(itsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(itsdir)" || exit $$?; \ + done + +uninstall-itsDATA: + @$(NORMAL_UNINSTALL) + @list='$(its_DATA)'; test -n "$(itsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(itsdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ @@ -788,7 +840,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xmldir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(itsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xmldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -847,8 +899,8 @@ info-am: -install-data-am: install-desktopDATA install-pkgconfigDATA \ - install-xmlDATA +install-data-am: install-desktopDATA install-itsDATA \ + install-pkgconfigDATA install-xmlDATA install-dvi: install-dvi-am @@ -894,8 +946,8 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-pkgconfigDATA \ - uninstall-xmlDATA +uninstall-am: uninstall-desktopDATA uninstall-itsDATA \ + uninstall-pkgconfigDATA uninstall-xmlDATA .MAKE: all check install install-am install-strip @@ -906,14 +958,14 @@ html-am info info-am install install-am install-data \ install-data-am install-desktopDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip install-xmlDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-desktopDATA uninstall-pkgconfigDATA \ - uninstall-xmlDATA + install-info install-info-am install-itsDATA install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip install-xmlDATA installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-desktopDATA \ + uninstall-itsDATA uninstall-pkgconfigDATA uninstall-xmlDATA .PRECIOUS: Makefile diff -Nru gnome-control-center-3.20.2/panels/keyboard/shortcut-editor.ui gnome-control-center-3.22.1/panels/keyboard/shortcut-editor.ui --- gnome-control-center-3.20.2/panels/keyboard/shortcut-editor.ui 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/keyboard/shortcut-editor.ui 2016-10-10 16:16:39.000000000 +0000 @@ -0,0 +1,418 @@ + + + + + + + + + + + + + diff -Nru gnome-control-center-3.20.2/panels/Makefile.in gnome-control-center-3.22.1/panels/Makefile.in --- gnome-control-center-3.20.2/panels/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/Makefile.in 2016-10-11 12:14:06.000000000 +0000 @@ -297,8 +297,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/mouse/cc-mouse-resources.c gnome-control-center-3.22.1/panels/mouse/cc-mouse-resources.c --- gnome-control-center-3.20.2/panels/mouse/cc-mouse-resources.c 2016-10-11 14:27:02.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/cc-mouse-resources.c 2016-10-11 12:14:32.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[268799]; const double alignment; void * const ptr;} cc_mouse_resource_data = { { +static const SECTION union { const guint8 data[270451]; const double alignment; void * const ptr;} cc_mouse_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, @@ -36,13 +36,13 @@ 0x78, 0xc6, 0x01, 0x00, 0x78, 0x81, 0x34, 0xdd, 0x03, 0x00, 0x00, 0x00, 0x78, 0xc6, 0x01, 0x00, 0x19, 0x00, 0x76, 0x00, 0x98, 0xc6, 0x01, 0x00, - 0x68, 0x20, 0x02, 0x00, 0xe0, 0x11, 0x4f, 0x3e, - 0x03, 0x00, 0x00, 0x00, 0x68, 0x20, 0x02, 0x00, - 0x0f, 0x00, 0x76, 0x00, 0x78, 0x20, 0x02, 0x00, - 0xb9, 0x0c, 0x04, 0x00, 0x4b, 0x1a, 0xee, 0xc4, - 0x03, 0x00, 0x00, 0x00, 0xb9, 0x0c, 0x04, 0x00, - 0x13, 0x00, 0x76, 0x00, 0xd0, 0x0c, 0x04, 0x00, - 0xff, 0x19, 0x04, 0x00, 0x6f, 0x72, 0x67, 0x2f, + 0xd8, 0x26, 0x02, 0x00, 0xe0, 0x11, 0x4f, 0x3e, + 0x03, 0x00, 0x00, 0x00, 0xd8, 0x26, 0x02, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0xe8, 0x26, 0x02, 0x00, + 0x29, 0x13, 0x04, 0x00, 0x4b, 0x1a, 0xee, 0xc4, + 0x03, 0x00, 0x00, 0x00, 0x29, 0x13, 0x04, 0x00, + 0x13, 0x00, 0x76, 0x00, 0x40, 0x13, 0x04, 0x00, + 0x73, 0x20, 0x04, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x01, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, @@ -14554,7 +14554,7 @@ 0x75, 0x73, 0x65, 0x2d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -14661,16 +14661,55 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, - 0x3e, 0x34, 0x36, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x34, 0x34, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, + 0x66, 0x73, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x72, 0x65, 0x66, 0x73, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, + 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x2d, + 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -14683,123 +14722,39 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x33, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x31, 0x33, 0x34, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, - 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, - 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x79, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x2e, 0x34, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, - 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x2e, 0x34, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x47, 0x65, 0x6e, - 0x65, 0x72, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x67, 0x65, 0x6e, 0x65, - 0x72, 0x61, 0x6c, 0x2d, 0x66, 0x72, 0x61, 0x6d, - 0x65, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -14811,68 +14766,34 @@ 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, - 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, - 0x64, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, - 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2d, 0x67, 0x72, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x47, 0x65, 0x6e, 0x65, + 0x72, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, + 0x61, 0x6c, 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, + 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -14885,118 +14806,74 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, 0x69, 0x6d, - 0x61, 0x72, 0x79, 0x20, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x2d, + 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x70, 0x72, 0x69, 0x6d, - 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x2d, 0x63, 0x68, 0x6f, 0x6f, 0x73, - 0x65, 0x72, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x3c, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, + 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x66, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, - 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, + 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -15009,51 +14886,86 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, - 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x32, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x2d, 0x6d, 0x6f, 0x64, - 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, 0x64, 0x3c, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, 0x74, 0x73, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x70, 0x68, - 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x73, 0x20, 0x6f, - 0x6e, 0x20, 0x6d, 0x69, 0x63, 0x65, 0x20, 0x61, - 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x75, 0x63, 0x68, - 0x70, 0x61, 0x64, 0x73, 0x2e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x20, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x63, + 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x2d, 0x67, + 0x72, 0x69, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, @@ -15064,7 +14976,7 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -15080,11 +14992,11 @@ 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2d, 0x63, 0x68, 0x6f, 0x6f, - 0x73, 0x65, 0x72, 0x2d, 0x67, 0x72, 0x69, 0x64, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x64, 0x65, 0x73, + 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -15097,73 +15009,83 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, + 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x68, 0x6f, 0x6d, - 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x69, 0x6e, - 0x6b, 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, - 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, - 0x65, 0x66, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x65, 0x74, 0x73, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, 0x6f, + 0x66, 0x20, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, + 0x61, 0x6c, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x6d, 0x69, + 0x63, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, + 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x73, + 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, + 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x2d, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, - 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, - 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x3c, 0x70, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, + 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x2d, + 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -15172,120 +15094,76 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x52, 0x69, 0x67, 0x68, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x2d, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, - 0x3e, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, - 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, - 0x6c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, + 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, - 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, - 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x2d, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x5f, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x2e, 0x34, 0x35, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -15294,162 +15172,160 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4d, 0x6f, 0x75, 0x73, 0x65, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x69, + 0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x2d, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x70, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, - 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x66, 0x72, - 0x61, 0x6d, 0x65, 0x2d, 0x6c, 0x69, 0x73, 0x74, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, + 0x75, 0x73, 0x65, 0x2d, 0x66, 0x72, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, - 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, - 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, - 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, - 0x64, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, - 0x65, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, - 0x65, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x33, 0x32, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x2e, + 0x34, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, + 0x6f, 0x75, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, - 0x65, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x65, 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x2d, + 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -15462,67 +15338,27 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x20, 0x53, 0x70, - 0x65, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2d, 0x63, 0x68, 0x6f, 0x6f, - 0x73, 0x65, 0x72, 0x2d, 0x67, 0x72, 0x69, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, - 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x6c, 0x69, 0x73, + 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -15535,113 +15371,17 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x3e, 0x61, 0x64, 0x6a, 0x75, - 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x30, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, 0x73, - 0x70, 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, - 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, - 0x3a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x44, 0x6f, 0x75, 0x62, - 0x6c, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x20, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, + 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, - 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, - 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, - 0x73, 0x65, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, - 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x67, 0x72, 0x69, - 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, + 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x72, 0x6f, + 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -15649,149 +15389,146 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, - 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, - 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, + 0x73, 0x65, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, - 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, - 0x69, 0x73, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x20, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, - 0x65, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, - 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, - 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6d, - 0x69, 0x63, 0x65, 0x73, 0x2e, 0x20, 0x54, 0x68, - 0x65, 0x20, 0x74, 0x65, 0x72, 0x6d, 0x20, 0x75, - 0x73, 0x65, 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x65, - 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x4f, - 0x53, 0x20, 0x58, 0x20, 0x73, 0x6f, 0x20, 0x75, - 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, - 0x61, 0x6d, 0x65, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x69, 0x66, 0x20, 0x70, 0x6f, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x2e, 0x22, 0x3e, 0x4e, 0x61, - 0x74, 0x75, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x33, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x6e, - 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, - 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, - 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, + 0x73, 0x65, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4d, 0x6f, 0x75, 0x73, 0x65, 0x20, 0x53, + 0x70, 0x65, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, - 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, - 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, - 0x67, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x63, 0x68, 0x6f, + 0x6f, 0x73, 0x65, 0x72, 0x2d, 0x67, 0x72, 0x69, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, + 0x65, 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -15800,90 +15537,62 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, - 0x67, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x73, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2c, 0x20, 0x6e, 0x6f, 0x74, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x69, 0x65, - 0x77, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, - 0x65, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, - 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, - 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, + 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x61, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x30, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x5f, + 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x2d, 0x61, 0x74, 0x6b, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, + 0x74, 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3a, 0x3a, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x2d, 0x64, 0x65, 0x73, + 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x44, 0x6f, 0x75, + 0x62, 0x6c, 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, @@ -15911,154 +15620,39 @@ 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, - 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, - 0x61, 0x64, 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, - 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, - 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x5f, 0x79, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x2e, 0x34, 0x35, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, + 0x65, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, + 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x6f, 0x77, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x66, 0x72, - 0x61, 0x6d, 0x65, 0x2d, 0x6c, 0x69, 0x73, 0x74, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, - 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, - 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, - 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, + 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, + 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, + 0x6e, 0x67, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -16067,125 +15661,100 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, - 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, - 0x70, 0x61, 0x64, 0x2d, 0x74, 0x6f, 0x67, 0x67, - 0x6c, 0x65, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x74, 0x6f, - 0x67, 0x67, 0x6c, 0x65, 0x2d, 0x67, 0x72, 0x69, - 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x33, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x75, + 0x73, 0x65, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, + 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, + 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, - 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, - 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x3c, 0x2f, 0x70, + 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, + 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, 0x73, + 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, + 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x73, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x64, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6d, 0x69, 0x63, + 0x65, 0x73, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, + 0x74, 0x65, 0x72, 0x6d, 0x20, 0x75, 0x73, 0x65, + 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x20, + 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x4f, 0x53, 0x20, + 0x58, 0x20, 0x73, 0x6f, 0x20, 0x75, 0x73, 0x65, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, + 0x65, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x66, + 0x20, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x2e, 0x22, 0x3e, 0x4e, 0x61, 0x74, 0x75, + 0x72, 0x61, 0x6c, 0x20, 0x53, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -16196,9 +15765,10 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, - 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, - 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x2d, 0x73, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6d, + 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x6e, 0x61, 0x74, + 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, @@ -16227,138 +15797,224 @@ 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, - 0x64, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, - 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x6e, 0x61, + 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x20, + 0x6d, 0x6f, 0x76, 0x65, 0x73, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2c, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x76, 0x69, 0x65, 0x77, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, + 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, + 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, + 0x67, 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, - 0x22, 0x3e, 0x47, 0x44, 0x4b, 0x5f, 0x50, 0x4f, - 0x49, 0x4e, 0x54, 0x45, 0x52, 0x5f, 0x4d, 0x4f, - 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, 0x41, 0x53, - 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 0x5f, - 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x5f, - 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x48, - 0x49, 0x4e, 0x54, 0x5f, 0x4d, 0x41, 0x53, 0x4b, - 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 0x5f, 0x42, - 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, 0x50, 0x52, - 0x45, 0x53, 0x53, 0x5f, 0x4d, 0x41, 0x53, 0x4b, - 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 0x5f, 0x42, - 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, 0x52, 0x45, - 0x4c, 0x45, 0x41, 0x53, 0x45, 0x5f, 0x4d, 0x41, - 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, + 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, + 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, - 0x68, 0x70, 0x61, 0x64, 0x2d, 0x73, 0x65, 0x70, - 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2d, 0x72, - 0x6f, 0x77, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x5f, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x2e, 0x34, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, + 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x33, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, - 0x64, 0x2d, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x31, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x62, 0x6f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x54, 0x6f, 0x75, 0x63, 0x68, + 0x70, 0x61, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, + 0x70, 0x61, 0x64, 0x2d, 0x66, 0x72, 0x61, 0x6d, + 0x65, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, @@ -16369,15 +16025,76 @@ 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, - 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x6c, 0x69, 0x73, - 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, + 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, + 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6c, 0x69, + 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, + 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, + 0x64, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, + 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -16390,37 +16107,16 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, - 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, - 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x66, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, + 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, - 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, - 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6e, 0x61, - 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, @@ -16441,7 +16137,7 @@ 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x3e, 0x33, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, @@ -16474,79 +16170,129 @@ 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, - 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, - 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x61, 0x64, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x54, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, - 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, 0x73, - 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x20, - 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x73, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x64, - 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x75, - 0x63, 0x68, 0x70, 0x61, 0x64, 0x73, 0x2e, 0x20, - 0x54, 0x68, 0x65, 0x20, 0x74, 0x65, 0x72, 0x6d, - 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x63, 0x6f, - 0x6d, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, - 0x20, 0x4f, 0x53, 0x20, 0x58, 0x20, 0x73, 0x6f, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x69, 0x66, 0x20, 0x70, 0x6f, 0x73, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2e, 0x20, 0x22, - 0x3e, 0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, - 0x20, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, + 0x61, 0x64, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, + 0x68, 0x70, 0x61, 0x64, 0x2d, 0x74, 0x6f, 0x67, + 0x67, 0x6c, 0x65, 0x2d, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x74, 0x6f, 0x75, 0x63, - 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, + 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, + 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, + 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, + 0x44, 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, + 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, + 0x4e, 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, + 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, + 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, + 0x5f, 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, + 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, + 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, + 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, + 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -16560,124 +16306,296 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x74, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, + 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x6c, 0x69, 0x73, + 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, + 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, + 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x6e, 0x67, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x66, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, + 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, + 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, + 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x67, 0x72, 0x69, + 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, + 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, + 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, + 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x20, 0x72, 0x65, 0x76, + 0x65, 0x72, 0x73, 0x65, 0x73, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x69, 0x6e, 0x67, 0x20, 0x64, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, + 0x72, 0x20, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, + 0x61, 0x64, 0x73, 0x2e, 0x20, 0x54, 0x68, 0x65, + 0x20, 0x74, 0x65, 0x72, 0x6d, 0x20, 0x75, 0x73, + 0x65, 0x64, 0x20, 0x63, 0x6f, 0x6d, 0x65, 0x73, + 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x4f, 0x53, + 0x20, 0x58, 0x20, 0x73, 0x6f, 0x20, 0x75, 0x73, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, + 0x6d, 0x65, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, + 0x66, 0x20, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2e, 0x20, 0x22, 0x3e, 0x4e, 0x61, + 0x74, 0x75, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, + 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, + 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x73, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2c, 0x20, 0x6e, 0x6f, - 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x69, - 0x65, 0x77, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, - 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, - 0x22, 0x30, 0x2e, 0x39, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x20, + 0x6d, 0x6f, 0x76, 0x65, 0x73, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2c, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x76, 0x69, 0x65, 0x77, 0x2e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, + 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, @@ -16685,142 +16603,46 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, - 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, - 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x72, - 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, - 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, - 0x64, 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, - 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x38, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, + 0x61, 0x64, 0x2d, 0x6e, 0x61, 0x74, 0x75, 0x72, + 0x61, 0x6c, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, + 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, - 0x61, 0x64, 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, - 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x20, - 0x53, 0x70, 0x65, 0x65, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, - 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, - 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -16834,286 +16656,395 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, - 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x73, - 0x70, 0x65, 0x65, 0x64, 0x2d, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, + 0x63, 0x68, 0x70, 0x61, 0x64, 0x2d, 0x73, 0x70, + 0x65, 0x65, 0x64, 0x2d, 0x72, 0x6f, 0x77, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, + 0x70, 0x61, 0x64, 0x2d, 0x73, 0x70, 0x65, 0x65, + 0x64, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x6d, 0x65, 0x6e, 0x74, 0x31, 0x31, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, 0x68, - 0x70, 0x61, 0x64, 0x5f, 0x73, 0x70, 0x65, 0x65, - 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, - 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x2d, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, - 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x2d, 0x72, 0x6f, 0x77, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, 0x63, + 0x68, 0x70, 0x61, 0x64, 0x2d, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x54, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, + 0x64, 0x20, 0x53, 0x70, 0x65, 0x65, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, + 0x64, 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x2d, 0x67, 0x72, 0x69, - 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x33, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x6f, 0x75, 0x63, 0x68, 0x70, 0x61, 0x64, + 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, + 0x6e, 0x74, 0x22, 0x3e, 0x61, 0x64, 0x6a, 0x75, + 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x31, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, - 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, + 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x6f, 0x75, + 0x63, 0x68, 0x70, 0x61, 0x64, 0x5f, 0x73, 0x70, + 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, + 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x44, 0x6f, 0x75, 0x62, 0x6c, + 0x65, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, + 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x61, 0x70, 0x2d, 0x74, 0x6f, + 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x2d, 0x72, + 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x66, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, + 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x2d, 0x67, 0x72, 0x69, 0x64, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, - 0x69, 0x63, 0x6b, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x33, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, + 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x54, 0x61, 0x70, 0x20, 0x74, 0x6f, - 0x20, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x3c, 0x2f, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x74, 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x2d, 0x73, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x54, 0x61, 0x70, 0x20, 0x74, 0x6f, 0x20, + 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, - 0x69, 0x63, 0x6b, 0x2d, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, + 0x61, 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x2d, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -17127,43 +17058,101 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, + 0x70, 0x2d, 0x74, 0x6f, 0x2d, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, - 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, - 0x6e, 0x67, 0x2d, 0x72, 0x6f, 0x77, 0x22, 0x3e, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x77, 0x6f, 0x2d, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x6f, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x61, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x77, 0x6f, 0x2d, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, @@ -17217,87 +17206,174 @@ 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, 0x2d, - 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, - 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x64, 0x3d, 0x22, 0x74, 0x77, 0x6f, 0x2d, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x77, + 0x6f, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, + 0x20, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, + 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, + 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x3e, 0x74, 0x77, 0x6f, 0x2d, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2d, 0x73, + 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, + 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x77, 0x6f, 0x2d, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x45, 0x64, 0x67, 0x65, 0x20, 0x53, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, + 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, 0x72, + 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x6f, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, 0x2d, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, + 0x67, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -17306,17 +17382,98 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x33, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, + 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, + 0x6e, 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x45, 0x64, 0x67, 0x65, 0x20, 0x53, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x2d, + 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, @@ -17324,7 +17481,7 @@ 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, @@ -17337,12 +17494,61 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x64, 0x67, 0x65, 0x2d, 0x73, + 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, + 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, @@ -33185,7 +33391,7 @@ 0x29, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2d, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0x1f, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x23, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -33233,39 +33439,6 @@ 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, - 0x3e, 0x35, 0x34, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, @@ -33276,280 +33449,79 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, - 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, 0x5f, - 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x5f, - 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, - 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, - 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, - 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, - 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, 0x41, - 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, - 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, - 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, 0x41, - 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, - 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, - 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x5f, - 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x35, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x79, - 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x2c, 0x20, 0x64, 0x6f, 0x75, 0x62, 0x6c, - 0x65, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x2c, 0x20, 0x73, 0x63, 0x72, 0x6f, - 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, - 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x77, 0x69, - 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, - 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x5f, 0x77, 0x69, - 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x61, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x22, 0x3e, 0x6e, 0x65, 0x76, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, - 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, - 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x56, 0x69, 0x65, 0x77, - 0x70, 0x6f, 0x72, 0x74, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x76, 0x69, 0x65, 0x77, 0x70, 0x6f, - 0x72, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, + 0x65, 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, + 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, + 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, + 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, + 0x47, 0x44, 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, + 0x54, 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, + 0x4f, 0x4e, 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, + 0x44, 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, + 0x4e, 0x5f, 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, + 0x44, 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, + 0x4e, 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, + 0x45, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x3e, - 0x2f, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x6e, 0x6f, - 0x6d, 0x65, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x2f, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2f, - 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x2d, 0x74, - 0x65, 0x73, 0x74, 0x2e, 0x73, 0x76, 0x67, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, - 0x72, 0x61, 0x77, 0x69, 0x6e, 0x67, 0x41, 0x72, - 0x65, 0x61, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x64, - 0x72, 0x61, 0x77, 0x69, 0x6e, 0x67, 0x5f, 0x61, - 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3e, 0x31, 0x38, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x22, 0x3e, 0x31, 0x38, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, 0x74, - 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, 0x5f, 0x42, - 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, 0x50, 0x52, - 0x45, 0x53, 0x53, 0x5f, 0x4d, 0x41, 0x53, 0x4b, - 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 0x5f, 0x42, - 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, 0x52, 0x45, - 0x4c, 0x45, 0x41, 0x53, 0x45, 0x5f, 0x4d, 0x41, - 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, - 0x5f, 0x53, 0x54, 0x52, 0x55, 0x43, 0x54, 0x55, - 0x52, 0x45, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x79, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x2c, 0x20, 0x64, 0x6f, 0x75, + 0x62, 0x6c, 0x65, 0x20, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x2c, 0x20, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x32, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, @@ -33575,38 +33547,273 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, + 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x73, + 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x5f, + 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x61, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x73, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, 0x6e, + 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, + 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x22, 0x3e, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, + 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x34, 0x34, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x56, 0x69, 0x65, 0x77, 0x70, 0x6f, 0x72, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x69, + 0x65, 0x77, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, + 0x69, 0x64, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x22, 0x3e, 0x32, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x32, 0x35, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x22, 0x3e, 0x2f, 0x6f, 0x72, 0x67, + 0x2f, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x6d, 0x6f, + 0x75, 0x73, 0x65, 0x2f, 0x73, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x2e, + 0x73, 0x76, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x44, 0x72, 0x61, 0x77, 0x69, + 0x6e, 0x67, 0x41, 0x72, 0x65, 0x61, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x64, 0x72, 0x61, 0x77, 0x69, + 0x6e, 0x67, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x72, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, + 0x31, 0x38, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x31, 0x38, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x47, + 0x44, 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, + 0x4e, 0x5f, 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, + 0x44, 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, + 0x4e, 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, + 0x45, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, + 0x20, 0x47, 0x44, 0x4b, 0x5f, 0x53, 0x54, 0x52, + 0x55, 0x43, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x4d, + 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x32, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29 + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29 } }; static GStaticResource static_resource = { cc_mouse_resource_data.data, sizeof (cc_mouse_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/mouse/gnome-mouse-panel.desktop.in.in gnome-control-center-3.22.1/panels/mouse/gnome-mouse-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/mouse/gnome-mouse-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/gnome-mouse-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Mouse & Touchpad +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Mouse & Touch­pad _Comment=Change your mouse or touchpad sensitivity and select right or left-handed Exec=gnome-control-center mouse Icon=input-mouse @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/mouse/gnome-mouse-properties.c gnome-control-center-3.22.1/panels/mouse/gnome-mouse-properties.c --- gnome-control-center-3.20.2/panels/mouse/gnome-mouse-properties.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/gnome-mouse-properties.c 2016-08-12 12:43:57.000000000 +0000 @@ -76,6 +76,7 @@ setup_touchpad_options (CcMousePropertiesPrivate *d) { gboolean edge_scroll_enabled; + gboolean two_finger_scroll_enabled; gboolean have_two_finger_scrolling; gboolean have_edge_scrolling; gboolean have_tap_to_click; @@ -92,13 +93,43 @@ gtk_widget_show_all (WID ("touchpad-frame")); - gtk_widget_set_visible (WID ("edge-scrolling-row"), have_edge_scrolling && !have_two_finger_scrolling); + gtk_widget_set_visible (WID ("two-finger-scrolling-row"), have_two_finger_scrolling); + gtk_widget_set_visible (WID ("edge-scrolling-row"), have_edge_scrolling); gtk_widget_set_visible (WID ("tap-to-click-row"), have_tap_to_click); edge_scroll_enabled = g_settings_get_boolean (d->touchpad_settings, "edge-scrolling-enabled"); - d->changing_scroll = TRUE; - gtk_switch_set_active (GTK_SWITCH (WID ("edge-scrolling-switch")), edge_scroll_enabled); - d->changing_scroll = FALSE; + two_finger_scroll_enabled = g_settings_get_boolean (d->touchpad_settings, "two-finger-scrolling-enabled"); + if (edge_scroll_enabled && two_finger_scroll_enabled) { + /* You cunning user set both, but you can only have one set in that UI */ + d->changing_scroll = TRUE; + gtk_switch_set_active (GTK_SWITCH (WID ("two-finger-scrolling-switch")), two_finger_scroll_enabled); + d->changing_scroll = FALSE; + gtk_switch_set_active (GTK_SWITCH (WID ("edge-scrolling-switch")), FALSE); + } else { + d->changing_scroll = TRUE; + gtk_switch_set_active (GTK_SWITCH (WID ("edge-scrolling-switch")), edge_scroll_enabled); + gtk_switch_set_active (GTK_SWITCH (WID ("two-finger-scrolling-switch")), two_finger_scroll_enabled); + d->changing_scroll = FALSE; + } +} + +static void +two_finger_scrolling_changed_event (GtkSwitch *button, + gboolean state, + gpointer user_data) +{ + CcMousePropertiesPrivate *d = user_data; + + if (d->changing_scroll) + return; + + g_settings_set_boolean (d->touchpad_settings, "two-finger-scrolling-enabled", state); + gtk_switch_set_state (button, state); + + if (state && gtk_widget_get_visible (WID ("edge-scrolling-row"))) { + /* Disable edge scrolling if two-finger scrolling is enabled */ + gtk_switch_set_state (GTK_SWITCH (WID ("edge-scrolling-switch")), FALSE); + } } static void @@ -111,8 +142,13 @@ if (d->changing_scroll) return; - g_settings_set_boolean (d->touchpad_settings, "edge-scrolling-switch", state); + g_settings_set_boolean (d->touchpad_settings, "edge-scrolling-enabled", state); gtk_switch_set_state (button, state); + + if (state && gtk_widget_get_visible (WID ("two-finger-scrolling-row"))) { + /* Disable two-finger scrolling if edge scrolling is enabled */ + gtk_switch_set_state (GTK_SWITCH (WID ("two-finger-scrolling-switch")), FALSE); + } } static gboolean @@ -210,6 +246,7 @@ G_SETTINGS_BIND_DEFAULT); gtk_list_box_set_header_func (GTK_LIST_BOX (WID ("general-listbox")), cc_list_box_update_header_func, NULL, NULL); + gtk_list_box_set_header_func (GTK_LIST_BOX (WID ("touchpad-listbox")), cc_list_box_update_header_func, NULL, NULL); /* Mouse section */ gtk_widget_set_visible (WID ("mouse-frame"), d->have_mouse); @@ -231,7 +268,7 @@ touchpad_enabled_set_mapping, NULL, NULL); g_settings_bind_with_mapping (d->touchpad_settings, "send-events", - WID ("touchpad-options-box"), "sensitive", + WID ("touchpad-options-listbox"), "sensitive", G_SETTINGS_BIND_GET, touchpad_enabled_get_mapping, touchpad_enabled_set_mapping, @@ -253,6 +290,8 @@ g_signal_connect (WID ("edge-scrolling-switch"), "state-set", G_CALLBACK (edge_scrolling_changed_event), d); + g_signal_connect (WID ("two-finger-scrolling-switch"), "state-set", + G_CALLBACK (two_finger_scrolling_changed_event), d); gtk_list_box_set_header_func (GTK_LIST_BOX (WID ("touchpad-options-listbox")), cc_list_box_update_header_func, NULL, NULL); } diff -Nru gnome-control-center-3.20.2/panels/mouse/gnome-mouse-properties.ui gnome-control-center-3.22.1/panels/mouse/gnome-mouse-properties.ui --- gnome-control-center-3.20.2/panels/mouse/gnome-mouse-properties.ui 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/gnome-mouse-properties.ui 2016-08-12 12:43:57.000000000 +0000 @@ -21,13 +21,12 @@ True none never - 460 + 440 True False - 134 - 134 + center 12 12 vertical @@ -67,6 +66,7 @@ True True + false True @@ -200,6 +200,7 @@ True True + false True @@ -258,6 +259,7 @@ True True + false True @@ -370,6 +372,7 @@ True True + false True @@ -418,258 +421,301 @@ + + + + + true + horizontal + + + + + True + True + none - + True - False - False - False + True + false - + True False + 0 + 16 + 12 + 6 + 6 + 6 + center + + + True + False + True + 0 + Natural Scrolling + True + touchpad-natural-scrolling-switch + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Scrolling moves the content, not the view. + + + + + + + 0 + 1 + 1 + 1 + + + + + True + True + end + center + + + 1 + 0 + 1 + 2 + + - - - - - True - False - + True True - none + false - + True - True + False + 0 + 16 + 12 + 6 + 8 + 8 + center - + True False - 0 - 16 - 12 - 6 - 6 - 6 - center - - - True - False - True - 0 - Natural Scrolling - True - touchpad-natural-scrolling-switch - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - Scrolling moves the content, not the view. - - - - - - - 0 - 1 - 1 - 1 - - - - - True - True - end - center + 0 + end + Touchpad Speed + True + touchpad-speed-scale + + + 0 + 0 + 1 + 1 + + + + + True + True + adjustment11 + False + True + end + + + Double-click timeout - - 1 - 0 - 1 - 2 - + + 1 + 0 + 1 + 2 + + + + + + False + True + false - + True - True + False + 0 + 32 + 12 + 6 + 6 + 6 + center - + True False - 0 - 16 - 12 - 6 - 8 - 8 + True + 0 + end + Tap to Click + True + tap-to-click-switch + + + 0 + 0 + 1 + 1 + + + + + True + True + end center - - - True - False - 0 - end - Touchpad Speed - True - touchpad-speed-scale - - - 0 - 0 - 1 - 1 - - - - - True - True - adjustment11 - False - True - end - - - Double-click timeout - - - - - 1 - 0 - 1 - 2 - - + + 1 + 0 + 1 + 2 + + + + + + False + True + True + false - - False - True + + True + False + 0 + 32 + 12 + 6 + 6 + 6 + center - + True False - 0 - 32 - 12 - 6 - 6 - 6 + True + 0 + end + Two-finger Scrolling + True + two-finger-scrolling-switch + + + 0 + 0 + 1 + 1 + + + + + True + True + end center - - - True - False - True - 0 - end - Tap to Click - True - tap-to-click-switch - - - 0 - 0 - 1 - 1 - - - - - True - True - end - center - - - 1 - 0 - 1 - 2 - - + + 1 + 0 + 1 + 2 + + + + + + False + True + True + false - - False - True - True + + True + False + 0 + 32 + 12 + 6 + 6 + 6 + center - + True False - 0 - 32 - 12 - 6 - 6 - 6 + True + 0 + end + Edge Scrolling + True + edge-scrolling-switch + + + 0 + 0 + 1 + 1 + + + + + True + True + end center - - - True - False - True - 0 - end - Edge Scrolling - True - edge-scrolling-switch - - - 0 - 0 - 1 - 1 - - - - - True - True - end - center - - - 1 - 0 - 1 - 2 - - + + 1 + 0 + 1 + 2 + diff -Nru gnome-control-center-3.20.2/panels/mouse/gnome-mouse-test.ui gnome-control-center-3.22.1/panels/mouse/gnome-mouse-test.ui --- gnome-control-center-3.20.2/panels/mouse/gnome-mouse-test.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/gnome-mouse-test.ui 2016-08-12 12:43:57.000000000 +0000 @@ -8,7 +8,6 @@ 10 - 540 True False True @@ -41,6 +40,7 @@ never always in + 440 True diff -Nru gnome-control-center-3.20.2/panels/mouse/Makefile.in gnome-control-center-3.22.1/panels/mouse/Makefile.in --- gnome-control-center-3.20.2/panels/mouse/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/mouse/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -329,8 +329,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -578,22 +576,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gnome_mouse_test-test-gnome-mouse-test.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/network/cc-network-panel.c gnome-control-center-3.22.1/panels/network/cc-network-panel.c --- gnome-control-center-3.20.2/panels/network/cc-network-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/cc-network-panel.c 2016-08-12 12:43:57.000000000 +0000 @@ -26,21 +26,14 @@ #include "cc-network-panel.h" #include "cc-network-resources.h" -#include "nm-remote-settings.h" -#include "nm-client.h" -#include "nm-device.h" -#include "nm-device-modem.h" -#include "nm-ui-utils.h" +#include #include "net-device.h" #include "net-device-mobile.h" #include "net-device-wifi.h" #include "net-device-ethernet.h" -#include "net-device-bond.h" -#include "net-device-bridge.h" #include "net-object.h" #include "net-proxy.h" -#include "net-virtual-device.h" #include "net-vpn.h" #include "panel-common.h" @@ -71,7 +64,6 @@ GtkWidget *treeview; NMClient *client; MMManager *modem_manager; - NMRemoteSettings *remote_settings; gboolean updating_device; /* Killswitch stuff */ @@ -234,7 +226,6 @@ g_clear_object (&priv->builder); g_clear_object (&priv->client); g_clear_object (&priv->modem_manager); - g_clear_object (&priv->remote_settings); g_clear_object (&priv->kill_switch_header); priv->rfkill_switch = NULL; @@ -537,7 +528,7 @@ nm_devices = (NMDevice **)nmdarray->pdata; num_devices = ndarray->len; - titles = nma_utils_disambiguate_device_names (nm_devices, num_devices); + titles = nm_device_disambiguate_names (nm_devices, num_devices); for (i = 0; i < num_devices; i++) { net_object_set_title (NET_OBJECT (devices[i]), titles[i]); g_free (titles[i]); @@ -568,21 +559,21 @@ select_tree_iter (panel, iter); if (priv->arg_operation == OPERATION_CREATE_WIFI) - cc_network_panel_create_wifi_network (toplevel, priv->client, priv->remote_settings); + cc_network_panel_create_wifi_network (toplevel, priv->client); else - cc_network_panel_connect_to_hidden_network (toplevel, priv->client, priv->remote_settings); + cc_network_panel_connect_to_hidden_network (toplevel, priv->client); reset_command_line_args (panel); /* done */ return TRUE; } else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) { if (priv->arg_operation == OPERATION_CONNECT_MOBILE) { - cc_network_panel_connect_to_3g_network (toplevel, priv->client, priv->remote_settings, device); + cc_network_panel_connect_to_3g_network (toplevel, priv->client, device); reset_command_line_args (panel); /* done */ select_tree_iter (panel, iter); return TRUE; } else if (priv->arg_operation == OPERATION_CONNECT_8021X) { - cc_network_panel_connect_to_8021x_network (toplevel, priv->client, priv->remote_settings, device, priv->arg_access_point); + cc_network_panel_connect_to_8021x_network (toplevel, priv->client, device, priv->arg_access_point); reset_command_line_args (panel); /* done */ select_tree_iter (panel, iter); return TRUE; @@ -645,7 +636,7 @@ g_object_get (object_tmp, "nm-device", &device, NULL); done = handle_argv_for_device (panel, device, &iter); g_object_unref (device); - } else if (NET_IS_VPN (object_tmp) || NET_IS_VIRTUAL_DEVICE (object_tmp)) { + } else if (NET_IS_VPN (object_tmp)) { g_object_get (object_tmp, "connection", &connection, NULL); done = handle_argv_for_connection (panel, connection, &iter); g_object_unref (connection); @@ -728,10 +719,6 @@ case NM_DEVICE_TYPE_WIFI: device_g_type = NET_TYPE_DEVICE_WIFI; break; - case NM_DEVICE_TYPE_BOND: - case NM_DEVICE_TYPE_BRIDGE: - case NM_DEVICE_TYPE_VLAN: - goto out; default: device_g_type = NET_TYPE_DEVICE_SIMPLE; break; @@ -743,7 +730,6 @@ "removable", FALSE, "cancellable", panel->priv->cancellable, "client", panel->priv->client, - "remote-settings", panel->priv->remote_settings, "nm-device", device, "id", nm_device_get_udi (device), NULL); @@ -999,7 +985,7 @@ for (j = 0; devices && j < devices->len; j++) g_debug (" %s", nm_device_get_udi (g_ptr_array_index (devices, j))); if (NM_IS_VPN_CONNECTION (connection)) - g_debug (" VPN base connection: %s", nm_active_connection_get_specific_object (connection)); + g_debug (" VPN base connection: %s", nm_active_connection_get_specific_object_path (connection)); if (g_object_get_data (G_OBJECT (connection), "has-state-changed-handler") == NULL) { g_signal_connect_object (connection, "notify::state", @@ -1036,7 +1022,7 @@ CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data); /* clear all devices we added */ - if (!nm_client_get_manager_running (client)) { + if (!nm_client_get_nm_running (client)) { g_debug ("NM disappeared"); liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder, "liststore_devices")); @@ -1118,14 +1104,13 @@ if (find_in_model_by_id (panel, id, NULL) != NULL) return; - /* add as a virtual object */ + /* add as a VPN object */ net_vpn = g_object_new (NET_TYPE_VPN, "panel", panel, "removable", TRUE, "id", id, "connection", connection, "client", panel->priv->client, - "remote-settings", panel->priv->remote_settings, NULL); g_signal_connect_object (net_vpn, "removed", G_CALLBACK (object_removed_cb), panel, 0); @@ -1156,72 +1141,6 @@ } static void -panel_add_virtual_device (CcNetworkPanel *panel, NMConnection *connection) -{ - gchar *title; - GtkListStore *liststore_devices; - GtkTreeIter iter; - NetVirtualDevice *net_virt; - const gchar *id; - GtkNotebook *notebook; - GtkSizeGroup *size_group; - NMSettingConnection *s_con; - const gchar *connection_type; - GType device_g_type; - - /* does already exist */ - id = nm_connection_get_path (connection); - if (find_in_model_by_id (panel, id, NULL) != NULL) - return; - - /* map the NMConnection to a NetDevice GType */ - s_con = nm_connection_get_setting_connection (connection); - connection_type = nm_setting_connection_get_connection_type (s_con); - if (!strcmp (connection_type, NM_SETTING_BOND_SETTING_NAME)) - device_g_type = NET_TYPE_DEVICE_BOND; - else if (!strcmp (connection_type, NM_SETTING_BRIDGE_SETTING_NAME)) - device_g_type = NET_TYPE_DEVICE_BRIDGE; - else - device_g_type = NET_TYPE_VIRTUAL_DEVICE; - - /* add as a virtual object */ - net_virt = g_object_new (device_g_type, - "panel", panel, - "removable", TRUE, - "id", id, - "connection", connection, - "client", panel->priv->client, - "remote-settings", panel->priv->remote_settings, - NULL); - g_signal_connect_object (net_virt, "removed", - G_CALLBACK (object_removed_cb), panel, 0); - - /* add as a panel */ - notebook = GTK_NOTEBOOK (gtk_builder_get_object (panel->priv->builder, - "notebook_types")); - size_group = GTK_SIZE_GROUP (gtk_builder_get_object (panel->priv->builder, - "sizegroup1")); - net_object_add_to_notebook (NET_OBJECT (net_virt), - notebook, - size_group); - - liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (panel->priv->builder, - "liststore_devices")); - title = nma_utils_get_connection_device_name (connection); - - net_object_set_title (NET_OBJECT (net_virt), title); - gtk_list_store_append (liststore_devices, &iter); - gtk_list_store_set (liststore_devices, - &iter, - PANEL_DEVICES_COLUMN_ICON, "network-wired-symbolic", - PANEL_DEVICES_COLUMN_SORT, "2", - PANEL_DEVICES_COLUMN_OBJECT, net_virt, - -1); - g_free (title); - g_object_unref (net_virt); -} - -static void add_connection (CcNetworkPanel *panel, NMConnection *connection) { @@ -1231,55 +1150,30 @@ s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); type = nm_setting_connection_get_connection_type (s_con); - iface = nm_connection_get_virtual_iface_name (connection); + iface = nm_connection_get_interface_name (connection); if (g_strcmp0 (type, "vpn") != 0 && iface == NULL) return; -#ifdef HAVE_NM_UNSTABLE /* Don't add the libvirtd bridge to the UI */ if (g_strcmp0 (nm_setting_connection_get_interface_name (s_con), "virbr0") == 0) return; -#endif g_debug ("add %s/%s remote connection: %s", type, g_type_name_from_instance ((GTypeInstance*)connection), nm_connection_get_path (connection)); - if (iface) - panel_add_virtual_device (panel, connection); - else + if (!iface) panel_add_vpn_device (panel, connection); } static void -notify_new_connection_cb (NMRemoteSettings *settings, - NMRemoteConnection *connection, - CcNetworkPanel *panel) +notify_connection_added_cb (NMClient *client, + NMRemoteConnection *connection, + CcNetworkPanel *panel) { add_connection (panel, NM_CONNECTION (connection)); } static void -notify_connections_read_cb (NMRemoteSettings *settings, - CcNetworkPanel *panel) -{ - GSList *list, *iter; - NMConnection *connection; - - list = nm_remote_settings_list_connections (settings); - g_debug ("%p has %i remote connections", - panel, g_slist_length (list)); - for (iter = list; iter; iter = g_slist_next (iter)) { - connection = NM_CONNECTION (iter->data); - add_connection (panel, connection); - } - g_slist_free (list); - - - g_debug ("Calling handle_argv() after cold-plugging connections"); - handle_argv (panel); -} - -static void panel_check_network_manager_version (CcNetworkPanel *panel) { GtkWidget *box; @@ -1333,8 +1227,7 @@ toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (panel))); editor = net_connection_editor_new (toplevel, NULL, NULL, NULL, - panel->priv->client, - panel->priv->remote_settings); + panel->priv->client); g_signal_connect (editor, "done", G_CALLBACK (editor_done), panel); net_connection_editor_run (editor); } @@ -1366,7 +1259,6 @@ static void cc_network_panel_init (CcNetworkPanel *panel) { - DBusGConnection *bus = NULL; GError *error = NULL; GtkStyleContext *context; GtkTreeSelection *selection; @@ -1374,6 +1266,8 @@ GtkWidget *toplevel; GDBusConnection *system_bus; GtkCssProvider *provider; + const GPtrArray *connections; + guint i; panel->priv = NETWORK_PANEL_PRIVATE (panel); g_resources_register (cc_network_get_resource ()); @@ -1413,10 +1307,10 @@ panel_add_proxy_device (panel); /* use NetworkManager client */ - panel->priv->client = nm_client_new (); - g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_MANAGER_RUNNING, + panel->priv->client = nm_client_new (NULL, NULL); + g_signal_connect (panel->priv->client, "notify::nm-running" , G_CALLBACK (manager_running), panel); - g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_ACTIVE_CONNECTIONS, + g_signal_connect (panel->priv->client, "notify::active-connections", G_CALLBACK (active_connections_changed), panel); g_signal_connect (panel->priv->client, "device-added", G_CALLBACK (device_added_cb), panel); @@ -1454,17 +1348,8 @@ G_CALLBACK (remove_connection), panel); /* add remote settings such as VPN settings as virtual devices */ - bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); - if (bus == NULL) { - g_warning ("Error connecting to system D-Bus: %s", - error->message); - g_error_free (error); - } - panel->priv->remote_settings = nm_remote_settings_new (bus); - g_signal_connect (panel->priv->remote_settings, NM_REMOTE_SETTINGS_CONNECTIONS_READ, - G_CALLBACK (notify_connections_read_cb), panel); - g_signal_connect (panel->priv->remote_settings, NM_REMOTE_SETTINGS_NEW_CONNECTION, - G_CALLBACK (notify_new_connection_cb), panel); + g_signal_connect (panel->priv->client, NM_CLIENT_CONNECTION_ADDED, + G_CALLBACK (notify_connection_added_cb), panel); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (panel)); g_signal_connect_after (toplevel, "map", G_CALLBACK (on_toplevel_map), panel); @@ -1485,4 +1370,11 @@ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); g_object_unref (provider); + /* Cold-plug existing connections */ + connections = nm_client_get_connections (panel->priv->client); + for (i = 0; i < connections->len; i++) + add_connection (panel, connections->pdata[i]); + + g_debug ("Calling handle_argv() after cold-plugging connections"); + handle_argv (panel); } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-8021x-security.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-8021x-security.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-8021x-security.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-8021x-security.c 2016-08-31 11:24:09.000000000 +0000 @@ -28,11 +28,6 @@ #include #include -#include -#include -#include -#include -#include #include "wireless-security.h" #include "ce-page-ethernet.h" @@ -95,15 +90,13 @@ CEPage * ce_page_8021x_security_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPage8021xSecurity *page; page = CE_PAGE_8021X_SECURITY (ce_page_new (CE_TYPE_PAGE_8021X_SECURITY, connection, client, - settings, "/org/gnome/control-center/network/8021x-security-page.ui", _("Security"))); @@ -131,12 +124,12 @@ NMSetting *s_8021x; /* FIXME: get failed property and error out of wireless security objects */ - valid = wireless_security_validate (page->security, NULL); + valid = wireless_security_validate (page->security, error); if (valid) { NMSetting *s_con; /* Here's a nice hack to work around the fact that ws_802_1x_fill_connection needs wireless setting. */ - tmp_connection = nm_connection_new (); + tmp_connection = nm_simple_connection_new (); nm_connection_add_setting (tmp_connection, nm_setting_wireless_new ()); /* temp connection needs a 'connection' setting too, since most of @@ -151,8 +144,7 @@ nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x))); g_object_unref (tmp_connection); - } else - g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, "Invalid 802.1x security"); + } } else { nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X); valid = TRUE; diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-8021x-security.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-8021x-security.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-8021x-security.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-8021x-security.h 2016-08-12 12:43:57.000000000 +0000 @@ -23,7 +23,7 @@ #ifndef __CE_PAGE_8021X_SECURITY_H #define __CE_PAGE_8021X_SECURITY_H -#include +#include #include "wireless-security.h" #include @@ -58,7 +58,6 @@ GType ce_page_8021x_security_get_type (void); CEPage *ce_page_8021x_security_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); #endif /* __CE_PAGE_8021X_SECURITY_H */ diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page.c 2016-08-12 12:43:57.000000000 +0000 @@ -26,7 +26,7 @@ #include #include -#include +#include #include @@ -218,7 +218,6 @@ ce_page_new (GType type, NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, const gchar *ui_resource, const gchar *title) { @@ -230,7 +229,6 @@ NULL)); page->title = g_strdup (title); page->client = client; - page->settings= settings; if (ui_resource) { if (!gtk_builder_add_from_resource (page->builder, ui_resource, &error)) { @@ -258,50 +256,60 @@ { page->initialized = TRUE; g_signal_emit (page, signals[INITIALIZED], 0, error); + g_clear_error (&error); } void ce_page_complete_init (CEPage *page, const gchar *setting_name, - GHashTable *secrets, + GVariant *secrets, GError *error) { - GHashTable *setting_hash; - GError *update_error = NULL; + GError *update_error = NULL; + GVariant *setting_dict; + gboolean ignore_error = FALSE; + + g_return_if_fail (page != NULL); + g_return_if_fail (CE_IS_PAGE (page)); + + if (error) { + ignore_error = g_error_matches (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_SETTING_NOT_FOUND) || + g_error_matches (error, NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_NO_SECRETS); + } + + /* Ignore missing settings errors */ + if (error && !ignore_error) { + emit_initialized (page, error); + return; + } else if (!setting_name || !secrets || g_variant_n_children (secrets) == 0) { + /* Success, no secrets */ + emit_initialized (page, NULL); + return; + } + + g_assert (setting_name); + g_assert (secrets); + + setting_dict = g_variant_lookup_value (secrets, setting_name, NM_VARIANT_TYPE_SETTING); + if (!setting_dict) { + /* Success, no secrets */ + emit_initialized (page, NULL); + return; + } + g_variant_unref (setting_dict); + + /* Update the connection with the new secrets */ + if (nm_connection_update_secrets (page->connection, + setting_name, + secrets, + &update_error)) { + /* Success */ + emit_initialized (page, NULL); + return; + } - if (error - && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.Settings.InvalidSetting") - && !dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.AgentManager.NoSecrets")) { - emit_initialized (page, error); - return; - } else if (!setting_name || !secrets || !g_hash_table_size (secrets)) { - /* Success, no secrets */ - emit_initialized (page, NULL); - return; - } - - setting_hash = g_hash_table_lookup (secrets, setting_name); - if (!setting_hash) { - /* Success, no secrets */ - emit_initialized (page, NULL); - return; - } - - if (nm_connection_update_secrets (page->connection, - setting_name, - secrets, - &update_error)) { - emit_initialized (page, NULL); - return; - } - - if (!update_error) { - g_set_error_literal (&update_error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, - "Failed to update connection secrets due to an unknown error."); - } - - emit_initialized (page, update_error); - g_clear_error (&update_error); + g_warning ("Failed to update connection secrets due to an unknown error."); + emit_initialized (page, NULL); } gchar ** @@ -367,94 +375,60 @@ } } -void -ce_page_mac_to_entry (const GByteArray *mac, - gint type, - GtkEntry *entry) +gchar * +ce_page_trim_address (const gchar *addr) { - char *str_addr; + char *space; - g_return_if_fail (entry != NULL); - g_return_if_fail (GTK_IS_ENTRY (entry)); - - if (!mac || !mac->len) - return; - - if (mac->len != nm_utils_hwaddr_len (type)) - return; + if (!addr || *addr == '\0') + return NULL; - str_addr = nm_utils_hwaddr_ntoa (mac->data, type); - gtk_entry_set_text (entry, str_addr); - g_free (str_addr); + space = strchr (addr, ' '); + if (space != NULL) + return g_strndup (addr, space - addr); + return g_strdup (addr); } -static gboolean -utils_ether_addr_valid (const struct ether_addr *test_addr) +gboolean +ce_page_address_is_valid (const gchar *addr) { - guint8 invalid_addr1[ETH_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - guint8 invalid_addr2[ETH_ALEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - guint8 invalid_addr3[ETH_ALEN] = {0x44, 0x44, 0x44, 0x44, 0x44, 0x44}; - guint8 invalid_addr4[ETH_ALEN] = {0x00, 0x30, 0xb4, 0x00, 0x00, 0x00}; /* prism54 dummy MAC */ - - g_return_val_if_fail (test_addr != NULL, FALSE); + guint8 invalid_addr[4][ETH_ALEN] = { + {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, + {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + {0x44, 0x44, 0x44, 0x44, 0x44, 0x44}, + {0x00, 0x30, 0xb4, 0x00, 0x00, 0x00}, /* prism54 dummy MAC */ + }; + guint8 addr_bin[ETH_ALEN]; + char *trimmed_addr; + guint i; - /* Compare the AP address the card has with invalid ethernet MAC addresses. */ - if (!memcmp (test_addr->ether_addr_octet, &invalid_addr1, ETH_ALEN)) - return FALSE; + if (!addr || *addr == '\0') + return TRUE; - if (!memcmp (test_addr->ether_addr_octet, &invalid_addr2, ETH_ALEN)) - return FALSE; + trimmed_addr = ce_page_trim_address (addr); - if (!memcmp (test_addr->ether_addr_octet, &invalid_addr3, ETH_ALEN)) - return FALSE; - if (!memcmp (test_addr->ether_addr_octet, &invalid_addr4, ETH_ALEN)) + if (!nm_utils_hwaddr_valid (trimmed_addr, -1)) { + g_free (trimmed_addr); return FALSE; + } - if (test_addr->ether_addr_octet[0] & 1) /* Multicast addresses */ + if (!nm_utils_hwaddr_aton (trimmed_addr, addr_bin, ETH_ALEN)) { + g_free (trimmed_addr); return FALSE; - - return TRUE; -} - -GByteArray * -ce_page_entry_to_mac (GtkEntry *entry, - gint type, - gboolean *invalid) -{ - const char *temp, *sp; - char *buf = NULL; - GByteArray *mac; - - g_return_val_if_fail (entry != NULL, NULL); - g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); - - if (invalid) - *invalid = FALSE; - - temp = gtk_entry_get_text (entry); - if (!temp || !strlen (temp)) - return NULL; + } - sp = strchr (temp, ' '); - if (sp) - temp = buf = g_strndup (temp, sp - temp); + g_free (trimmed_addr); - mac = nm_utils_hwaddr_atoba (temp, type); - g_free (buf); - if (!mac) { - if (invalid) - *invalid = TRUE; - return NULL; - } + /* Check for multicast address */ + if ((((guint8 *) addr_bin)[0]) & 0x01) + return FALSE; - if (type == ARPHRD_ETHER && !utils_ether_addr_valid ((struct ether_addr *)mac->data)) { - g_byte_array_free (mac, TRUE); - if (invalid) - *invalid = TRUE; - return NULL; + for (i = 0; i < G_N_ELEMENTS (invalid_addr); i++) { + if (nm_utils_hwaddr_matches (addr_bin, ETH_ALEN, invalid_addr[i], ETH_ALEN)) + return FALSE; } - return mac; + return TRUE; } const gchar * @@ -516,18 +490,20 @@ } gchar * -ce_page_get_next_available_name (GSList *connections, +ce_page_get_next_available_name (const GPtrArray *connections, NameFormat format, const gchar *type_name) { GSList *names = NULL, *l; gchar *cname = NULL; gint i = 0; + guint con_idx; - for (l = connections; l; l = l->next) { + for (con_idx = 0; con_idx < connections->len; con_idx++) { + NMConnection *connection = g_ptr_array_index (connections, con_idx); const gchar *id; - id = nm_connection_get_id (NM_CONNECTION (l->data)); + id = nm_connection_get_id (connection); g_assert (id); names = g_slist_append (names, (gpointer) id); } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-details.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-details.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-details.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-details.c 2016-08-31 11:24:09.000000000 +0000 @@ -24,9 +24,7 @@ #include #include -#include -#include -#include +#include #include "../panel-common.h" #include "ce-page-details.h" @@ -141,8 +139,8 @@ const gchar *p1, *p2; ac = nm_device_get_active_connection (page->device); - p1 = ac ? nm_active_connection_get_connection (ac) : NULL; - p2 = nm_connection_get_path (CE_PAGE (page)->connection); + p1 = ac ? nm_active_connection_get_uuid (ac) : NULL; + p2 = nm_connection_get_uuid (CE_PAGE (page)->connection); if (g_strcmp0 (p1, p2) == 0) { device_is_active = TRUE; if (NM_IS_DEVICE_WIFI (page->device)) @@ -202,14 +200,6 @@ } -static gboolean -validate (CEPage *page, - NMConnection *connection, - GError **error) -{ - return TRUE; -} - static void ce_page_details_init (CEPageDetails *page) { @@ -218,15 +208,11 @@ static void ce_page_details_class_init (CEPageDetailsClass *class) { - CEPageClass *page_class= CE_PAGE_CLASS (class); - - page_class->validate = validate; } CEPage * ce_page_details_new (NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, NMDevice *device, NMAccessPoint *ap) { @@ -235,7 +221,6 @@ page = CE_PAGE_DETAILS (ce_page_new (CE_TYPE_PAGE_DETAILS, connection, client, - settings, "/org/gnome/control-center/network/details-page.ui", _("Details"))); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-details.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-details.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-details.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-details.h 2016-08-12 12:43:57.000000000 +0000 @@ -56,7 +56,6 @@ CEPage *ce_page_details_new (NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, NMDevice *device, NMAccessPoint *ap); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ethernet.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ethernet.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ethernet.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ethernet.c 2016-08-12 12:43:57.000000000 +0000 @@ -23,11 +23,10 @@ #include #include +#include -#include -#include +#include -#include #include "firewall-helpers.h" #include "ce-page-ethernet.h" @@ -65,11 +64,11 @@ NMSettingConnection *sc; int mtu_def; char **mac_list; - const GByteArray *s_mac; - char *s_mac_str; + const char *s_mac_str; GtkWidget *widget; GtkWidget *heading; const gchar *name; + const gchar *cloned_mac; name = nm_setting_connection_get_id (page->setting_connection); gtk_entry_set_text (page->name, name); @@ -77,16 +76,14 @@ /* Device MAC address */ mac_list = ce_page_get_mac_list (CE_PAGE (page)->client, NM_TYPE_DEVICE_ETHERNET, NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS); - s_mac = nm_setting_wired_get_mac_address (setting); - s_mac_str = s_mac ? nm_utils_hwaddr_ntoa (s_mac->data, ARPHRD_ETHER) : NULL; + s_mac_str = nm_setting_wired_get_mac_address (setting); ce_page_setup_mac_combo (page->device_mac, s_mac_str, mac_list); - g_free (s_mac_str); g_strfreev (mac_list); g_signal_connect_swapped (page->device_mac, "changed", G_CALLBACK (ce_page_changed), page); /* Cloned MAC address */ - ce_page_mac_to_entry (nm_setting_wired_get_cloned_mac_address (setting), - ARPHRD_ETHER, page->cloned_mac); + cloned_mac = nm_setting_wired_get_cloned_mac_address (setting); + gtk_entry_set_text (GTK_ENTRY (page->cloned_mac), cloned_mac ? cloned_mac : ""); g_signal_connect_swapped (page->cloned_mac, "changed", G_CALLBACK (ce_page_changed), page); /* MTU */ @@ -122,20 +119,23 @@ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_zone")); firewall_ui_setup (sc, widget, heading, CE_PAGE (page)->cancellable); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); - } static void ui_to_setting (CEPageEthernet *page) { - GByteArray *device_mac = NULL; - GByteArray *cloned_mac = NULL; + gchar *device_mac = NULL; + gchar *cloned_mac; + const gchar *text; GtkWidget *entry; entry = gtk_bin_get_child (GTK_BIN (page->device_mac)); - if (entry) - device_mac = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, NULL); - cloned_mac = ce_page_entry_to_mac (page->cloned_mac, ARPHRD_ETHER, NULL); + if (entry) { + text = gtk_entry_get_text (GTK_ENTRY (entry)); + device_mac = ce_page_trim_address (text); + } + text = gtk_entry_get_text (GTK_ENTRY (entry)); + cloned_mac = ce_page_trim_address (text); g_object_set (page->setting_wired, NM_SETTING_WIRED_MAC_ADDRESS, device_mac, @@ -143,11 +143,6 @@ NM_SETTING_WIRED_MTU, (guint32) gtk_spin_button_get_value_as_int (page->mtu), NULL); - if (device_mac) - g_byte_array_free (device_mac, TRUE); - if (cloned_mac) - g_byte_array_free (cloned_mac, TRUE); - g_object_set (page->setting_connection, NM_SETTING_CONNECTION_ID, gtk_entry_get_text (page->name), NULL); @@ -155,6 +150,8 @@ entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_zone")); firewall_ui_to_setting (page->setting_connection, entry); + g_free (cloned_mac); + g_free (device_mac); } static gboolean @@ -163,31 +160,23 @@ GError **error) { CEPageEthernet *self = CE_PAGE_ETHERNET (page); - gboolean invalid = FALSE; - GByteArray *ignore; GtkWidget *entry; gboolean ret = TRUE; entry = gtk_bin_get_child (GTK_BIN (self->device_mac)); if (entry) { - ignore = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, &invalid); - if (invalid) { + if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; } else { - if (ignore) - g_byte_array_free (ignore, TRUE); widget_unset_error (entry); } } - ignore = ce_page_entry_to_mac (self->cloned_mac, ARPHRD_ETHER, &invalid); - if (invalid) { + if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (self->cloned_mac)))) { widget_set_error (GTK_WIDGET (self->cloned_mac)); ret = FALSE; } else { - if (ignore) - g_byte_array_free (ignore, TRUE); widget_unset_error (GTK_WIDGET (self->cloned_mac)); } @@ -215,15 +204,13 @@ CEPage * ce_page_ethernet_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageEthernet *page; page = CE_PAGE_ETHERNET (ce_page_new (CE_TYPE_PAGE_ETHERNET, connection, client, - settings, "/org/gnome/control-center/network/ethernet-page.ui", _("Identity"))); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ethernet.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ethernet.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ethernet.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ethernet.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,7 +24,7 @@ #include -#include +#include #include #include "ce-page.h" @@ -63,8 +63,7 @@ GType ce_page_ethernet_get_type (void); CEPage *ce_page_ethernet_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,9 +24,7 @@ #include -#include -#include -#include +#include #include @@ -54,7 +52,6 @@ NMConnection *connection; NMClient *client; - NMRemoteSettings *settings; GCancellable *cancellable; }; @@ -80,12 +77,11 @@ CEPage *ce_page_new (GType type, NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, const gchar *ui_resource, const gchar *title); void ce_page_complete_init (CEPage *page, const gchar *setting_name, - GHashTable *secrets, + GVariant *variant, GError *error); gchar **ce_page_get_mac_list (NMClient *client, @@ -94,23 +90,19 @@ void ce_page_setup_mac_combo (GtkComboBoxText *combo, const gchar *current_mac, gchar **mac_list); -void ce_page_mac_to_entry (const GByteArray *mac, - gint type, - GtkEntry *entry); -GByteArray *ce_page_entry_to_mac (GtkEntry *entry, - gint type, - gboolean *invalid); gint ce_get_property_default (NMSetting *setting, const gchar *property_name); gint ce_spin_output_with_default (GtkSpinButton *spin, gpointer user_data); +gboolean ce_page_address_is_valid (const gchar *addr); +gchar *ce_page_trim_address (const gchar *addr); typedef enum { NAME_FORMAT_TYPE, NAME_FORMAT_PROFILE } NameFormat; -gchar * ce_page_get_next_available_name (GSList *connections, +gchar * ce_page_get_next_available_name (const GPtrArray *connections, NameFormat format, const gchar *type_name); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip4.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip4.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip4.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip4.c 2016-09-27 12:37:36.000000000 +0000 @@ -23,13 +23,14 @@ #include #include +#include #include #include +#include #include "shell/list-box-helper.h" #include "ce-page-ip4.h" #include "ui-helpers.h" -#include G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE) @@ -119,6 +120,28 @@ } static void +update_row_gateway_visibility (CEPageIP4 *page) +{ + GList *children, *l; + gint rows = 0; + + children = gtk_container_get_children (GTK_CONTAINER (page->address_list)); + for (l = children; l; l = l->next) { + GtkWidget *row = l->data; + GtkWidget *label, *entry; + + label = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway-label")); + entry = GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway")); + + gtk_widget_set_visible (label, (rows == 0)); + gtk_widget_set_visible (entry, (rows == 0)); + + rows++; + } + g_list_free (children); +} + +static void remove_row (GtkButton *button, CEPageIP4 *page) { GtkWidget *list; @@ -134,6 +157,8 @@ ce_page_changed (CE_PAGE (page)); update_row_sensitivity (page, list); + if (list == page->address_list) + update_row_gateway_visibility (page); } static gint @@ -204,16 +229,20 @@ label = gtk_label_new (_("Gateway")); gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_grid_attach (GTK_GRID (row_grid), label, 1, 3, 1, 1); + g_object_set_data (G_OBJECT (row), "gateway-label", label); widget = gtk_entry_new (); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); g_object_set_data (G_OBJECT (row), "gateway", widget); - gtk_entry_set_text (GTK_ENTRY (widget), gateway); + gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : ""); gtk_widget_set_margin_start (widget, 10); gtk_widget_set_margin_end (widget, 10); gtk_widget_set_hexpand (widget, TRUE); gtk_grid_attach (GTK_GRID (row_grid), widget, 2, 3, 1, 1); + gtk_widget_set_no_show_all (label, TRUE); + gtk_widget_set_no_show_all (widget, FALSE); + delete_button = gtk_button_new (); gtk_style_context_add_class (gtk_widget_get_style_context (delete_button), "image-button"); g_signal_connect (delete_button, "clicked", G_CALLBACK (remove_row), page); @@ -234,6 +263,7 @@ gtk_widget_show_all (row); gtk_container_add (GTK_CONTAINER (page->address_list), row); + update_row_gateway_visibility (page); update_row_sensitivity (page, page->address_list); } @@ -298,29 +328,24 @@ add_section_toolbar (page, widget, G_CALLBACK (add_empty_address_row)); - for (i = 0; i < nm_setting_ip4_config_get_num_addresses (page->setting); i++) { - NMIP4Address *addr; + for (i = 0; i < nm_setting_ip_config_get_num_addresses (page->setting); i++) { + NMIPAddress *addr; struct in_addr tmp_addr; - gchar address[INET_ADDRSTRLEN + 1]; gchar network[INET_ADDRSTRLEN + 1]; - gchar gateway[INET_ADDRSTRLEN + 1]; - addr = nm_setting_ip4_config_get_address (page->setting, i); + addr = nm_setting_ip_config_get_address (page->setting, i); if (!addr) continue; - tmp_addr.s_addr = nm_ip4_address_get_address (addr); - (void) inet_ntop (AF_INET, &tmp_addr, &address[0], sizeof (address)); - - tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip4_address_get_prefix (addr)); + tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip_address_get_prefix (addr)); (void) inet_ntop (AF_INET, &tmp_addr, &network[0], sizeof (network)); - tmp_addr.s_addr = nm_ip4_address_get_gateway (addr); - (void) inet_ntop (AF_INET, &tmp_addr, &gateway[0], sizeof (gateway)); - - add_address_row (page, address, network, gateway); + add_address_row (page, + nm_ip_address_get_address (addr), + network, + i == 0 ? nm_setting_ip_config_get_gateway (page->setting) : ""); } - if (nm_setting_ip4_config_get_num_addresses (page->setting) == 0) + if (nm_setting_ip_config_get_num_addresses (page->setting) == 0) add_empty_address_row (page); gtk_widget_show_all (widget); @@ -399,21 +424,18 @@ gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL); gtk_container_add (GTK_CONTAINER (frame), list); page->auto_dns = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_dns_switch")); - gtk_switch_set_active (page->auto_dns, !nm_setting_ip4_config_get_ignore_auto_dns (page->setting)); + gtk_switch_set_active (page->auto_dns, !nm_setting_ip_config_get_ignore_auto_dns (page->setting)); g_signal_connect (page->auto_dns, "notify::active", G_CALLBACK (switch_toggled), page); add_section_toolbar (page, widget, G_CALLBACK (add_empty_dns_row)); - for (i = 0; i < nm_setting_ip4_config_get_num_dns (page->setting); i++) { - struct in_addr tmp_addr; - gchar address[INET_ADDRSTRLEN + 1]; - - tmp_addr.s_addr = nm_setting_ip4_config_get_dns (page->setting, i); - (void) inet_ntop (AF_INET, &tmp_addr, &address[0], sizeof (address)); + for (i = 0; i < nm_setting_ip_config_get_num_dns (page->setting); i++) { + const char *address; + address = nm_setting_ip_config_get_dns (page->setting, i); add_dns_row (page, address); } - if (nm_setting_ip4_config_get_num_dns (page->setting) == 0) + if (nm_setting_ip_config_get_num_dns (page->setting) == 0) add_empty_dns_row (page); gtk_widget_show_all (widget); @@ -483,7 +505,7 @@ gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); g_object_set_data (G_OBJECT (row), "metric", widget); - if (metric > 0) { + if (metric >= 0) { gchar *s = g_strdup_printf ("%d", metric); gtk_entry_set_text (GTK_ENTRY (widget), s); g_free (s); @@ -521,7 +543,7 @@ static void add_empty_route_row (CEPageIP4 *page) { - add_route_row (page, "", "", "", 0); + add_route_row (page, "", "", "", -1); } static void @@ -542,47 +564,36 @@ gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL); gtk_container_add (GTK_CONTAINER (frame), list); page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_routes_switch")); - gtk_switch_set_active (page->auto_routes, !nm_setting_ip4_config_get_ignore_auto_routes (page->setting)); + gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes (page->setting)); g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page); add_section_toolbar (page, widget, G_CALLBACK (add_empty_route_row)); - for (i = 0; i < nm_setting_ip4_config_get_num_routes (page->setting); i++) { - NMIP4Route *route; + for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) { + NMIPRoute *route; struct in_addr tmp_addr; - gchar address[INET_ADDRSTRLEN + 1]; gchar netmask[INET_ADDRSTRLEN + 1]; - gchar gateway[INET_ADDRSTRLEN + 1]; - gint metric; - route = nm_setting_ip4_config_get_route (page->setting, i); + route = nm_setting_ip_config_get_route (page->setting, i); if (!route) continue; - tmp_addr.s_addr = nm_ip4_route_get_dest (route); - (void) inet_ntop (AF_INET, &tmp_addr, &address[0], sizeof (address)); - - tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip4_route_get_prefix (route)); + tmp_addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip_route_get_prefix (route)); (void) inet_ntop (AF_INET, &tmp_addr, &netmask[0], sizeof (netmask)); - tmp_addr.s_addr = nm_ip4_route_get_next_hop (route); - (void) inet_ntop (AF_INET, &tmp_addr, &gateway[0], sizeof (gateway)); - metric = nm_ip4_route_get_metric (route); - add_route_row (page, address, netmask, gateway, metric); + add_route_row (page, + nm_ip_route_get_dest (route), + netmask, + nm_ip_route_get_next_hop (route), + nm_ip_route_get_metric (route)); } - if (nm_setting_ip4_config_get_num_routes (page->setting) == 0) + if (nm_setting_ip_config_get_num_routes (page->setting) == 0) add_empty_route_row (page); gtk_widget_show_all (widget); } static void -free_addr (gpointer addr) -{ - g_array_free ((GArray *)addr, TRUE); -} - -static void connect_ip4_page (CEPageIP4 *page) { GtkWidget *content; @@ -599,7 +610,7 @@ page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "switch_enable")); g_signal_connect (page->enabled, "notify::active", G_CALLBACK (switch_toggled), page); - str_method = nm_setting_ip4_config_get_method (page->setting); + str_method = nm_setting_ip_config_get_method (page->setting); disabled = g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0; gtk_switch_set_active (page->enabled, !disabled); g_signal_connect_swapped (page->enabled, "notify::active", G_CALLBACK (ce_page_changed), page); @@ -640,7 +651,7 @@ page->never_default = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "never_default_check")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->never_default), - nm_setting_ip4_config_get_never_default (page->setting)); + nm_setting_ip_config_get_never_default (page->setting)); g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page); g_signal_connect (page->method, "changed", G_CALLBACK (method_changed), page); @@ -682,10 +693,11 @@ gboolean ignore_auto_routes; gboolean never_default; GPtrArray *addresses = NULL; - GArray *dns_servers = NULL; + GPtrArray *dns_servers = NULL; GPtrArray *routes = NULL; GList *children, *l; gboolean ret = TRUE; + const char *default_gateway = NULL; if (!gtk_switch_get_active (page->enabled)) { method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED; @@ -704,7 +716,7 @@ } } - addresses = g_ptr_array_new_with_free_func (free_addr); + addresses = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_address_unref); if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) children = gtk_container_get_children (GTK_CONTAINER (page->address_list)); else @@ -713,14 +725,12 @@ for (l = children; l; l = l->next) { GtkWidget *row = l->data; GtkEntry *entry; + GtkEntry *gateway_entry; const gchar *text_address; const gchar *text_netmask; - const gchar *text_gateway; - struct in_addr tmp_addr; - struct in_addr tmp_gateway = { 0 }; + const gchar *text_gateway = ""; + NMIPAddress *addr; guint32 prefix; - guint32 empty_val = 0; - GArray *addr; entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address")); if (!entry) @@ -728,17 +738,19 @@ text_address = gtk_entry_get_text (entry); text_netmask = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "network"))); - text_gateway = gtk_entry_get_text (GTK_ENTRY (g_object_get_data (G_OBJECT (row), "gateway"))); + gateway_entry = g_object_get_data (G_OBJECT (row), "gateway"); + if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry))) + text_gateway = gtk_entry_get_text (gateway_entry); if (!*text_address && !*text_netmask && !*text_gateway) { /* ignore empty rows */ widget_unset_error (GTK_WIDGET (entry)); widget_unset_error (g_object_get_data (G_OBJECT (row), "network")); - widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway")); + widget_unset_error (GTK_WIDGET (gateway_entry)); continue; } - if (inet_pton (AF_INET, text_address, &tmp_addr) <= 0) { + if (!text_address || !nm_utils_ipaddr_valid (AF_INET, text_address)) { widget_set_error (GTK_WIDGET (entry)); ret = FALSE; } else { @@ -752,24 +764,24 @@ widget_unset_error (g_object_get_data (G_OBJECT (row), "network")); } - if (text_gateway && *text_gateway && inet_pton (AF_INET, text_gateway, &tmp_gateway) <= 0) { + if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)) && + text_gateway && !nm_utils_ipaddr_valid (AF_INET, text_gateway)) { widget_set_error (g_object_get_data (G_OBJECT (row), "gateway")); ret = FALSE; } else { - widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway")); + widget_unset_error (GTK_WIDGET (gateway_entry)); + if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry))) { + g_assert (default_gateway == NULL); + default_gateway = text_gateway; + } } if (!ret) continue; - addr = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3); - g_array_append_val (addr, tmp_addr.s_addr); - g_array_append_val (addr, prefix); - if (tmp_gateway.s_addr) - g_array_append_val (addr, tmp_gateway.s_addr); - else - g_array_append_val (addr, empty_val); - g_ptr_array_add (addresses, addr); + addr = nm_ip_address_new (AF_INET, text_address, prefix, NULL); + if (addr) + g_ptr_array_add (addresses, addr); } g_list_free (children); @@ -778,7 +790,7 @@ addresses = NULL; } - dns_servers = g_array_new (FALSE, FALSE, sizeof (guint)); + dns_servers = g_ptr_array_new_with_free_func (g_free); if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) || g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) children = gtk_container_get_children (GTK_CONTAINER (page->dns_list)); @@ -789,7 +801,6 @@ GtkWidget *row = l->data; GtkEntry *entry; const gchar *text; - struct in_addr tmp_addr; entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address")); if (!entry) @@ -802,17 +813,24 @@ continue; } - if (inet_pton (AF_INET, text, &tmp_addr) <= 0) { + if (text && !nm_utils_ipaddr_valid (AF_INET, text)) { widget_set_error (GTK_WIDGET (entry)); ret = FALSE; } else { widget_unset_error (GTK_WIDGET (entry)); - g_array_append_val (dns_servers, tmp_addr.s_addr); + g_ptr_array_add (dns_servers, g_strdup (text)); } } g_list_free (children); - routes = g_ptr_array_new_with_free_func (free_addr); + if (dns_servers->len == 0) { + g_ptr_array_free (dns_servers, TRUE); + dns_servers = NULL; + } else { + g_ptr_array_add (dns_servers, NULL); + } + + routes = g_ptr_array_new_with_free_func ((GDestroyNotify) nm_ip_route_unref); if (g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO) || g_str_equal (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) children = gtk_container_get_children (GTK_CONTAINER (page->routes_list)); @@ -826,9 +844,9 @@ const gchar *text_netmask; const gchar *text_gateway; const gchar *text_metric; - struct in_addr tmp_addr = { 0 }; - guint32 address, netmask, gateway, metric; - GArray *route; + gint64 metric; + guint32 netmask; + NMIPRoute *route; entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address")); if (!entry) @@ -844,12 +862,11 @@ continue; } - if (inet_pton (AF_INET, text_address, &tmp_addr) <= 0) { + if (text_address && !nm_utils_ipaddr_valid (AF_INET, text_address)) { widget_set_error (GTK_WIDGET (entry)); ret = FALSE; } else { widget_unset_error (GTK_WIDGET (entry)); - address = tmp_addr.s_addr; } if (!parse_netmask (text_netmask, &netmask)) { @@ -859,19 +876,18 @@ widget_unset_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "netmask"))); } - if (inet_pton (AF_INET, text_gateway, &tmp_addr) <= 0) { + if (text_gateway && !nm_utils_ipaddr_valid (AF_INET, text_gateway)) { widget_set_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway"))); ret = FALSE; } else { widget_unset_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "gateway"))); - gateway = tmp_addr.s_addr; } - metric = 0; + metric = -1; if (*text_metric) { errno = 0; - metric = strtoul (text_metric, NULL, 10); - if (errno) { + metric = g_ascii_strtoull (text_metric, NULL, 10); + if (errno || metric < 0 || metric > G_MAXUINT32) { widget_set_error (GTK_WIDGET (g_object_get_data (G_OBJECT (row), "metric"))); ret = FALSE; } else { @@ -884,12 +900,9 @@ if (!ret) continue; - route = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4); - g_array_append_val (route, address); - g_array_append_val (route, netmask); - g_array_append_val (route, gateway); - g_array_append_val (route, metric); - g_ptr_array_add (routes, route); + route = nm_ip_route_new (AF_INET, text_address, netmask, text_gateway, metric, NULL); + if (route) + g_ptr_array_add (routes, route); } g_list_free (children); @@ -906,13 +919,14 @@ never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default)); g_object_set (page->setting, - NM_SETTING_IP4_CONFIG_METHOD, method, - NM_SETTING_IP4_CONFIG_ADDRESSES, addresses, - NM_SETTING_IP4_CONFIG_DNS, dns_servers, - NM_SETTING_IP4_CONFIG_ROUTES, routes, - NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns, - NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes, - NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, never_default, + NM_SETTING_IP_CONFIG_METHOD, method, + NM_SETTING_IP_CONFIG_ADDRESSES, addresses, + NM_SETTING_IP_CONFIG_GATEWAY, default_gateway, + NM_SETTING_IP_CONFIG_DNS, dns_servers ? dns_servers->pdata : NULL, + NM_SETTING_IP_CONFIG_ROUTES, routes, + NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns, + NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes, + NM_SETTING_IP_CONFIG_NEVER_DEFAULT, never_default, NULL); out: @@ -920,7 +934,7 @@ g_ptr_array_free (addresses, TRUE); if (dns_servers) - g_array_free (dns_servers, TRUE); + g_ptr_array_free (dns_servers, TRUE); if (routes) g_ptr_array_free (routes, TRUE); @@ -954,21 +968,19 @@ CEPage * ce_page_ip4_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageIP4 *page; page = CE_PAGE_IP4 (ce_page_new (CE_TYPE_PAGE_IP4, connection, client, - settings, "/org/gnome/control-center/network/ip4-page.ui", _("IPv4"))); page->setting = nm_connection_get_setting_ip4_config (connection); if (!page->setting) { - page->setting = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); + page->setting = NM_SETTING_IP_CONFIG (nm_setting_ip4_config_new ()); nm_connection_add_setting (connection, NM_SETTING (page->setting)); } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip4.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip4.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip4.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip4.h 2016-08-12 12:43:57.000000000 +0000 @@ -43,7 +43,7 @@ { CEPage parent; - NMSettingIP4Config *setting; + NMSettingIPConfig *setting; GtkSwitch *enabled; GtkComboBox *method; @@ -63,8 +63,7 @@ GType ce_page_ip4_get_type (void); CEPage *ce_page_ip4_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip6.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip6.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip6.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip6.c 2016-08-31 11:24:09.000000000 +0000 @@ -23,13 +23,14 @@ #include #include +#include #include #include +#include #include "shell/list-box-helper.h" #include "ce-page-ip6.h" #include "ui-helpers.h" -#include G_DEFINE_TYPE (CEPageIP6, ce_page_ip6, CE_TYPE_PAGE) @@ -209,7 +210,7 @@ gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); g_object_set_data (G_OBJECT (row), "gateway", widget); - gtk_entry_set_text (GTK_ENTRY (widget), gateway); + gtk_entry_set_text (GTK_ENTRY (widget), gateway ? gateway : ""); gtk_widget_set_margin_start (widget, 10); gtk_widget_set_margin_end (widget, 10); gtk_widget_set_hexpand (widget, TRUE); @@ -299,31 +300,17 @@ add_section_toolbar (page, widget, G_CALLBACK (add_empty_address_row)); - for (i = 0; i < nm_setting_ip6_config_get_num_addresses (page->setting); i++) { - NMIP6Address *addr; - const struct in6_addr *tmp_addr; - gchar address[INET6_ADDRSTRLEN + 1]; - gchar network[INET6_ADDRSTRLEN + 1]; - gchar gateway[INET6_ADDRSTRLEN + 1]; - - addr = nm_setting_ip6_config_get_address (page->setting, i); - if (!addr) - continue; - - tmp_addr = nm_ip6_address_get_address (addr); - (void) inet_ntop (AF_INET6, tmp_addr, &address[0], sizeof (address)); - - snprintf (network, sizeof (network), "%u", nm_ip6_address_get_prefix (addr)); - - tmp_addr = nm_ip6_address_get_gateway (addr); - if (tmp_addr && !IN6_IS_ADDR_UNSPECIFIED (tmp_addr)) - (void) inet_ntop (AF_INET6, tmp_addr, &gateway[0], sizeof (gateway)); - else - gateway[0] = '\0'; - - add_address_row (page, address, network, gateway); + for (i = 0; i < nm_setting_ip_config_get_num_addresses (page->setting); i++) { + NMIPAddress *addr; + char *netmask; + + addr = nm_setting_ip_config_get_address (page->setting, i); + netmask = g_strdup_printf ("%u", nm_ip_address_get_prefix (addr)); + add_address_row (page, nm_ip_address_get_address (addr), netmask, + i == 0 ? nm_setting_ip_config_get_gateway (page->setting) : NULL); + g_free (netmask); } - if (nm_setting_ip6_config_get_num_addresses (page->setting) == 0) + if (nm_setting_ip_config_get_num_addresses (page->setting) == 0) add_empty_address_row (page); gtk_widget_show_all (widget); @@ -403,21 +390,18 @@ gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL); gtk_container_add (GTK_CONTAINER (frame), list); page->auto_dns = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_dns_switch")); - gtk_switch_set_active (page->auto_dns, !nm_setting_ip6_config_get_ignore_auto_dns (page->setting)); + gtk_switch_set_active (page->auto_dns, !nm_setting_ip_config_get_ignore_auto_dns (page->setting)); g_signal_connect (page->auto_dns, "notify::active", G_CALLBACK (switch_toggled), page); add_section_toolbar (page, widget, G_CALLBACK (add_empty_dns_row)); - for (i = 0; i < nm_setting_ip6_config_get_num_dns (page->setting); i++) { - const struct in6_addr *tmp_addr; - gchar address[INET6_ADDRSTRLEN + 1]; - - tmp_addr = nm_setting_ip6_config_get_dns (page->setting, i); - (void) inet_ntop (AF_INET, tmp_addr, &address[0], sizeof (address)); + for (i = 0; i < nm_setting_ip_config_get_num_dns (page->setting); i++) { + const char *address; + address = nm_setting_ip_config_get_dns (page->setting, i); add_dns_row (page, address); } - if (nm_setting_ip6_config_get_num_dns (page->setting) == 0) + if (nm_setting_ip_config_get_num_dns (page->setting) == 0) add_empty_dns_row (page); gtk_widget_show_all (widget); @@ -426,9 +410,9 @@ static void add_route_row (CEPageIP6 *page, const gchar *address, - gint prefix, + const gchar *prefix, const gchar *gateway, - gint metric) + const gchar *metric) { GtkWidget *row; GtkWidget *row_grid; @@ -460,11 +444,7 @@ gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); g_object_set_data (G_OBJECT (row), "prefix", widget); - if (prefix > 0) { - gchar *s = g_strdup_printf ("%d", prefix); - gtk_entry_set_text (GTK_ENTRY (widget), s); - g_free (s); - } + gtk_entry_set_text (GTK_ENTRY (widget), prefix ? prefix : ""); gtk_widget_set_margin_start (widget, 10); gtk_widget_set_margin_end (widget, 10); gtk_widget_set_hexpand (widget, TRUE); @@ -491,11 +471,7 @@ gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); g_object_set_data (G_OBJECT (row), "metric", widget); - if (metric > 0) { - gchar *s = g_strdup_printf ("%d", metric); - gtk_entry_set_text (GTK_ENTRY (widget), s); - g_free (s); - } + gtk_entry_set_text (GTK_ENTRY (widget), metric ? metric : ""); gtk_widget_set_margin_start (widget, 10); gtk_widget_set_margin_end (widget, 10); gtk_widget_set_hexpand (widget, TRUE); @@ -529,7 +505,7 @@ static void add_empty_route_row (CEPageIP6 *page) { - add_route_row (page, "", 0, "", 0); + add_route_row (page, "", NULL, "", NULL); } static void @@ -550,31 +526,26 @@ gtk_list_box_set_sort_func (GTK_LIST_BOX (list), (GtkListBoxSortFunc)sort_first_last, NULL, NULL); gtk_container_add (GTK_CONTAINER (frame), list); page->auto_routes = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "auto_routes_switch")); - gtk_switch_set_active (page->auto_routes, !nm_setting_ip6_config_get_ignore_auto_routes (page->setting)); + gtk_switch_set_active (page->auto_routes, !nm_setting_ip_config_get_ignore_auto_routes (page->setting)); g_signal_connect (page->auto_routes, "notify::active", G_CALLBACK (switch_toggled), page); add_section_toolbar (page, widget, G_CALLBACK (add_empty_route_row)); - for (i = 0; i < nm_setting_ip6_config_get_num_routes (page->setting); i++) { - NMIP6Route *route; - const struct in6_addr *tmp_addr; - gchar address[INET6_ADDRSTRLEN + 1]; - gchar gateway[INET6_ADDRSTRLEN + 1]; - gint prefix, metric; - - route = nm_setting_ip6_config_get_route (page->setting, i); - if (!route) - continue; - - tmp_addr = nm_ip6_route_get_dest (route); - (void) inet_ntop (AF_INET6, tmp_addr, &address[0], sizeof (address)); - prefix = nm_ip6_route_get_prefix (route); - tmp_addr = nm_ip6_route_get_next_hop (route); - (void) inet_ntop (AF_INET6, tmp_addr, &gateway[0], sizeof (gateway)); - metric = nm_ip6_route_get_metric (route); - add_route_row (page, address, prefix, gateway, metric); + for (i = 0; i < nm_setting_ip_config_get_num_routes (page->setting); i++) { + NMIPRoute *route; + char *prefix, *metric; + + route = nm_setting_ip_config_get_route (page->setting, i); + prefix = g_strdup_printf ("%u", nm_ip_route_get_prefix (route)); + metric = g_strdup_printf ("%u", (guint32) MIN (0, nm_ip_route_get_metric (route))); + add_route_row (page, nm_ip_route_get_dest (route), + prefix, + nm_ip_route_get_next_hop (route), + metric); + g_free (prefix); + g_free (metric); } - if (nm_setting_ip6_config_get_num_routes (page->setting) == 0) + if (nm_setting_ip_config_get_num_routes (page->setting) == 0) add_empty_route_row (page); gtk_widget_show_all (widget); @@ -597,7 +568,7 @@ page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "switch_enable")); g_signal_connect (page->enabled, "notify::active", G_CALLBACK (switch_toggled), page); - str_method = nm_setting_ip6_config_get_method (page->setting); + str_method = nm_setting_ip_config_get_method (page->setting); disabled = g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0; gtk_switch_set_active (page->enabled, !disabled); g_signal_connect_swapped (page->enabled, "notify::active", G_CALLBACK (ce_page_changed), page); @@ -644,7 +615,7 @@ page->never_default = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "never_default_check")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (page->never_default), - nm_setting_ip6_config_get_never_default (page->setting)); + nm_setting_ip_config_get_never_default (page->setting)); g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page); g_signal_connect (page->method, "changed", G_CALLBACK (method_changed), page); @@ -682,11 +653,15 @@ } } - nm_setting_ip6_config_clear_addresses (page->setting); - if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) + nm_setting_ip_config_clear_addresses (page->setting); + if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { children = gtk_container_get_children (GTK_CONTAINER (page->address_list)); - else + } else { + g_object_set (G_OBJECT (page->setting), + NM_SETTING_IP_CONFIG_GATEWAY, NULL, + NULL); children = NULL; + } for (l = children; l; l = l->next) { GtkWidget *row = l->data; @@ -694,11 +669,9 @@ const gchar *text_address; const gchar *text_prefix; const gchar *text_gateway; - struct in6_addr tmp_addr; - struct in6_addr tmp_gateway; guint32 prefix; gchar *end; - NMIP6Address *addr; + NMIPAddress *addr; gboolean have_gateway = FALSE; entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address")); @@ -717,7 +690,7 @@ continue; } - if (inet_pton (AF_INET6, text_address, &tmp_addr) <= 0) { + if (!text_address || !nm_utils_ipaddr_valid (AF_INET6, text_address)) { widget_set_error (GTK_WIDGET (entry)); ret = FALSE; } else { @@ -732,32 +705,27 @@ widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix")); } - if (text_gateway && *text_gateway) { - if (inet_pton (AF_INET6, text_gateway, &tmp_gateway) <= 0) { - widget_set_error (g_object_get_data (G_OBJECT (row), "gateway")); - ret = FALSE; - } else { - if (!IN6_IS_ADDR_UNSPECIFIED (&tmp_gateway)) - have_gateway = TRUE; - widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway")); - } + if (text_gateway && !nm_utils_ipaddr_valid (AF_INET6, text_gateway)) { + widget_set_error (g_object_get_data (G_OBJECT (row), "gateway")); + ret = FALSE; } else { widget_unset_error (g_object_get_data (G_OBJECT (row), "gateway")); + have_gateway = TRUE; } if (!ret) continue; - addr = nm_ip6_address_new (); - nm_ip6_address_set_address (addr, &tmp_addr); - nm_ip6_address_set_prefix (addr, prefix); + addr = nm_ip_address_new (AF_INET6, text_address, prefix, NULL); if (have_gateway) - nm_ip6_address_set_gateway (addr, &tmp_gateway); - nm_setting_ip6_config_add_address (page->setting, addr); + g_object_set (G_OBJECT (page->setting), + NM_SETTING_IP_CONFIG_GATEWAY, text_gateway, + NULL); + nm_setting_ip_config_add_address (page->setting, addr); } g_list_free (children); - nm_setting_ip6_config_clear_dns (page->setting); + nm_setting_ip_config_clear_dns (page->setting); if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) || g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) || g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) @@ -787,12 +755,12 @@ ret = FALSE; } else { widget_unset_error (GTK_WIDGET (entry)); - nm_setting_ip6_config_add_dns (page->setting, &tmp_addr); + nm_setting_ip_config_add_dns (page->setting, text); } } g_list_free (children); - nm_setting_ip6_config_clear_routes (page->setting); + nm_setting_ip_config_clear_routes (page->setting); if (g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) || g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) || g_str_equal (method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) @@ -807,10 +775,9 @@ const gchar *text_prefix; const gchar *text_gateway; const gchar *text_metric; - struct in6_addr dest, gateway; guint32 prefix, metric; gchar *end; - NMIP6Route *route; + NMIPRoute *route; entry = GTK_ENTRY (g_object_get_data (G_OBJECT (row), "address")); if (!entry) @@ -830,7 +797,7 @@ continue; } - if (inet_pton (AF_INET6, text_address, &dest) <= 0) { + if (!nm_utils_ipaddr_valid (AF_INET6, text_address)) { widget_set_error (GTK_WIDGET (entry)); ret = FALSE; } else { @@ -845,7 +812,7 @@ widget_unset_error (g_object_get_data (G_OBJECT (row), "prefix")); } - if (inet_pton (AF_INET6, text_gateway, &gateway) <= 0) { + if (!nm_utils_ipaddr_valid (AF_INET6, text_gateway)) { widget_set_error (g_object_get_data (G_OBJECT (row), "gateway")); ret = FALSE; } else { @@ -869,13 +836,9 @@ if (!ret) continue; - route = nm_ip6_route_new (); - nm_ip6_route_set_dest (route, &dest); - nm_ip6_route_set_prefix (route, prefix); - nm_ip6_route_set_next_hop (route, &gateway); - nm_ip6_route_set_metric (route, metric); - nm_setting_ip6_config_add_route (page->setting, route); - nm_ip6_route_unref (route); + route = nm_ip_route_new (AF_INET6, text_address, prefix, text_gateway, metric, NULL); + nm_setting_ip_config_add_route (page->setting, route); + nm_ip_route_unref (route); } g_list_free (children); @@ -887,10 +850,10 @@ never_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->never_default)); g_object_set (page->setting, - NM_SETTING_IP6_CONFIG_METHOD, method, - NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns, - NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes, - NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, never_default, + NM_SETTING_IP_CONFIG_METHOD, method, + NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, ignore_auto_dns, + NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, ignore_auto_routes, + NM_SETTING_IP_CONFIG_NEVER_DEFAULT, never_default, NULL); out: @@ -924,21 +887,19 @@ CEPage * ce_page_ip6_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageIP6 *page; page = CE_PAGE_IP6 (ce_page_new (CE_TYPE_PAGE_IP6, connection, client, - settings, "/org/gnome/control-center/network/ip6-page.ui", _("IPv6"))); page->setting = nm_connection_get_setting_ip6_config (connection); if (!page->setting) { - page->setting = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new ()); + page->setting = NM_SETTING_IP_CONFIG (nm_setting_ip6_config_new ()); nm_connection_add_setting (connection, NM_SETTING (page->setting)); } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip6.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip6.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-ip6.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-ip6.h 2016-08-12 12:43:57.000000000 +0000 @@ -43,7 +43,7 @@ { CEPage parent; - NMSettingIP6Config *setting; + NMSettingIPConfig *setting; GtkSwitch *enabled; GtkComboBox *method; @@ -63,8 +63,7 @@ GType ce_page_ip6_get_type (void); CEPage *ce_page_ip6_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-reset.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-reset.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-reset.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-reset.c 2016-08-31 11:24:09.000000000 +0000 @@ -54,14 +54,6 @@ g_signal_connect (widget, "clicked", G_CALLBACK (reset_cb), page); } -static gboolean -validate (CEPage *page, - NMConnection *connection, - GError **error) -{ - return TRUE; -} - static void ce_page_reset_init (CEPageReset *page) { @@ -70,15 +62,11 @@ static void ce_page_reset_class_init (CEPageResetClass *class) { - CEPageClass *page_class= CE_PAGE_CLASS (class); - - page_class->validate = validate; } CEPage * ce_page_reset_new (NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, NetConnectionEditor *editor) { CEPageReset *page; @@ -86,7 +74,6 @@ page = CE_PAGE_RESET (ce_page_new (CE_TYPE_PAGE_RESET, connection, client, - settings, "/org/gnome/control-center/network/reset-page.ui", _("Reset"))); page->editor = editor; diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-reset.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-reset.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-reset.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-reset.h 2016-08-12 12:43:57.000000000 +0000 @@ -56,7 +56,6 @@ CEPage *ce_page_reset_new (NMConnection *connection, NMClient *client, - NMRemoteSettings *settings, NetConnectionEditor *editor); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-security.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-security.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-security.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-security.c 2016-08-31 11:24:09.000000000 +0000 @@ -24,8 +24,7 @@ #include #include -#include -#include +#include #include "wireless-security.h" #include "ce-page-security.h" @@ -211,7 +210,6 @@ GtkListStore *sec_model; GtkTreeIter iter; const gchar *mode; - const gchar *security; guint32 dev_caps = 0; NMUtilsSecurityType default_type = NMU_SEC_NONE; int active = -1; @@ -240,13 +238,10 @@ page->adhoc = is_adhoc; sws = nm_connection_get_setting_wireless_security (connection); - security = nm_setting_wireless_get_security (sw); - if (!security || strcmp (security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) != 0) - sws = NULL; if (sws) default_type = get_default_type_for_security (sws); - sec_model = gtk_list_store_new (3, G_TYPE_STRING, wireless_security_get_g_type (), G_TYPE_BOOLEAN); + sec_model = gtk_list_store_new (3, G_TYPE_STRING, wireless_security_get_type (), G_TYPE_BOOLEAN); if (nm_utils_security_valid (NMU_SEC_NONE, dev_caps, FALSE, is_adhoc, 0, 0, 0)) { gtk_list_store_insert_with_values (sec_model, &iter, -1, @@ -390,23 +385,22 @@ sec = security_combo_get_active (CE_PAGE_SECURITY (page)); if (sec) { - const GByteArray *ssid = nm_setting_wireless_get_ssid (sw); + GBytes *ssid = nm_setting_wireless_get_ssid (sw); if (ssid) { /* FIXME: get failed property and error out of wifi security objects */ - valid = wireless_security_validate (sec, ssid); + valid = wireless_security_validate (sec, error); if (valid) wireless_security_fill_connection (sec, connection); - else - g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, "Invalid Wi-Fi security"); } else { - g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, "Missing SSID"); + g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING, "Missing SSID"); valid = FALSE; } if (CE_PAGE_SECURITY (page)->adhoc) { if (!wireless_security_adhoc_compatible (sec)) { - g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_UNKNOWN, "Security not compatible with Ad-Hoc mode"); + if (valid) + g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, "Security not compatible with Ad-Hoc mode"); valid = FALSE; } } @@ -414,14 +408,13 @@ wireless_security_unref (sec); } else { /* No security, unencrypted */ - g_object_set (sw, NM_SETTING_WIRELESS_SEC, NULL, NULL); nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY); nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X); valid = TRUE; } sc = nm_connection_get_setting_connection (connection); - firewall_ui_to_setting (sc, CE_PAGE_SECURITY (page)->firewall_combo); + firewall_ui_to_setting (sc, GTK_WIDGET (CE_PAGE_SECURITY (page)->firewall_combo)); return valid; } @@ -453,38 +446,32 @@ CEPage * ce_page_security_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageSecurity *page; - const gchar *security; NMUtilsSecurityType default_type = NMU_SEC_NONE; NMSettingWirelessSecurity *sws; page = CE_PAGE_SECURITY (ce_page_new (CE_TYPE_PAGE_SECURITY, connection, client, - settings, "/org/gnome/control-center/network/security-page.ui", _("Security"))); sws = nm_connection_get_setting_wireless_security (connection); - security = nm_setting_wireless_get_security (nm_connection_get_setting_wireless (connection)); - if (!security || strcmp (security, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) != 0) - sws = NULL; if (sws) default_type = get_default_type_for_security (sws); - if (default_type == NMU_SEC_STATIC_WEP - || default_type == NMU_SEC_LEAP - || default_type == NMU_SEC_WPA_PSK - || default_type == NMU_SEC_WPA2_PSK) { + if (default_type == NMU_SEC_STATIC_WEP || + default_type == NMU_SEC_LEAP || + default_type == NMU_SEC_WPA_PSK || + default_type == NMU_SEC_WPA2_PSK) { CE_PAGE (page)->security_setting = NM_SETTING_WIRELESS_SECURITY_SETTING_NAME; } - if (default_type == NMU_SEC_DYNAMIC_WEP - || default_type == NMU_SEC_WPA_ENTERPRISE - || default_type == NMU_SEC_WPA2_ENTERPRISE) { + if (default_type == NMU_SEC_DYNAMIC_WEP || + default_type == NMU_SEC_WPA_ENTERPRISE || + default_type == NMU_SEC_WPA2_ENTERPRISE) { CE_PAGE (page)->security_setting = NM_SETTING_802_1X_SETTING_NAME; } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-security.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-security.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-security.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-security.h 2016-08-12 12:43:57.000000000 +0000 @@ -59,8 +59,7 @@ GType ce_page_security_get_type (void); CEPage *ce_page_security_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-vpn.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-vpn.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-vpn.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-vpn.c 2016-08-12 12:43:57.000000000 +0000 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "ce-page-vpn.h" #include "vpn-helpers.h" @@ -94,14 +94,15 @@ CEPage *parent = CE_PAGE (page); GtkWidget *ui_widget, *failure; - page->ui = nm_vpn_plugin_ui_interface_ui_factory (page->plugin, connection, NULL); - if (!page->ui) { - page->plugin = NULL; - return; - } - ui_widget = GTK_WIDGET (nm_vpn_plugin_ui_widget_interface_get_widget (page->ui)); + page->editor = nm_vpn_editor_plugin_get_editor (page->plugin, + connection, + NULL); + ui_widget = NULL; + if (page->editor) + ui_widget = GTK_WIDGET (nm_vpn_editor_get_widget (page->editor)); + if (!ui_widget) { - g_clear_object (&page->ui); + g_clear_object (&page->editor); page->plugin = NULL; return; } @@ -113,7 +114,7 @@ gtk_box_pack_start (page->box, ui_widget, TRUE, TRUE, 0); gtk_widget_show_all (ui_widget); - g_signal_connect_swapped (page->ui, "changed", G_CALLBACK (ce_page_changed), page); + g_signal_connect_swapped (page->editor, "changed", G_CALLBACK (ce_page_changed), page); } static void @@ -158,10 +159,10 @@ if (!nm_setting_verify (NM_SETTING (self->setting_connection), NULL, error)) return FALSE; - if (!self->ui) + if (!self->editor) return TRUE; - return nm_vpn_plugin_ui_widget_interface_update_connection (self->ui, connection, error); + return nm_vpn_editor_update_connection (self->editor, connection, error); } static void @@ -174,7 +175,7 @@ { CEPageVpn *page = CE_PAGE_VPN (object); - g_clear_object (&page->ui); + g_clear_object (&page->editor); G_OBJECT_CLASS (ce_page_vpn_parent_class)->dispose (object); } @@ -209,15 +210,13 @@ CEPage * ce_page_vpn_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageVpn *page; page = CE_PAGE_VPN (ce_page_new (CE_TYPE_PAGE_VPN, connection, client, - settings, "/org/gnome/control-center/network/vpn-page.ui", _("Identity"))); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-vpn.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-vpn.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-vpn.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-vpn.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,9 +24,7 @@ #include -#include -#define NM_VPN_API_SUBJECT_TO_CHANGE -#include +#include #include #include "ce-page.h" @@ -48,13 +46,13 @@ CEPage parent; NMSettingConnection *setting_connection; - NMSettingVPN *setting_vpn; + NMSettingVpn *setting_vpn; GtkEntry *name; GtkBox *box; - NMVpnPluginUiInterface *plugin; - NMVpnPluginUiWidgetInterface *ui; + NMVpnEditorPlugin *plugin; + NMVpnEditor *editor; }; struct _CEPageVpnClass @@ -65,8 +63,7 @@ GType ce_page_vpn_get_type (void); CEPage *ce_page_vpn_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-wifi.c gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-wifi.c --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-wifi.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-wifi.c 2016-08-12 12:43:57.000000000 +0000 @@ -24,9 +24,7 @@ #include #include -#include -#include -#include +#include #include @@ -54,15 +52,14 @@ { NMSettingConnection *sc; GtkWidget *widget; - const GByteArray *ssid; + GBytes *ssid; gchar *utf8_ssid; GPtrArray *bssid_array; gchar **bssid_list; - const GByteArray *s_bssid; - gchar *s_bssid_str; + const char *s_bssid_str; gchar **mac_list; - const GByteArray *s_mac; - gchar *s_mac_str; + const gchar *s_mac_str; + const gchar *cloned_mac; gint i; widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, @@ -70,7 +67,7 @@ ssid = nm_setting_wireless_get_ssid (page->setting); if (ssid) - utf8_ssid = nm_utils_ssid_to_utf8 (ssid); + utf8_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); else utf8_ssid = g_strdup (""); gtk_entry_set_text (GTK_ENTRY (widget), utf8_ssid); @@ -87,10 +84,8 @@ } g_ptr_array_add (bssid_array, NULL); bssid_list = (gchar **) g_ptr_array_free (bssid_array, FALSE); - s_bssid = nm_setting_wireless_get_bssid (page->setting); - s_bssid_str = s_bssid ? nm_utils_hwaddr_ntoa (s_bssid->data, ARPHRD_ETHER) : NULL; + s_bssid_str = nm_setting_wireless_get_bssid (page->setting); ce_page_setup_mac_combo (GTK_COMBO_BOX_TEXT (widget), s_bssid_str, bssid_list); - g_free (s_bssid_str); g_strfreev (bssid_list); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); @@ -98,18 +93,16 @@ "combo_mac")); mac_list = ce_page_get_mac_list (CE_PAGE (page)->client, NM_TYPE_DEVICE_WIFI, NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS); - s_mac = nm_setting_wireless_get_mac_address (page->setting); - s_mac_str = s_mac ? nm_utils_hwaddr_ntoa (s_mac->data, ARPHRD_ETHER) : NULL; + s_mac_str = nm_setting_wireless_get_mac_address (page->setting); ce_page_setup_mac_combo (GTK_COMBO_BOX_TEXT (widget), s_mac_str, mac_list); - g_free (s_mac_str); g_strfreev (mac_list); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_cloned_mac")); - ce_page_mac_to_entry (nm_setting_wireless_get_cloned_mac_address (page->setting), - ARPHRD_ETHER, GTK_ENTRY (widget)); + cloned_mac = nm_setting_wireless_get_cloned_mac_address (page->setting); + gtk_entry_set_text (GTK_ENTRY (widget), cloned_mac ? cloned_mac : ""); g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page); widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, @@ -134,27 +127,26 @@ static void ui_to_setting (CEPageWifi *page) { - GByteArray *ssid; - GByteArray *bssid = NULL; - GByteArray *device_mac = NULL; - GByteArray *cloned_mac = NULL; + GBytes *ssid; + const gchar *utf8_ssid, *bssid; GtkWidget *entry; - const gchar *utf8_ssid; + char *device_mac, *cloned_mac; entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_ssid")); utf8_ssid = gtk_entry_get_text (GTK_ENTRY (entry)); if (!utf8_ssid || !*utf8_ssid) ssid = NULL; else { - ssid = g_byte_array_sized_new (strlen (utf8_ssid)); - g_byte_array_append (ssid, (const guint8*)utf8_ssid, strlen (utf8_ssid)); + ssid = g_bytes_new_static (utf8_ssid, strlen (utf8_ssid)); } entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_bssid"))); - bssid = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, NULL); + bssid = gtk_entry_get_text (GTK_ENTRY (entry)); + if (*bssid == '\0') + bssid = NULL; entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_mac"))); - device_mac = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, NULL); + device_mac = ce_page_trim_address (gtk_entry_get_text (GTK_ENTRY (entry))); entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_cloned_mac")); - cloned_mac = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, NULL); + cloned_mac = ce_page_trim_address (gtk_entry_get_text (GTK_ENTRY (entry))); g_object_set (page->setting, NM_SETTING_WIRELESS_SSID, ssid, @@ -164,13 +156,9 @@ NULL); if (ssid) - g_byte_array_free (ssid, TRUE); - if (bssid) - g_byte_array_free (bssid, TRUE); - if (device_mac) - g_byte_array_free (device_mac, TRUE); - if (cloned_mac) - g_byte_array_free (cloned_mac, TRUE); + g_bytes_unref (ssid); + g_free (cloned_mac); + g_free (device_mac); } static gboolean @@ -179,42 +167,29 @@ GError **error) { GtkWidget *entry; - GByteArray *ignore; - gboolean invalid; - gchar *security; - NMSettingWireless *setting; gboolean ret = TRUE; entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_bssid"))); - ignore = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, &invalid); - if (invalid) { + if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; } else { - if (ignore) - g_byte_array_free (ignore, TRUE); widget_unset_error (entry); } entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_mac"))); - ignore = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, &invalid); - if (invalid) { + if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; } else { - if (ignore) - g_byte_array_free (ignore, TRUE); widget_unset_error (entry); } entry = GTK_WIDGET (gtk_builder_get_object (page->builder, "entry_cloned_mac")); - ignore = ce_page_entry_to_mac (GTK_ENTRY (entry), ARPHRD_ETHER, &invalid); - if (invalid) { + if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) { widget_set_error (entry); ret = FALSE; } else { - if (ignore) - g_byte_array_free (ignore, TRUE); widget_unset_error (entry); } @@ -223,14 +198,6 @@ ui_to_setting (CE_PAGE_WIFI (page)); - /* A hack to not check the wifi security here */ - setting = CE_PAGE_WIFI (page)->setting; - security = g_strdup (nm_setting_wireless_get_security (setting)); - g_object_set (setting, NM_SETTING_WIRELESS_SEC, NULL, NULL); - ret = nm_setting_verify (NM_SETTING (setting), NULL, error); - g_object_set (setting, NM_SETTING_WIRELESS_SEC, security, NULL); - g_free (security); - return ret; } @@ -249,15 +216,13 @@ CEPage * ce_page_wifi_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { CEPageWifi *page; page = CE_PAGE_WIFI (ce_page_new (CE_TYPE_PAGE_WIFI, connection, client, - settings, "/org/gnome/control-center/network/wifi-page.ui", _("Identity"))); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-wifi.h gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-wifi.h --- gnome-control-center-3.20.2/panels/network/connection-editor/ce-page-wifi.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/ce-page-wifi.h 2016-08-12 12:43:57.000000000 +0000 @@ -54,8 +54,7 @@ GType ce_page_wifi_get_type (void); CEPage *ce_page_wifi_new (NMConnection *connection, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/firewall-helpers.h gnome-control-center-3.22.1/panels/network/connection-editor/firewall-helpers.h --- gnome-control-center-3.20.2/panels/network/connection-editor/firewall-helpers.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/firewall-helpers.h 2016-08-12 12:43:57.000000000 +0000 @@ -19,7 +19,7 @@ #ifndef _FIREWALL_HELPERS_H_ #define _FIREWALL_HELPERS_H_ -#include +#include #include void firewall_ui_setup (NMSettingConnection *setting, diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/Makefile.in gnome-control-center-3.22.1/panels/network/connection-editor/Makefile.in --- gnome-control-center-3.20.2/panels/network/connection-editor/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -299,8 +299,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -552,22 +550,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libconnection_editor_la-vpn-helpers.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/net-connection-editor.c gnome-control-center-3.22.1/panels/network/connection-editor/net-connection-editor.c --- gnome-control-center-3.20.2/panels/network/connection-editor/net-connection-editor.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/net-connection-editor.c 2016-08-12 12:43:57.000000000 +0000 @@ -24,8 +24,7 @@ #include #include -#include -#include +#include #include "shell/list-box-helper.h" #include "net-connection-editor.h" @@ -40,6 +39,7 @@ #include "ce-page-8021x-security.h" #include "ce-page-vpn.h" #include "vpn-helpers.h" +#include "eap-method.h" enum { DONE, @@ -79,47 +79,63 @@ static void update_connection (NetConnectionEditor *editor) { - GHashTable *settings; + GVariant *settings; - settings = nm_connection_to_hash (editor->connection, NM_SETTING_HASH_FLAG_ALL); + settings = nm_connection_to_dbus (editor->connection, NM_CONNECTION_SERIALIZE_ALL); nm_connection_replace_settings (editor->orig_connection, settings, NULL); - g_hash_table_destroy (settings); + g_variant_unref (settings); } static void -update_complete (NetConnectionEditor *editor, GError *error) +update_complete (NetConnectionEditor *editor, + gboolean success) { gtk_widget_hide (editor->window); - g_signal_emit (editor, signals[DONE], 0, !error); + g_signal_emit (editor, signals[DONE], 0, success); } static void -updated_connection_cb (NMRemoteConnection *connection, - GError *error, - gpointer data) +updated_connection_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - NetConnectionEditor *editor = data; + NetConnectionEditor *editor; + GError *error = NULL; + gboolean success = TRUE; - nm_connection_clear_secrets (NM_CONNECTION (connection)); + if (!nm_remote_connection_commit_changes_finish (NM_REMOTE_CONNECTION (source_object), + res, &error)) { + g_warning ("Failed to commit changes: %s", error->message); + success = FALSE; + g_error_free (error); + //return; FIXME return if cancelled + } - update_complete (editor, error); + nm_connection_clear_secrets (NM_CONNECTION (source_object)); + + editor = user_data; + update_complete (editor, success); } static void -added_connection_cb (NMRemoteSettings *settings, - NMRemoteConnection *connection, - GError *error, - gpointer data) +added_connection_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - NetConnectionEditor *editor = data; + NetConnectionEditor *editor; + GError *error = NULL; + gboolean success = TRUE; - if (error) { + if (!nm_client_add_connection_finish (NM_CLIENT (source_object), res, &error)) { g_warning ("Failed to add connection: %s", error->message); + success = FALSE; + g_error_free (error); /* Leave the editor open */ - return; + // return; FIXME return if cancelled } - update_complete (editor, error); + editor = user_data; + update_complete (editor, success); } static void @@ -127,14 +143,20 @@ { update_connection (editor); + eap_method_ca_cert_ignore_save (editor->connection); + if (editor->is_new_connection) { - nm_remote_settings_add_connection (editor->settings, - editor->orig_connection, - added_connection_cb, - editor); + nm_client_add_connection_async (editor->client, + editor->orig_connection, + TRUE, + NULL, + added_connection_cb, + editor); } else { - nm_remote_connection_commit_changes (NM_REMOTE_CONNECTION (editor->orig_connection), - updated_connection_cb, editor); + nm_remote_connection_commit_changes_async (NM_REMOTE_CONNECTION (editor->orig_connection), + TRUE, + NULL, + updated_connection_cb, editor); } } @@ -200,7 +222,6 @@ g_clear_object (&editor->parent_window); g_clear_object (&editor->builder); g_clear_object (&editor->device); - g_clear_object (&editor->settings); g_clear_object (&editor->client); g_clear_object (&editor->ap); @@ -299,9 +320,9 @@ NMSettingWireless *sw; sw = nm_connection_get_setting_wireless (editor->connection); if (sw) { - const GByteArray *ssid; + GBytes *ssid; ssid = nm_setting_wireless_get_ssid (sw); - id = nm_utils_ssid_to_utf8 (ssid); + id = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); } else { id = g_strdup (nm_connection_get_id (editor->connection)); } @@ -437,23 +458,29 @@ NetConnectionEditor *editor; CEPage *page; const gchar *setting_name; - gboolean canceled; } GetSecretsInfo; static void -get_secrets_cb (NMRemoteConnection *connection, - GHashTable *secrets, - GError *error, - gpointer user_data) +get_secrets_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { + NMRemoteConnection *connection; GetSecretsInfo *info = user_data; + GError *error = NULL; + GVariant *variant; + + connection = NM_REMOTE_CONNECTION (source_object); + variant = nm_remote_connection_get_secrets_finish (connection, res, &error); - if (info->canceled) { + if (!variant && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); g_free (info); return; } - ce_page_complete_init (info->page, info->setting_name, secrets, error); + ce_page_complete_init (info->page, info->setting_name, variant, error); + g_variant_unref (variant); g_free (info); } @@ -469,10 +496,11 @@ info->page = page; info->setting_name = setting_name; - nm_remote_connection_get_secrets (NM_REMOTE_CONNECTION (editor->orig_connection), - setting_name, - get_secrets_cb, - info); + nm_remote_connection_get_secrets_async (NM_REMOTE_CONNECTION (editor->orig_connection), + setting_name, + NULL, //FIXME + get_secrets_cb, + info); } static void @@ -508,8 +536,8 @@ GtkTreeSelection *selection; GtkTreePath *path; - editor->is_new_connection = !nm_remote_settings_get_connection_by_uuid (editor->settings, - nm_connection_get_uuid (connection)); + editor->is_new_connection = !nm_client_get_connection_by_uuid (editor->client, + nm_connection_get_uuid (connection)); if (editor->is_new_connection) { GtkWidget *button; @@ -519,39 +547,41 @@ editor->is_changed = TRUE; } - editor->connection = nm_connection_duplicate (connection); + editor->connection = nm_simple_connection_new_clone (connection); editor->orig_connection = g_object_ref (connection); net_connection_editor_update_title (editor); + eap_method_ca_cert_ignore_load (editor->connection); + sc = nm_connection_get_setting_connection (connection); type = nm_setting_connection_get_connection_type (sc); if (!editor->is_new_connection) - add_page (editor, ce_page_details_new (editor->connection, editor->client, editor->settings, editor->device, editor->ap)); + add_page (editor, ce_page_details_new (editor->connection, editor->client, editor->device, editor->ap)); if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0) - add_page (editor, ce_page_security_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_security_new (editor->connection, editor->client)); else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0) - add_page (editor, ce_page_8021x_security_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_8021x_security_new (editor->connection, editor->client)); if (strcmp (type, NM_SETTING_WIRELESS_SETTING_NAME) == 0) - add_page (editor, ce_page_wifi_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_wifi_new (editor->connection, editor->client)); else if (strcmp (type, NM_SETTING_WIRED_SETTING_NAME) == 0) - add_page (editor, ce_page_ethernet_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_ethernet_new (editor->connection, editor->client)); else if (strcmp (type, NM_SETTING_VPN_SETTING_NAME) == 0) - add_page (editor, ce_page_vpn_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_vpn_new (editor->connection, editor->client)); else { /* Unsupported type */ net_connection_editor_do_fallback (editor, type); return; } - add_page (editor, ce_page_ip4_new (editor->connection, editor->client, editor->settings)); - add_page (editor, ce_page_ip6_new (editor->connection, editor->client, editor->settings)); + add_page (editor, ce_page_ip4_new (editor->connection, editor->client)); + add_page (editor, ce_page_ip6_new (editor->connection, editor->client)); if (!editor->is_new_connection) - add_page (editor, ce_page_reset_new (editor->connection, editor->client, editor->settings, editor)); + add_page (editor, ce_page_reset_new (editor->connection, editor->client, editor)); pages = g_slist_copy (editor->initializing_pages); for (l = pages; l; l = l->next) { @@ -574,32 +604,14 @@ gtk_tree_path_free (path); } -typedef struct { - const char *name; - GType (*type_func) (void); -} NetConnectionType; - -static const NetConnectionType connection_types[] = { - { N_("VPN"), nm_setting_vpn_get_type }, - { N_("Bond"), nm_setting_bond_get_type }, -#ifdef HAVE_NM_UNSTABLE - { N_("Team"), nm_setting_team_get_type }, -#endif /* NM_UNSTABLE */ - { N_("Bridge"), nm_setting_bridge_get_type }, - { N_("VLAN"), nm_setting_vlan_get_type } -}; -static const NetConnectionType *vpn_connection_type = &connection_types[0]; - static NMConnection * -complete_connection_for_type (NetConnectionEditor *editor, NMConnection *connection, - const NetConnectionType *connection_type) +complete_vpn_connection (NetConnectionEditor *editor, NMConnection *connection) { NMSettingConnection *s_con; NMSetting *s_type; - GType connection_gtype; if (!connection) - connection = nm_connection_new (); + connection = nm_simple_connection_new (); s_con = nm_connection_get_setting_connection (connection); if (!s_con) { @@ -616,22 +628,20 @@ } if (!nm_setting_connection_get_id (s_con)) { - GSList *connections; + const GPtrArray *connections; gchar *id; - connections = nm_remote_settings_list_connections (editor->settings); - id = ce_page_get_next_available_name (connections, NAME_FORMAT_TYPE, _(connection_type->name)); + connections = nm_client_get_connections (editor->client); + id = ce_page_get_next_available_name (connections, NAME_FORMAT_TYPE, _("VPN")); g_object_set (s_con, NM_SETTING_CONNECTION_ID, id, NULL); g_free (id); - g_slist_free (connections); } - connection_gtype = connection_type->type_func (); - s_type = nm_connection_get_setting (connection, connection_gtype); + s_type = nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN); if (!s_type) { - s_type = g_object_new (connection_gtype, NULL); + s_type = g_object_new (NM_TYPE_SETTING_VPN, NULL); nm_connection_add_setting (connection, s_type); } @@ -644,25 +654,6 @@ return connection; } -static gint -sort_vpn_plugins (gconstpointer a, gconstpointer b) -{ - NMVpnPluginUiInterface *aa = NM_VPN_PLUGIN_UI_INTERFACE (a); - NMVpnPluginUiInterface *bb = NM_VPN_PLUGIN_UI_INTERFACE (b); - char *aa_desc = NULL, *bb_desc = NULL; - int ret; - - g_object_get (aa, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &aa_desc, NULL); - g_object_get (bb, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &bb_desc, NULL); - - ret = g_strcmp0 (aa_desc, bb_desc); - - g_free (aa_desc); - g_free (bb_desc); - - return ret; -} - static void finish_add_connection (NetConnectionEditor *editor, NMConnection *connection) { @@ -691,7 +682,7 @@ return; } - complete_connection_for_type (editor, connection, vpn_connection_type); + complete_vpn_connection (editor, connection); finish_add_connection (editor, connection); } @@ -700,7 +691,7 @@ { const char *service_name = g_object_get_data (G_OBJECT (row), "service_name"); NMConnection *connection; - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; NMSettingConnection *s_con; if (!strcmp (service_name, "import")) { @@ -708,7 +699,7 @@ return; } - connection = complete_connection_for_type (editor, NULL, vpn_connection_type); + connection = complete_vpn_connection (editor, NULL); s_vpn = nm_connection_get_setting_vpn (connection); g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_name, NULL); @@ -723,45 +714,30 @@ static void select_vpn_type (NetConnectionEditor *editor, GtkListBox *list) { - GHashTable *vpn_plugins; - GHashTableIter vpn_iter; - gpointer service_name, vpn_plugin; - GList *children, *plugin_list, *iter; + GSList *vpn_plugins, *iter; + GList *l; + GList *children; GtkWidget *row, *row_box; GtkWidget *name_label, *desc_label; - GError *error = NULL; /* Get the available VPN types */ - vpn_plugins = vpn_get_plugins (&error); - if (!vpn_plugins) { - net_connection_editor_error_dialog (editor, - _("Could not load VPN plugins"), - error->message); - g_error_free (error); - finish_add_connection (editor, NULL); - g_signal_emit (editor, signals[DONE], 0, FALSE); - return; - } - plugin_list = NULL; - g_hash_table_iter_init (&vpn_iter, vpn_plugins); - while (g_hash_table_iter_next (&vpn_iter, &service_name, &vpn_plugin)) - plugin_list = g_list_prepend (plugin_list, vpn_plugin); - plugin_list = g_list_sort (plugin_list, sort_vpn_plugins); + vpn_plugins = vpn_get_plugins (); /* Remove the previous menu contents */ children = gtk_container_get_children (GTK_CONTAINER (list)); - for (iter = children; iter; iter = iter->next) - gtk_widget_destroy (iter->data); + for (l = children; l != NULL; l = l->next) + gtk_widget_destroy (l->data); /* Add the VPN types */ - for (iter = plugin_list; iter; iter = iter->next) { + for (iter = vpn_plugins; iter; iter = iter->next) { + NMVpnEditorPlugin *plugin = nm_vpn_plugin_info_get_editor_plugin (iter->data); char *name, *desc, *desc_markup, *service_name; GtkStyleContext *context; - g_object_get (iter->data, - "name", &name, - "desc", &desc, - "service", &service_name, + g_object_get (plugin, + NM_VPN_EDITOR_PLUGIN_NAME, &name, + NM_VPN_EDITOR_PLUGIN_DESCRIPTION, &desc, + NM_VPN_EDITOR_PLUGIN_SERVICE, &service_name, NULL); desc_markup = g_markup_printf_escaped ("%s", desc); @@ -818,29 +794,11 @@ } static void -connection_type_activated (GtkListBox *list, GtkWidget *row, NetConnectionEditor *editor) -{ - const NetConnectionType *connection_type = g_object_get_data (G_OBJECT (row), "connection_type"); - NMConnection *connection; - - g_signal_handlers_disconnect_by_func (list, G_CALLBACK (connection_type_activated), editor); - - if (connection_type == vpn_connection_type) { - select_vpn_type (editor, list); - return; - } - - connection = complete_connection_for_type (editor, NULL, connection_type); - finish_add_connection (editor, connection); -} - -static void net_connection_editor_add_connection (NetConnectionEditor *editor) { GtkNotebook *notebook; GtkContainer *frame; GtkListBox *list; - int i; notebook = GTK_NOTEBOOK (gtk_builder_get_object (editor->builder, "details_toplevel_notebook")); frame = GTK_CONTAINER (gtk_builder_get_object (editor->builder, "details_add_connection_frame")); @@ -848,34 +806,15 @@ list = GTK_LIST_BOX (gtk_list_box_new ()); gtk_list_box_set_selection_mode (list, GTK_SELECTION_NONE); gtk_list_box_set_header_func (list, cc_list_box_update_header_func, NULL, NULL); - g_signal_connect (list, "row-activated", - G_CALLBACK (connection_type_activated), editor); - for (i = 0; i < G_N_ELEMENTS (connection_types); i++) { - GtkWidget *row, *row_box, *label; - - row = gtk_list_box_row_new (); - - row_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - label = gtk_label_new (_(connection_types[i].name)); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_margin_start (label, 12); - gtk_widget_set_margin_end (label, 12); - gtk_widget_set_margin_top (label, 12); - gtk_widget_set_margin_bottom (label, 12); - gtk_box_pack_start (GTK_BOX (row_box), label, FALSE, TRUE, 0); - - g_object_set_data (G_OBJECT (row), "connection_type", (gpointer) &connection_types[i]); - gtk_container_add (GTK_CONTAINER (row), row_box); - gtk_container_add (GTK_CONTAINER (list), row); - } + select_vpn_type (editor, list); gtk_widget_show_all (GTK_WIDGET (list)); gtk_container_add (frame, GTK_WIDGET (list)); gtk_notebook_set_current_page (notebook, 1); gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (editor->builder, "details_apply_button"))); - gtk_window_set_title (GTK_WINDOW (editor->window), _("Add Network Connection")); + gtk_window_set_title (GTK_WINDOW (editor->window), _("Add VPN")); } static void @@ -900,8 +839,7 @@ NMConnection *connection, NMDevice *device, NMAccessPoint *ap, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { NetConnectionEditor *editor; @@ -917,7 +855,6 @@ if (device) editor->device = g_object_ref (device); editor->client = g_object_ref (client); - editor->settings = g_object_ref (settings); editor->can_modify = nm_client_get_permission_result (client, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM); editor->permission_id = g_signal_connect (editor->client, "permission-changed", @@ -942,16 +879,21 @@ } static void -forgotten_cb (NMRemoteConnection *connection, - GError *error, - gpointer data) +forgotten_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - NetConnectionEditor *editor = data; + NMRemoteConnection *connection = NM_REMOTE_CONNECTION (source_object); + NetConnectionEditor *editor = user_data; + GError *error = NULL; - if (error != NULL) { - g_warning ("Failed to delete conneciton %s: %s", - nm_connection_get_id (NM_CONNECTION (connection)), - error->message); + if (!nm_remote_connection_delete_finish (connection, res, &error)) { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("Failed to delete conneciton %s: %s", + nm_connection_get_id (NM_CONNECTION (connection)), + error->message); + g_error_free (error); + return; } cancel_editing (editor); @@ -960,17 +902,18 @@ void net_connection_editor_forget (NetConnectionEditor *editor) { - nm_remote_connection_delete (NM_REMOTE_CONNECTION (editor->orig_connection), forgotten_cb, editor); + nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (editor->orig_connection), + NULL, forgotten_cb, editor); } void net_connection_editor_reset (NetConnectionEditor *editor) { - GHashTable *settings; + GVariant *settings; - settings = nm_connection_to_hash (editor->orig_connection, NM_SETTING_HASH_FLAG_ALL); + settings = nm_connection_to_dbus (editor->orig_connection, NM_CONNECTION_SERIALIZE_ALL); nm_connection_replace_settings (editor->connection, settings, NULL); - g_hash_table_destroy (settings); + g_variant_unref (settings); } void diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/net-connection-editor.h gnome-control-center-3.22.1/panels/network/connection-editor/net-connection-editor.h --- gnome-control-center-3.20.2/panels/network/connection-editor/net-connection-editor.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/net-connection-editor.h 2016-08-12 12:43:57.000000000 +0000 @@ -25,9 +25,7 @@ #include #include -#include -#include -#include +#include G_BEGIN_DECLS @@ -48,7 +46,6 @@ GtkWidget *parent_window; NMClient *client; NMDevice *device; - NMRemoteSettings *settings; NMConnection *connection; NMConnection *orig_connection; @@ -81,8 +78,7 @@ NMConnection *connection, NMDevice *device, NMAccessPoint *ap, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); void net_connection_editor_set_title (NetConnectionEditor *editor, const gchar *title); void net_connection_editor_run (NetConnectionEditor *editor); diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/vpn-helpers.c gnome-control-center-3.22.1/panels/network/connection-editor/vpn-helpers.c --- gnome-control-center-3.20.2/panels/network/connection-editor/vpn-helpers.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/vpn-helpers.c 2016-10-10 16:16:39.000000000 +0000 @@ -27,144 +27,75 @@ #include #include #include - -#include -#include -#include +#include #include "vpn-helpers.h" -#define NM_VPN_API_SUBJECT_TO_CHANGE -#include "nm-vpn-plugin-ui-interface.h" - -static GHashTable *plugins = NULL; - -NMVpnPluginUiInterface * +NMVpnEditorPlugin * vpn_get_plugin_by_service (const char *service) { - g_return_val_if_fail (service != NULL, NULL); + NMVpnPluginInfo *plugin_info; - if (!plugins) { - vpn_get_plugins (NULL); - if (!plugins) - return NULL; - } - return g_hash_table_lookup (plugins, service); + g_return_val_if_fail (service != NULL, NULL); + + plugin_info = nm_vpn_plugin_info_list_find_by_service (vpn_get_plugins (), service); + if (plugin_info) + return nm_vpn_plugin_info_get_editor_plugin (plugin_info); + return NULL; } -GHashTable * -vpn_get_plugins (GError **error) +static gint +_sort_vpn_plugins (NMVpnPluginInfo *aa, NMVpnPluginInfo *bb) { - GDir *dir; - const char *f; + return strcmp (nm_vpn_plugin_info_get_name (aa), nm_vpn_plugin_info_get_name (bb)); +} - if (error) - g_return_val_if_fail (*error == NULL, NULL); +GSList * +vpn_get_plugins (void) +{ + static gboolean plugins_loaded = FALSE; + static GSList *plugins = NULL; + GSList *p; - if (plugins) + if (G_LIKELY (plugins_loaded)) return plugins; + plugins_loaded = TRUE; - dir = g_dir_open (NM_VPN_CONFIG_DIR, 0, error); - if (!dir) - return NULL; - - plugins = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - - while ((f = g_dir_read_name (dir))) { - char *path = NULL, *service = NULL; - char *so_path = NULL, *so_name = NULL; - GKeyFile *keyfile = NULL; - GModule *module = NULL; - NMVpnPluginUiFactory factory = NULL; - - if (!g_str_has_suffix (f, ".name")) - continue; - - path = g_strdup_printf ("%s/%s", NM_VPN_CONFIG_DIR, f); - - keyfile = g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, path, 0, NULL)) - goto next; - - service = g_key_file_get_string (keyfile, "VPN Connection", "service", NULL); - if (!service) - goto next; - - so_path = g_key_file_get_string (keyfile, "GNOME", "properties", NULL); - if (!so_path) - goto next; - - if (g_path_is_absolute (so_path)) - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - - if (!module) { - /* Remove any path and extension components, then reconstruct path - * to the SO in LIBDIR - */ - so_name = g_path_get_basename (so_path); - g_free (so_path); - so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); - g_free (so_name); - - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " - "service '%s'.", service); - goto next; - } - } - - if (g_module_symbol (module, "nm_vpn_plugin_ui_factory", (gpointer) &factory)) { - NMVpnPluginUiInterface *plugin; - GError *factory_error = NULL; - gboolean success = FALSE; - - plugin = factory (&factory_error); - if (plugin) { - char *plug_name = NULL, *plug_service = NULL; - - /* Validate plugin properties */ - g_object_get (G_OBJECT (plugin), - NM_VPN_PLUGIN_UI_INTERFACE_NAME, &plug_name, - NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, &plug_service, - NULL); - if (!plug_name || !strlen (plug_name)) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "cannot load VPN plugin in '%s': missing plugin name", - g_module_name (module)); - } else if (!plug_service || strcmp (plug_service, service)) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "cannot load VPN plugin in '%s': invalid service name", - g_module_name (module)); - } else { - /* Success! */ - g_object_set_data_full (G_OBJECT (plugin), "gmodule", module, - (GDestroyNotify) g_module_close); - g_hash_table_insert (plugins, g_strdup (service), plugin); - success = TRUE; - } - g_free (plug_name); - g_free (plug_service); + p = nm_vpn_plugin_info_list_load (); + plugins = NULL; + while (p) { + NMVpnPluginInfo *plugin_info = NM_VPN_PLUGIN_INFO (p->data); + GError *error = NULL; + + /* load the editor plugin, and preserve only those NMVpnPluginInfo that can + * successfully load the plugin. */ + if (nm_vpn_plugin_info_load_editor_plugin (plugin_info, &error)) + plugins = g_slist_prepend (plugins, plugin_info); + else { + if ( !nm_vpn_plugin_info_get_plugin (plugin_info) + && nm_vpn_plugin_info_lookup_property (plugin_info, NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME, "properties")) { + g_message ("vpn: (%s,%s) cannot load legacy-only plugin", + nm_vpn_plugin_info_get_name (plugin_info), + nm_vpn_plugin_info_get_filename (plugin_info)); + } else if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { + g_message ("vpn: (%s,%s) file \"%s\" not found. Did you install the client package?", + nm_vpn_plugin_info_get_name (plugin_info), + nm_vpn_plugin_info_get_filename (plugin_info), + nm_vpn_plugin_info_get_plugin (plugin_info)); } else { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "cannot load VPN plugin in '%s': %s", - g_module_name (module), g_module_error ()); + g_warning ("vpn: (%s,%s) could not load plugin: %s", + nm_vpn_plugin_info_get_name (plugin_info), + nm_vpn_plugin_info_get_filename (plugin_info), + error->message); } - - if (!success) - g_module_close (module); - } else { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "cannot locate nm_vpn_plugin_ui_factory() in '%s': %s", - g_module_name (module), g_module_error ()); - g_module_close (module); + g_clear_error (&error); + g_object_unref (plugin_info); } - - next: - g_free (so_path); - g_free (service); - g_key_file_free (keyfile); - g_free (path); + p = g_slist_delete_link (p, p); } - g_dir_close (dir); + /* sort the list of plugins alphabetically. */ + plugins = g_slist_sort (plugins, (GCompareFunc) _sort_vpn_plugins); return plugins; } @@ -178,11 +109,9 @@ { char *filename = NULL; ActionInfo *info = (ActionInfo *) user_data; - GHashTableIter iter; - gpointer key; - NMVpnPluginUiInterface *plugin; NMConnection *connection = NULL; GError *error = NULL; + GSList *iter; if (response != GTK_RESPONSE_ACCEPT) goto out; @@ -193,10 +122,12 @@ goto out; } - g_hash_table_iter_init (&iter, plugins); - while (!connection && g_hash_table_iter_next (&iter, &key, (gpointer *)&plugin)) { + for (iter = vpn_get_plugins (); !connection && iter; iter = iter->next) { + NMVpnEditorPlugin *plugin; + + plugin = nm_vpn_plugin_info_get_editor_plugin (iter->data); g_clear_error (&error); - connection = nm_vpn_plugin_ui_interface_import (plugin, filename, &error); + connection = nm_vpn_editor_plugin_import (plugin, filename, &error); } if (!connection) { @@ -270,9 +201,9 @@ NMConnection *connection = NM_CONNECTION (user_data); char *filename = NULL; GError *error = NULL; - NMVpnPluginUiInterface *plugin; + NMVpnEditorPlugin *plugin; NMSettingConnection *s_con = NULL; - NMSettingVPN *s_vpn = NULL; + NMSettingVpn *s_vpn = NULL; const char *service_type; const char *id = NULL; gboolean success = FALSE; @@ -325,7 +256,7 @@ plugin = vpn_get_plugin_by_service (service_type); if (plugin) - success = nm_vpn_plugin_ui_interface_export (plugin, filename, connection, &error); + success = nm_vpn_editor_plugin_export (plugin, filename, connection, &error); done: if (!success) { @@ -360,8 +291,8 @@ vpn_export (NMConnection *connection) { GtkWidget *dialog; - NMVpnPluginUiInterface *plugin; - NMSettingVPN *s_vpn = NULL; + NMVpnEditorPlugin *plugin; + NMSettingVpn *s_vpn = NULL; const char *service_type; const char *home_folder; @@ -386,7 +317,7 @@ if (plugin) { char *suggested = NULL; - suggested = nm_vpn_plugin_ui_interface_get_suggested_name (plugin, connection); + suggested = nm_vpn_editor_plugin_get_suggested_filename (plugin, connection); if (suggested) { gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested); g_free (suggested); @@ -402,9 +333,9 @@ gboolean vpn_supports_ipv6 (NMConnection *connection) { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; const char *service_type; - NMVpnPluginUiInterface *plugin; + NMVpnEditorPlugin *plugin; guint32 capabilities; s_vpn = nm_connection_get_setting_vpn (connection); @@ -416,6 +347,6 @@ plugin = vpn_get_plugin_by_service (service_type); g_return_val_if_fail (plugin != NULL, FALSE); - capabilities = nm_vpn_plugin_ui_interface_get_capabilities (plugin); - return (capabilities & NM_VPN_PLUGIN_UI_CAPABILITY_IPV6) != 0; + capabilities = nm_vpn_editor_plugin_get_capabilities (plugin); + return (capabilities & NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6) != 0; } diff -Nru gnome-control-center-3.20.2/panels/network/connection-editor/vpn-helpers.h gnome-control-center-3.22.1/panels/network/connection-editor/vpn-helpers.h --- gnome-control-center-3.20.2/panels/network/connection-editor/vpn-helpers.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/connection-editor/vpn-helpers.h 2016-08-12 12:43:57.000000000 +0000 @@ -25,14 +25,11 @@ #include #include -#include +#include -#define NM_VPN_API_SUBJECT_TO_CHANGE -#include +GSList *vpn_get_plugins (void); -GHashTable *vpn_get_plugins (GError **error); - -NMVpnPluginUiInterface *vpn_get_plugin_by_service (const char *service); +NMVpnEditorPlugin *vpn_get_plugin_by_service (const char *service); typedef void (*VpnImportCallback) (NMConnection *connection, gpointer user_data); void vpn_import (GtkWindow *parent, VpnImportCallback callback, gpointer user_data); diff -Nru gnome-control-center-3.20.2/panels/network/gnome-network-panel.desktop.in.in gnome-control-center-3.22.1/panels/network/gnome-network-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/network/gnome-network-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/gnome-network-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Network +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Net­work _Comment=Control how you connect to the Internet Exec=gnome-control-center network Icon=network-workgroup @@ -7,11 +8,11 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center X-GNOME-Bugzilla-Component=network X-GNOME-Bugzilla-Version=@VERSION@ # Translators: those are keywords for the network control-center panel -_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;bridge;bond;DNS; +_Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS; diff -Nru gnome-control-center-3.20.2/panels/network/Makefile.am gnome-control-center-3.22.1/panels/network/Makefile.am --- gnome-control-center-3.20.2/panels/network/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -32,12 +32,6 @@ net-device-ethernet.h \ net-device-mobile.c \ net-device-mobile.h \ - net-device-bond.c \ - net-device-bond.h \ - net-device-bridge.c \ - net-device-bridge.h \ - net-virtual-device.c \ - net-virtual-device.h \ net-vpn.c \ net-vpn.h \ net-proxy.c \ @@ -47,12 +41,6 @@ cc-network-panel.c \ cc-network-panel.h -TEAM_FILES = net-device-team.c net-device-team.h -EXTRA_DIST = $(TEAM_FILES) -if HAVE_NM_UNSTABLE -libnetwork_la_SOURCES += $(TEAM_FILES) -endif - libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS) @@ -70,6 +58,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES) -EXTRA_DIST += $(resource_files) network.gresource.xml +EXTRA_DIST = $(resource_files) network.gresource.xml -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/network/Makefile.in gnome-control-center-3.22.1/panels/network/Makefile.in --- gnome-control-center-3.20.2/panels/network/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -89,7 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_NM_UNSTABLE_TRUE@am__append_1 = $(TEAM_FILES) subdir = panels/network ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ @@ -109,26 +108,12 @@ libnetwork_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(builddir)/connection-editor/libconnection-editor.la -am__libnetwork_la_SOURCES_DIST = cc-network-resources.c \ - cc-network-resources.h panel-common.c panel-common.h \ - net-object.c net-object.h net-device.c net-device.h \ - net-device-wifi.c net-device-wifi.h net-device-simple.c \ - net-device-simple.h net-device-ethernet.c \ - net-device-ethernet.h net-device-mobile.c net-device-mobile.h \ - net-device-bond.c net-device-bond.h net-device-bridge.c \ - net-device-bridge.h net-virtual-device.c net-virtual-device.h \ - net-vpn.c net-vpn.h net-proxy.c net-proxy.h network-dialogs.c \ - network-dialogs.h cc-network-panel.c cc-network-panel.h \ - net-device-team.c net-device-team.h am__objects_1 = cc-network-resources.lo -am__objects_2 = net-device-team.lo -@HAVE_NM_UNSTABLE_TRUE@am__objects_3 = $(am__objects_2) am_libnetwork_la_OBJECTS = $(am__objects_1) panel-common.lo \ net-object.lo net-device.lo net-device-wifi.lo \ net-device-simple.lo net-device-ethernet.lo \ - net-device-mobile.lo net-device-bond.lo net-device-bridge.lo \ - net-virtual-device.lo net-vpn.lo net-proxy.lo \ - network-dialogs.lo cc-network-panel.lo $(am__objects_3) + net-device-mobile.lo net-vpn.lo net-proxy.lo \ + network-dialogs.lo cc-network-panel.lo libnetwork_la_OBJECTS = $(am_libnetwork_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -172,7 +157,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libnetwork_la_SOURCES) -DIST_SOURCES = $(am__libnetwork_la_SOURCES_DIST) +DIST_SOURCES = $(libnetwork_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -379,8 +364,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -522,18 +505,31 @@ cc-network-resources.c \ cc-network-resources.h -libnetwork_la_SOURCES = $(BUILT_SOURCES) panel-common.c panel-common.h \ - net-object.c net-object.h net-device.c net-device.h \ - net-device-wifi.c net-device-wifi.h net-device-simple.c \ - net-device-simple.h net-device-ethernet.c \ - net-device-ethernet.h net-device-mobile.c net-device-mobile.h \ - net-device-bond.c net-device-bond.h net-device-bridge.c \ - net-device-bridge.h net-virtual-device.c net-virtual-device.h \ - net-vpn.c net-vpn.h net-proxy.c net-proxy.h network-dialogs.c \ - network-dialogs.h cc-network-panel.c cc-network-panel.h \ - $(am__append_1) -TEAM_FILES = net-device-team.c net-device-team.h -EXTRA_DIST = $(TEAM_FILES) $(resource_files) network.gresource.xml +libnetwork_la_SOURCES = \ + $(BUILT_SOURCES) \ + panel-common.c \ + panel-common.h \ + net-object.c \ + net-object.h \ + net-device.c \ + net-device.h \ + net-device-wifi.c \ + net-device-wifi.h \ + net-device-simple.c \ + net-device-simple.h \ + net-device-ethernet.c \ + net-device-ethernet.h \ + net-device-mobile.c \ + net-device-mobile.h \ + net-vpn.c \ + net-vpn.h \ + net-proxy.c \ + net-proxy.h \ + network-dialogs.c \ + network-dialogs.h \ + cc-network-panel.c \ + cc-network-panel.h + libnetwork_la_LIBADD = $(PANEL_LIBS) $(NETWORK_PANEL_LIBS) $(NETWORK_MANAGER_LIBS) $(builddir)/connection-editor/libconnection-editor.la libnetwork_la_LDFLAGS = $(PANEL_LDFLAGS) resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/network.gresource.xml) @@ -541,6 +537,7 @@ desktop_in_files = gnome-network-panel.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES) +EXTRA_DIST = $(resource_files) network.gresource.xml all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -600,38 +597,37 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-network-panel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-network-resources.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-bond.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-bridge.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-ethernet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-mobile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-simple.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-team.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device-wifi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-device.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-proxy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-virtual-device.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net-vpn.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-dialogs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel-common.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/network/net-device-bond.c gnome-control-center-3.22.1/panels/network/net-device-bond.c --- gnome-control-center-3.20.2/panels/network/net-device-bond.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-bond.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include - -#include -#include -#include -#include - -#include "panel-common.h" -#include "cc-network-panel.h" - -#include "net-device-bond.h" - -#define NET_DEVICE_BOND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_BOND, NetDeviceBondPrivate)) - -struct _NetDeviceBondPrivate { - char *slaves; -}; - -enum { - PROP_0, - PROP_SLAVES, - PROP_LAST -}; - -G_DEFINE_TYPE (NetDeviceBond, net_device_bond, NET_TYPE_VIRTUAL_DEVICE) - -static void -net_device_bond_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (object); - NetDeviceBondPrivate *priv = device_bond->priv; - - switch (prop_id) { - case PROP_SLAVES: - g_value_set_string (value, priv->slaves); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (device_bond, prop_id, pspec); - break; - - } -} - -static void -net_device_bond_constructed (GObject *object) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (object); - - net_virtual_device_add_row (NET_VIRTUAL_DEVICE (device_bond), - _("Bond slaves"), "slaves"); - - G_OBJECT_CLASS (net_device_bond_parent_class)->constructed (object); -} - -static void -nm_device_slaves_changed (GObject *object, - GParamSpec *pspec, - gpointer user_data) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (user_data); - NetDeviceBondPrivate *priv = device_bond->priv; - NMDeviceBond *nm_device = NM_DEVICE_BOND (object); - CcNetworkPanel *panel; - GPtrArray *net_devices; - NetDevice *net_device; - NMDevice *slave; - const GPtrArray *slaves; - int i, j; - GString *str; - - g_free (priv->slaves); - - slaves = nm_device_bond_get_slaves (nm_device); - if (!slaves) { - priv->slaves = g_strdup (_("(none)")); - g_object_notify (G_OBJECT (device_bond), "slaves"); - return; - } - - panel = net_object_get_panel (NET_OBJECT (device_bond)); - net_devices = cc_network_panel_get_devices (panel); - - str = g_string_new (NULL); - for (i = 0; i < slaves->len; i++) { - if (i > 0) - g_string_append (str, ", "); - slave = slaves->pdata[i]; - - for (j = 0; j < net_devices->len; j++) { - net_device = net_devices->pdata[j]; - if (slave == net_device_get_nm_device (net_device)) { - g_string_append (str, net_object_get_title (NET_OBJECT (net_device))); - break; - } - } - if (j == net_devices->len) - g_string_append (str, nm_device_get_iface (slave)); - } - priv->slaves = g_string_free (str, FALSE); - g_object_notify (G_OBJECT (device_bond), "slaves"); -} - -static void -net_device_bond_device_set (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (virtual_device); - - g_signal_connect_object (nm_device, "notify::slaves", - G_CALLBACK (nm_device_slaves_changed), device_bond, 0); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_bond); -} - -static void -net_device_bond_device_unset (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (virtual_device); - - g_signal_handlers_disconnect_by_func (nm_device, - G_CALLBACK (nm_device_slaves_changed), - device_bond); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_bond); -} - -static void -net_device_bond_finalize (GObject *object) -{ - NetDeviceBond *device_bond = NET_DEVICE_BOND (object); - NetDeviceBondPrivate *priv = device_bond->priv; - - g_free (priv->slaves); - - G_OBJECT_CLASS (net_device_bond_parent_class)->finalize (object); -} - -static void -net_device_bond_class_init (NetDeviceBondClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NetVirtualDeviceClass *virtual_device_class = NET_VIRTUAL_DEVICE_CLASS (klass); - GParamSpec *pspec; - - object_class->constructed = net_device_bond_constructed; - object_class->finalize = net_device_bond_finalize; - object_class->get_property = net_device_bond_get_property; - - virtual_device_class->device_set = net_device_bond_device_set; - virtual_device_class->device_unset = net_device_bond_device_unset; - - pspec = g_param_spec_string ("slaves", NULL, NULL, - NULL, - G_PARAM_READABLE); - g_object_class_install_property (object_class, PROP_SLAVES, pspec); - - g_type_class_add_private (klass, sizeof (NetDeviceBondPrivate)); -} - -static void -net_device_bond_init (NetDeviceBond *device_bond) -{ - device_bond->priv = NET_DEVICE_BOND_GET_PRIVATE (device_bond); -} diff -Nru gnome-control-center-3.20.2/panels/network/net-device-bond.h gnome-control-center-3.22.1/panels/network/net-device-bond.h --- gnome-control-center-3.20.2/panels/network/net-device-bond.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-bond.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __NET_DEVICE_BOND_H -#define __NET_DEVICE_BOND_H - -#include - -#include "net-virtual-device.h" - -G_BEGIN_DECLS - -#define NET_TYPE_DEVICE_BOND (net_device_bond_get_type ()) -#define NET_DEVICE_BOND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NET_TYPE_DEVICE_BOND, NetDeviceBond)) -#define NET_DEVICE_BOND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NET_TYPE_DEVICE_BOND, NetDeviceBondClass)) -#define NET_IS_DEVICE_BOND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NET_TYPE_DEVICE_BOND)) -#define NET_IS_DEVICE_BOND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NET_TYPE_DEVICE_BOND)) -#define NET_DEVICE_BOND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NET_TYPE_DEVICE_BOND, NetDeviceBondClass)) - -typedef struct _NetDeviceBondPrivate NetDeviceBondPrivate; -typedef struct _NetDeviceBond NetDeviceBond; -typedef struct _NetDeviceBondClass NetDeviceBondClass; - -struct _NetDeviceBond -{ - NetVirtualDevice parent; - NetDeviceBondPrivate *priv; -}; - -struct _NetDeviceBondClass -{ - NetVirtualDeviceClass parent_class; -}; - -GType net_device_bond_get_type (void); - -G_END_DECLS - -#endif /* __NET_DEVICE_BOND_H */ - diff -Nru gnome-control-center-3.20.2/panels/network/net-device-bridge.c gnome-control-center-3.22.1/panels/network/net-device-bridge.c --- gnome-control-center-3.20.2/panels/network/net-device-bridge.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-bridge.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include - -#include -#include -#include -#include - -#include "panel-common.h" -#include "cc-network-panel.h" - -#include "net-device-bridge.h" - -#define NET_DEVICE_BRIDGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_BRIDGE, NetDeviceBridgePrivate)) - -struct _NetDeviceBridgePrivate { - char *slaves; -}; - -enum { - PROP_0, - PROP_SLAVES, - PROP_LAST -}; - -G_DEFINE_TYPE (NetDeviceBridge, net_device_bridge, NET_TYPE_VIRTUAL_DEVICE) - -static void -net_device_bridge_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (object); - NetDeviceBridgePrivate *priv = device_bridge->priv; - - switch (prop_id) { - case PROP_SLAVES: - g_value_set_string (value, priv->slaves); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (device_bridge, prop_id, pspec); - break; - - } -} - -static void -net_device_bridge_constructed (GObject *object) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (object); - - net_virtual_device_add_row (NET_VIRTUAL_DEVICE (device_bridge), - _("Bridge slaves"), "slaves"); - - G_OBJECT_CLASS (net_device_bridge_parent_class)->constructed (object); -} - -static void -nm_device_slaves_changed (GObject *object, - GParamSpec *pspec, - gpointer user_data) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (user_data); - NetDeviceBridgePrivate *priv = device_bridge->priv; - NMDeviceBridge *nm_device = NM_DEVICE_BRIDGE (object); - CcNetworkPanel *panel; - GPtrArray *net_devices; - NetDevice *net_device; - NMDevice *slave; - const GPtrArray *slaves; - int i, j; - GString *str; - - g_free (priv->slaves); - - slaves = nm_device_bridge_get_slaves (nm_device); - if (!slaves) { - priv->slaves = g_strdup (_("(none)")); - g_object_notify (G_OBJECT (device_bridge), "slaves"); - return; - } - - panel = net_object_get_panel (NET_OBJECT (device_bridge)); - net_devices = cc_network_panel_get_devices (panel); - - str = g_string_new (NULL); - for (i = 0; i < slaves->len; i++) { - if (i > 0) - g_string_append (str, ", "); - slave = slaves->pdata[i]; - - for (j = 0; j < net_devices->len; j++) { - net_device = net_devices->pdata[j]; - if (slave == net_device_get_nm_device (net_device)) { - g_string_append (str, net_object_get_title (NET_OBJECT (net_device))); - break; - } - } - if (j == net_devices->len) - g_string_append (str, nm_device_get_iface (slave)); - } - priv->slaves = g_string_free (str, FALSE); - g_object_notify (G_OBJECT (device_bridge), "slaves"); -} - -static void -net_device_bridge_device_set (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (virtual_device); - - g_signal_connect_object (nm_device, "notify::slaves", - G_CALLBACK (nm_device_slaves_changed), device_bridge, 0); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_bridge); -} - -static void -net_device_bridge_device_unset (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (virtual_device); - - g_signal_handlers_disconnect_by_func (nm_device, - G_CALLBACK (nm_device_slaves_changed), - device_bridge); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_bridge); -} - -static void -net_device_bridge_finalize (GObject *object) -{ - NetDeviceBridge *device_bridge = NET_DEVICE_BRIDGE (object); - NetDeviceBridgePrivate *priv = device_bridge->priv; - - g_free (priv->slaves); - - G_OBJECT_CLASS (net_device_bridge_parent_class)->finalize (object); -} - -static void -net_device_bridge_class_init (NetDeviceBridgeClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NetVirtualDeviceClass *virtual_device_class = NET_VIRTUAL_DEVICE_CLASS (klass); - GParamSpec *pspec; - - object_class->constructed = net_device_bridge_constructed; - object_class->finalize = net_device_bridge_finalize; - object_class->get_property = net_device_bridge_get_property; - - virtual_device_class->device_set = net_device_bridge_device_set; - virtual_device_class->device_unset = net_device_bridge_device_unset; - - pspec = g_param_spec_string ("slaves", NULL, NULL, - NULL, - G_PARAM_READABLE); - g_object_class_install_property (object_class, PROP_SLAVES, pspec); - - g_type_class_add_private (klass, sizeof (NetDeviceBridgePrivate)); -} - -static void -net_device_bridge_init (NetDeviceBridge *device_bridge) -{ - device_bridge->priv = NET_DEVICE_BRIDGE_GET_PRIVATE (device_bridge); -} diff -Nru gnome-control-center-3.20.2/panels/network/net-device-bridge.h gnome-control-center-3.22.1/panels/network/net-device-bridge.h --- gnome-control-center-3.20.2/panels/network/net-device-bridge.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-bridge.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __NET_DEVICE_BRIDGE_H -#define __NET_DEVICE_BRIDGE_H - -#include - -#include "net-virtual-device.h" - -G_BEGIN_DECLS - -#define NET_TYPE_DEVICE_BRIDGE (net_device_bridge_get_type ()) -#define NET_DEVICE_BRIDGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NET_TYPE_DEVICE_BRIDGE, NetDeviceBridge)) -#define NET_DEVICE_BRIDGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NET_TYPE_DEVICE_BRIDGE, NetDeviceBridgeClass)) -#define NET_IS_DEVICE_BRIDGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NET_TYPE_DEVICE_BRIDGE)) -#define NET_IS_DEVICE_BRIDGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NET_TYPE_DEVICE_BRIDGE)) -#define NET_DEVICE_BRIDGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NET_TYPE_DEVICE_BRIDGE, NetDeviceBridgeClass)) - -typedef struct _NetDeviceBridgePrivate NetDeviceBridgePrivate; -typedef struct _NetDeviceBridge NetDeviceBridge; -typedef struct _NetDeviceBridgeClass NetDeviceBridgeClass; - -struct _NetDeviceBridge -{ - NetVirtualDevice parent; - NetDeviceBridgePrivate *priv; -}; - -struct _NetDeviceBridgeClass -{ - NetVirtualDeviceClass parent_class; -}; - -GType net_device_bridge_get_type (void); - -G_END_DECLS - -#endif /* __NET_DEVICE_BRIDGE_H */ - diff -Nru gnome-control-center-3.20.2/panels/network/net-device.c gnome-control-center-3.22.1/panels/network/net-device.c --- gnome-control-center-3.20.2/panels/network/net-device.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device.c 2016-08-12 12:43:57.000000000 +0000 @@ -26,12 +26,7 @@ #include #include -#include -#include -#include -#include -#include -#include +#include #include "net-device.h" @@ -58,8 +53,6 @@ if (!connection) return NULL; - const GByteArray *mac = NULL; - /* check the connection type */ if (nm_connection_is_type (connection, NM_SETTING_WIRELESS_SETTING_NAME)) { @@ -67,38 +60,14 @@ NMSettingWireless *s_wireless = nm_connection_get_setting_wireless (connection); if (!s_wireless) return NULL; - mac = nm_setting_wireless_get_mac_address (s_wireless); - if (mac) - return nm_utils_hwaddr_ntoa (mac->data, ARPHRD_ETHER); + return g_strdup (nm_setting_wireless_get_mac_address (s_wireless)); } else if (nm_connection_is_type (connection, NM_SETTING_WIRED_SETTING_NAME)) { /* check wired settings */ NMSettingWired *s_wired = nm_connection_get_setting_wired (connection); if (!s_wired) return NULL; - mac = nm_setting_wired_get_mac_address (s_wired); - if (mac) - return nm_utils_hwaddr_ntoa (mac->data, ARPHRD_ETHER); - } else if (nm_connection_is_type (connection, - NM_SETTING_WIMAX_SETTING_NAME)) { - /* check wimax settings */ - NMSettingWimax *s_wimax = nm_connection_get_setting_wimax (connection); - if (!s_wimax) - return NULL; - mac = nm_setting_wimax_get_mac_address (s_wimax); - if (mac) - return nm_utils_hwaddr_ntoa (mac->data, ARPHRD_ETHER); - } else if (nm_connection_is_type (connection, - NM_SETTING_INFINIBAND_SETTING_NAME)) { - /* check infiniband settings */ - NMSettingInfiniband *s_infiniband = \ - nm_connection_get_setting_infiniband (connection); - if (!s_infiniband) - return NULL; - mac = nm_setting_infiniband_get_mac_address (s_infiniband); - if (mac) - return nm_utils_hwaddr_ntoa (mac->data, - ARPHRD_INFINIBAND); + return g_strdup (nm_setting_wired_get_mac_address (s_wired)); } /* no MAC address found */ return NULL; @@ -122,19 +91,6 @@ mac = nm_device_ethernet_get_hw_address (device_ethernet); break; } - case NM_DEVICE_TYPE_WIMAX: - { - NMDeviceWimax *device_wimax = NM_DEVICE_WIMAX (device); - mac = nm_device_wimax_get_hw_address (device_wimax); - break; - } - case NM_DEVICE_TYPE_INFINIBAND: - { - NMDeviceInfiniband *device_infiniband = \ - NM_DEVICE_INFINIBAND (device); - mac = nm_device_infiniband_get_hw_address (device_infiniband); - break; - } default: break; } @@ -171,15 +127,11 @@ GSList *list, *iterator; NMConnection *connection = NULL; NMActiveConnection *ac; - NMRemoteSettings *remote_settings; /* is the device available in a active connection? */ - remote_settings = net_object_get_remote_settings (NET_OBJECT (device)); ac = nm_device_get_active_connection (device->priv->nm_device); - if (ac) { - return (NMConnection*)nm_remote_settings_get_connection_by_path (remote_settings, - nm_active_connection_get_connection (ac)); - } + if (ac) + return (NMConnection*) nm_active_connection_get_connection (ac); /* not found in active connections - check all available connections */ list = net_device_get_valid_connections (device); @@ -362,22 +314,24 @@ GSList * net_device_get_valid_connections (NetDevice *device) { - GSList *all, *filtered, *iterator, *valid; + GSList *valid; NMConnection *connection; NMSettingConnection *s_con; NMActiveConnection *active_connection; const char *active_uuid; + const GPtrArray *all; + GPtrArray *filtered; + guint i; - all = nm_remote_settings_list_connections (net_object_get_remote_settings (NET_OBJECT (device))); + all = nm_client_get_connections (net_object_get_client (NET_OBJECT (device))); filtered = nm_device_filter_connections (net_device_get_nm_device (device), all); - g_slist_free (all); active_connection = nm_device_get_active_connection (net_device_get_nm_device (device)); active_uuid = active_connection ? nm_active_connection_get_uuid (active_connection) : NULL; valid = NULL; - for (iterator = filtered; iterator; iterator = iterator->next) { - connection = iterator->data; + for (i = 0; i < filtered->len; i++) { + connection = g_ptr_array_index (filtered, i); s_con = nm_connection_get_setting_connection (connection); if (!s_con) continue; @@ -388,7 +342,7 @@ valid = g_slist_prepend (valid, connection); } - g_slist_free (filtered); + g_ptr_array_free (filtered, FALSE); return g_slist_reverse (valid); } diff -Nru gnome-control-center-3.20.2/panels/network/net-device-ethernet.c gnome-control-center-3.22.1/panels/network/net-device-ethernet.c --- gnome-control-center-3.20.2/panels/network/net-device-ethernet.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-ethernet.c 2016-08-12 12:43:57.000000000 +0000 @@ -24,11 +24,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include "panel-common.h" @@ -134,8 +130,8 @@ static void add_details (GtkWidget *details, NMDevice *device, NMConnection *connection) { - NMIP4Config *ip4_config = NULL; - NMIP6Config *ip6_config = NULL; + NMIPConfig *ip4_config = NULL; + NMIPConfig *ip6_config = NULL; gchar *ip4_address = NULL; gchar *ip4_route = NULL; gchar *ip4_dns = NULL; @@ -251,7 +247,6 @@ GtkWidget *window; NetConnectionEditor *editor; NMClient *client; - NMRemoteSettings *settings; NMDevice *nmdev; window = gtk_widget_get_toplevel (GTK_WIDGET (button)); @@ -261,8 +256,7 @@ nmdev = net_device_get_nm_device (NET_DEVICE (device)); client = net_object_get_client (NET_OBJECT (device)); - settings = net_object_get_remote_settings (NET_OBJECT (device)); - editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client, settings); + editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client); if (title) net_connection_editor_set_title (editor, title); g_signal_connect (editor, "done", G_CALLBACK (editor_done), device); @@ -303,10 +297,10 @@ nmdev = net_device_get_nm_device (NET_DEVICE (device)); aconn = nm_device_get_active_connection (nmdev); if (aconn) { - const gchar *path1, *path2; - path1 = nm_active_connection_get_connection (aconn); - path2 = nm_connection_get_path (connection); - active = g_strcmp0 (path1, path2) == 0; + const gchar *uuid1, *uuid2; + uuid1 = nm_active_connection_get_uuid (aconn); + uuid2 = nm_connection_get_uuid (connection); + active = g_strcmp0 (uuid1, uuid2) == 0; } row = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -366,11 +360,12 @@ } static void -connection_removed (NMRemoteConnection *connection, +connection_removed (NMClient *client, + NMRemoteConnection *connection, NetDeviceEthernet *device) { - g_hash_table_remove (device->connections, connection); - device_ethernet_refresh_ui (device); + if (g_hash_table_remove (device->connections, connection)) + device_ethernet_refresh_ui (device); } static void @@ -398,8 +393,6 @@ NMConnection *connection = l->data; if (!g_hash_table_contains (device->connections, connection)) { g_hash_table_add (device->connections, connection); - g_signal_connect_object (connection, "removed", - G_CALLBACK (connection_removed), device, 0); } } n_connections = g_slist_length (connections); @@ -443,8 +436,9 @@ } static void -remote_settings_read_cb (NMRemoteSettings *settings, - NetDeviceEthernet *device) +client_connection_added_cb (NMClient *client, + NMRemoteConnection *connection, + NetDeviceEthernet *device) { device_ethernet_refresh_ui (device); } @@ -452,7 +446,6 @@ static void add_profile (GtkButton *button, NetDeviceEthernet *device) { - NMRemoteSettings *settings; NMConnection *connection; NMSettingConnection *sc; gchar *uuid, *id; @@ -460,18 +453,17 @@ GtkWidget *window; NMClient *client; NMDevice *nmdev; - GSList *connections; + const GPtrArray *connections; - connection = nm_connection_new (); + connection = nm_simple_connection_new (); sc = NM_SETTING_CONNECTION (nm_setting_connection_new ()); nm_connection_add_setting (connection, NM_SETTING (sc)); uuid = nm_utils_uuid_generate (); - settings = net_object_get_remote_settings (NET_OBJECT (device)); - connections = nm_remote_settings_list_connections (settings); + client = net_object_get_client (NET_OBJECT (device)); + connections = nm_client_get_connections (client); id = ce_page_get_next_available_name (connections, NAME_FORMAT_PROFILE, NULL); - g_slist_free (connections); g_object_set (sc, NM_SETTING_CONNECTION_UUID, uuid, @@ -488,8 +480,7 @@ window = gtk_widget_get_toplevel (GTK_WIDGET (button)); nmdev = net_device_get_nm_device (NET_DEVICE (device)); - client = net_object_get_client (NET_OBJECT (device)); - editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client, settings); + editor = net_connection_editor_new (GTK_WINDOW (window), connection, nmdev, NULL, client); g_signal_connect (editor, "done", G_CALLBACK (editor_done), device); net_connection_editor_run (editor); } @@ -512,10 +503,10 @@ if (gtk_switch_get_active (sw)) { connection = net_device_get_find_connection (NET_DEVICE (device)); if (connection != NULL) { - nm_client_activate_connection (client, - connection, - nm_device, - NULL, NULL, NULL); + nm_client_activate_connection_async (client, + connection, + nm_device, + NULL, NULL, NULL, NULL); } } else { nm_device_disconnect (nm_device, NULL, NULL); @@ -538,17 +529,17 @@ connection = NM_CONNECTION (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (row))), "connection")); - nm_client_activate_connection (client, - connection, - nm_device, - NULL, NULL, NULL); + nm_client_activate_connection_async (client, + connection, + nm_device, + NULL, NULL, NULL, NULL); } static void device_ethernet_constructed (GObject *object) { NetDeviceEthernet *device = NET_DEVICE_ETHERNET (object); - NMRemoteSettings *settings; + NMClient *client; GtkWidget *list; GtkWidget *swin; GtkWidget *widget; @@ -567,19 +558,23 @@ G_CALLBACK (connection_activated), device); gtk_widget_show (list); - device->details = GTK_WIDGET (gtk_builder_get_object (NET_DEVICE_ETHERNET (object)->builder, "details")); + device->details = GTK_WIDGET (gtk_builder_get_object (device->builder, "details")); - device->details_button = GTK_WIDGET (gtk_builder_get_object (NET_DEVICE_ETHERNET (object)->builder, "details_button")); + device->details_button = GTK_WIDGET (gtk_builder_get_object (device->builder, "details_button")); g_signal_connect (device->details_button, "clicked", G_CALLBACK (show_details_for_wired), device); - device->add_profile_button = GTK_WIDGET (gtk_builder_get_object (NET_DEVICE_ETHERNET (object)->builder, "add_profile_button")); + device->add_profile_button = GTK_WIDGET (gtk_builder_get_object (device->builder, "add_profile_button")); g_signal_connect (device->add_profile_button, "clicked", G_CALLBACK (add_profile), device); - settings = net_object_get_remote_settings (NET_OBJECT (object)); - g_signal_connect (settings, "connections-read", - G_CALLBACK (remote_settings_read_cb), object); + client = net_object_get_client (NET_OBJECT (object)); + g_signal_connect (client, NM_CLIENT_CONNECTION_ADDED, + G_CALLBACK (client_connection_added_cb), object); + g_signal_connect_object (client, NM_CLIENT_CONNECTION_REMOVED, + G_CALLBACK (connection_removed), device, 0); + + device_ethernet_refresh_ui (device); } static void diff -Nru gnome-control-center-3.20.2/panels/network/net-device.h gnome-control-center-3.22.1/panels/network/net-device.h --- gnome-control-center-3.20.2/panels/network/net-device.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,8 +24,8 @@ #include +#include #include "net-object.h" -#include "nm-device.h" G_BEGIN_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/net-device-mobile.c gnome-control-center-3.22.1/panels/network/net-device-mobile.c --- gnome-control-center-3.20.2/panels/network/net-device-mobile.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-mobile.c 2016-08-12 12:43:57.000000000 +0000 @@ -25,17 +25,12 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include "panel-common.h" #include "network-dialogs.h" - -#include - #include "net-device-mobile.h" #define NET_DEVICE_MOBILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_MOBILE, NetDeviceMobilePrivate)) @@ -95,16 +90,16 @@ } static void -connection_activate_cb (NMClient *client, - NMActiveConnection *connection, - GError *error, +connection_activate_cb (GObject *source_object, + GAsyncResult *res, gpointer user_data) { - NetDeviceMobile *device_mobile = NET_DEVICE_MOBILE (user_data); + GError *error = NULL; - if (connection == NULL) { + if (!nm_client_activate_connection_finish (NM_CLIENT (source_object), res, &error)) { /* failed to activate */ - nm_device_mobile_refresh_ui (device_mobile); + nm_device_mobile_refresh_ui (user_data); + g_error_free (error); } } @@ -118,7 +113,6 @@ NMConnection *connection; NMDevice *device; NMClient *client; - NMRemoteSettings *remote_settings; CcNetworkPanel *panel; GtkWidget *toplevel; @@ -133,7 +127,6 @@ if (device == NULL) goto out; client = net_object_get_client (NET_OBJECT (device_mobile)); - remote_settings = net_object_get_remote_settings (NET_OBJECT (device_mobile)); /* get entry */ model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); @@ -145,22 +138,20 @@ toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))); cc_network_panel_connect_to_3g_network (toplevel, client, - remote_settings, device); goto out; } /* activate the connection */ g_debug ("try to switch to connection %s", object_path); - connection = (NMConnection*) nm_remote_settings_get_connection_by_path (remote_settings, - object_path); + connection = (NMConnection*) nm_client_get_connection_by_path (client, object_path); if (connection != NULL) { nm_device_disconnect (device, NULL, NULL); - nm_client_activate_connection (client, - connection, - device, NULL, - connection_activate_cb, - device_mobile); + nm_client_activate_connection_async (client, + connection, + device, NULL, NULL, + connection_activate_cb, + device_mobile); goto out; } out: @@ -216,8 +207,8 @@ /* is this already activated? */ if (active_connection != NULL && - g_strcmp0 (nm_connection_get_path (connection), - nm_active_connection_get_connection (active_connection)) == 0) { + g_strcmp0 (nm_connection_get_uuid (connection), + nm_active_connection_get_uuid (active_connection)) == 0) { priv->updating_device = TRUE; gtk_combo_box_set_active_iter (combobox, &treeiter); priv->updating_device = FALSE; @@ -434,7 +425,6 @@ GParamSpec *pspec, NetDeviceMobile *device_mobile) { - const gchar *path; const GPtrArray *acs; gboolean active; gint i; @@ -451,21 +441,23 @@ connection = net_device_get_find_connection (NET_DEVICE (device_mobile)); if (connection == NULL) return; - nm_client_activate_connection (client, - connection, - net_device_get_nm_device (NET_DEVICE (device_mobile)), - NULL, NULL, NULL); + nm_client_activate_connection_async (client, + connection, + net_device_get_nm_device (NET_DEVICE (device_mobile)), + NULL, NULL, NULL, NULL); } else { + const gchar *uuid; + connection = net_device_get_find_connection (NET_DEVICE (device_mobile)); if (connection == NULL) return; - path = nm_connection_get_path (connection); + uuid = nm_connection_get_uuid (connection); client = net_object_get_client (NET_OBJECT (device_mobile)); acs = nm_client_get_active_connections (client); for (i = 0; acs && i < acs->len; i++) { a = (NMActiveConnection*)acs->pdata[i]; - if (strcmp (nm_active_connection_get_connection (a), path) == 0) { - nm_client_deactivate_connection (client, a); + if (strcmp (nm_active_connection_get_uuid (a), uuid) == 0) { + nm_client_deactivate_connection (client, a, NULL, NULL); break; } } diff -Nru gnome-control-center-3.20.2/panels/network/net-device-mobile.h gnome-control-center-3.22.1/panels/network/net-device-mobile.h --- gnome-control-center-3.20.2/panels/network/net-device-mobile.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-mobile.h 2016-08-12 12:43:57.000000000 +0000 @@ -23,9 +23,9 @@ #define __NET_DEVICE_MOBILE_H #include +#include #include "net-device.h" -#include "nm-connection.h" G_BEGIN_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/net-device-simple.c gnome-control-center-3.22.1/panels/network/net-device-simple.c --- gnome-control-center-3.20.2/panels/network/net-device-simple.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-simple.c 2016-08-12 12:43:57.000000000 +0000 @@ -25,9 +25,7 @@ #include #include -#include -#include -#include +#include #include "panel-common.h" @@ -143,7 +141,6 @@ GParamSpec *pspec, NetDeviceSimple *device_simple) { - const gchar *path; const GPtrArray *acs; gboolean active; gint i; @@ -160,21 +157,23 @@ connection = net_device_get_find_connection (NET_DEVICE (device_simple)); if (connection == NULL) return; - nm_client_activate_connection (client, - connection, - net_device_get_nm_device (NET_DEVICE (device_simple)), - NULL, NULL, NULL); + nm_client_activate_connection_async (client, + connection, + net_device_get_nm_device (NET_DEVICE (device_simple)), + NULL, NULL, NULL, NULL); } else { + const gchar *uuid; + connection = net_device_get_find_connection (NET_DEVICE (device_simple)); if (connection == NULL) return; - path = nm_connection_get_path (connection); + uuid = nm_connection_get_uuid (connection); client = net_object_get_client (NET_OBJECT (device_simple)); acs = nm_client_get_active_connections (client); for (i = 0; acs && i < acs->len; i++) { a = (NMActiveConnection*)acs->pdata[i]; - if (strcmp (nm_active_connection_get_connection (a), path) == 0) { - nm_client_deactivate_connection (client, a); + if (strcmp (nm_active_connection_get_uuid (a), uuid) == 0) { + nm_client_deactivate_connection (client, a, NULL, NULL); break; } } diff -Nru gnome-control-center-3.20.2/panels/network/net-device-team.c gnome-control-center-3.22.1/panels/network/net-device-team.c --- gnome-control-center-3.20.2/panels/network/net-device-team.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-team.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2013 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include - -#include -#include -#include -#include - -#include "panel-common.h" -#include "cc-network-panel.h" - -#include "net-device-team.h" - -#define NET_DEVICE_TEAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeamPrivate)) - -struct _NetDeviceTeamPrivate { - char *slaves; -}; - -enum { - PROP_0, - PROP_SLAVES, - PROP_LAST -}; - -G_DEFINE_TYPE (NetDeviceTeam, net_device_team, NET_TYPE_VIRTUAL_DEVICE) - -static void -net_device_team_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (object); - NetDeviceTeamPrivate *priv = device_team->priv; - - switch (prop_id) { - case PROP_SLAVES: - g_value_set_string (value, priv->slaves); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (device_team, prop_id, pspec); - break; - - } -} - -static void -net_device_team_constructed (GObject *object) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (object); - - net_virtual_device_add_row (NET_VIRTUAL_DEVICE (device_team), - _("Team slaves"), "slaves"); - - G_OBJECT_CLASS (net_device_team_parent_class)->constructed (object); -} - -static void -nm_device_slaves_changed (GObject *object, - GParamSpec *pspec, - gpointer user_data) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (user_data); - NetDeviceTeamPrivate *priv = device_team->priv; - NMDeviceTeam *nm_device = NM_DEVICE_TEAM (object); - CcNetworkPanel *panel; - GPtrArray *net_devices; - NetDevice *net_device; - NMDevice *slave; - const GPtrArray *slaves; - int i, j; - GString *str; - - g_free (priv->slaves); - - slaves = nm_device_team_get_slaves (nm_device); - if (!slaves) { - priv->slaves = g_strdup (_("(none)")); - g_object_notify (G_OBJECT (device_team), "slaves"); - return; - } - - panel = net_object_get_panel (NET_OBJECT (device_team)); - net_devices = cc_network_panel_get_devices (panel); - - str = g_string_new (NULL); - for (i = 0; i < slaves->len; i++) { - if (i > 0) - g_string_append (str, ", "); - slave = slaves->pdata[i]; - - for (j = 0; j < net_devices->len; j++) { - net_device = net_devices->pdata[j]; - if (slave == net_device_get_nm_device (net_device)) { - g_string_append (str, net_object_get_title (NET_OBJECT (net_device))); - break; - } - } - if (j == net_devices->len) - g_string_append (str, nm_device_get_iface (slave)); - } - priv->slaves = g_string_free (str, FALSE); - g_object_notify (G_OBJECT (device_team), "slaves"); -} - -static void -net_device_team_device_set (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (virtual_device); - - g_signal_connect_object (nm_device, "notify::slaves", - G_CALLBACK (nm_device_slaves_changed), device_team, 0); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_team); -} - -static void -net_device_team_device_unset (NetVirtualDevice *virtual_device, - NMDevice *nm_device) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (virtual_device); - - g_signal_handlers_disconnect_by_func (nm_device, - G_CALLBACK (nm_device_slaves_changed), - device_team); - nm_device_slaves_changed (G_OBJECT (nm_device), NULL, device_team); -} - -static void -net_device_team_finalize (GObject *object) -{ - NetDeviceTeam *device_team = NET_DEVICE_TEAM (object); - NetDeviceTeamPrivate *priv = device_team->priv; - - g_free (priv->slaves); - - G_OBJECT_CLASS (net_device_team_parent_class)->finalize (object); -} - -static void -net_device_team_class_init (NetDeviceTeamClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NetVirtualDeviceClass *virtual_device_class = NET_VIRTUAL_DEVICE_CLASS (klass); - GParamSpec *pspec; - - object_class->constructed = net_device_team_constructed; - object_class->finalize = net_device_team_finalize; - object_class->get_property = net_device_team_get_property; - - virtual_device_class->device_set = net_device_team_device_set; - virtual_device_class->device_unset = net_device_team_device_unset; - - pspec = g_param_spec_string ("slaves", NULL, NULL, - NULL, - G_PARAM_READABLE); - g_object_class_install_property (object_class, PROP_SLAVES, pspec); - - g_type_class_add_private (klass, sizeof (NetDeviceTeamPrivate)); -} - -static void -net_device_team_init (NetDeviceTeam *device_team) -{ - device_team->priv = NET_DEVICE_TEAM_GET_PRIVATE (device_team); -} diff -Nru gnome-control-center-3.20.2/panels/network/net-device-team.h gnome-control-center-3.22.1/panels/network/net-device-team.h --- gnome-control-center-3.20.2/panels/network/net-device-team.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-team.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2013 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __NET_DEVICE_TEAM_H -#define __NET_DEVICE_TEAM_H - -#include - -#include "net-virtual-device.h" - -G_BEGIN_DECLS - -#define NET_TYPE_DEVICE_TEAM (net_device_team_get_type ()) -#define NET_DEVICE_TEAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeam)) -#define NET_DEVICE_TEAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NET_TYPE_DEVICE_TEAM, NetDeviceTeamClass)) -#define NET_IS_DEVICE_TEAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NET_TYPE_DEVICE_TEAM)) -#define NET_IS_DEVICE_TEAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NET_TYPE_DEVICE_TEAM)) -#define NET_DEVICE_TEAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NET_TYPE_DEVICE_TEAM, NetDeviceTeamClass)) - -typedef struct _NetDeviceTeamPrivate NetDeviceTeamPrivate; -typedef struct _NetDeviceTeam NetDeviceTeam; -typedef struct _NetDeviceTeamClass NetDeviceTeamClass; - -struct _NetDeviceTeam -{ - NetVirtualDevice parent; - NetDeviceTeamPrivate *priv; -}; - -struct _NetDeviceTeamClass -{ - NetVirtualDeviceClass parent_class; -}; - -GType net_device_team_get_type (void); - -G_END_DECLS - -#endif /* __NET_DEVICE_TEAM_H */ - diff -Nru gnome-control-center-3.20.2/panels/network/net-device-wifi.c gnome-control-center-3.22.1/panels/network/net-device-wifi.c --- gnome-control-center-3.20.2/panels/network/net-device-wifi.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-device-wifi.c 2016-08-31 11:24:09.000000000 +0000 @@ -26,17 +26,11 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include "shell/list-box-helper.h" +#include "shell/hostname-helper.h" #include "network-dialogs.h" #include "panel-common.h" @@ -139,8 +133,7 @@ static GPtrArray * panel_get_strongest_unique_aps (const GPtrArray *aps) { - const GByteArray *ssid; - const GByteArray *ssid_tmp; + GBytes *ssid, *ssid_tmp; GPtrArray *aps_unique = NULL; gboolean add_ap; guint i; @@ -169,18 +162,20 @@ g_assert (ssid_tmp); /* is this the same type and data? */ - if (nm_utils_same_ssid (ssid, ssid_tmp, TRUE)) { + if (nm_utils_same_ssid (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid), + g_bytes_get_data (ssid_tmp, NULL), g_bytes_get_size (ssid_tmp), + TRUE)) { g_debug ("found duplicate: %s", - nm_utils_escape_ssid (ssid_tmp->data, - ssid_tmp->len)); + nm_utils_escape_ssid (g_bytes_get_data (ssid_tmp, NULL), + g_bytes_get_size (ssid_tmp))); /* the new access point is stronger */ if (nm_access_point_get_strength (ap) > nm_access_point_get_strength (ap_tmp)) { g_debug ("removing %s", - nm_utils_escape_ssid (ssid_tmp->data, - ssid_tmp->len)); + nm_utils_escape_ssid (g_bytes_get_data (ssid_tmp, NULL), + g_bytes_get_size (ssid_tmp))); g_ptr_array_remove (aps_unique, ap_tmp); add_ap = TRUE; } else { @@ -192,8 +187,8 @@ } if (add_ap) { g_debug ("adding %s", - nm_utils_escape_ssid (ssid->data, - ssid->len)); + nm_utils_escape_ssid (g_bytes_get_data (ssid, NULL), + g_bytes_get_size (ssid))); g_ptr_array_add (aps_unique, g_object_ref (ap)); } } @@ -279,14 +274,11 @@ { NetDevice *tmp; NMConnection *connection; - NMRemoteSettings *remote_settings; NMClient *client; client = net_object_get_client (NET_OBJECT (device_wifi)); - remote_settings = net_object_get_remote_settings (NET_OBJECT (device_wifi)); tmp = g_object_new (NET_TYPE_DEVICE, "client", client, - "remote-settings", remote_settings, "nm-device", device, NULL); connection = net_device_get_find_connection (tmp); @@ -297,10 +289,10 @@ static gboolean connection_is_shared (NMConnection *c) { - NMSettingIP4Config *s_ip4; + NMSettingIPConfig *s_ip4; s_ip4 = nm_connection_get_setting_ip4_config (c); - if (g_strcmp0 (nm_setting_ip4_config_get_method (s_ip4), + if (g_strcmp0 (nm_setting_ip_config_get_method (s_ip4), NM_SETTING_IP4_CONFIG_METHOD_SHARED) != 0) { return FALSE; } @@ -325,7 +317,7 @@ return connection_is_shared (c); } -static const GByteArray * +static GBytes * device_get_hotspot_ssid (NetDeviceWifi *device_wifi, NMDevice *device) { @@ -342,18 +334,23 @@ } static void -get_secrets_cb (NMRemoteConnection *c, - GHashTable *secrets, - GError *error, +get_secrets_cb (GObject *source_object, + GAsyncResult *res, gpointer data) { NetDeviceWifi *device_wifi = data; - NMSettingWireless *sw; + GVariant *secrets; + GError *error = NULL; - sw = nm_connection_get_setting_wireless (NM_CONNECTION (c)); + secrets = nm_remote_connection_get_secrets_finish (NM_REMOTE_CONNECTION (source_object), res, &error); + if (!secrets) { + g_error_free (error); + //FIXME ignore cancelled + return; + } - nm_connection_update_secrets (NM_CONNECTION (c), - nm_setting_wireless_get_security (sw), + nm_connection_update_secrets (NM_CONNECTION (source_object), + NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, secrets, NULL); nm_device_wifi_refresh_ui (device_wifi); @@ -366,7 +363,6 @@ gchar **security) { NMConnection *c; - NMSettingWireless *sw; NMSettingWirelessSecurity *sws; const gchar *key_mgmt; const gchar *tmp_secret; @@ -376,9 +372,8 @@ if (c == NULL) return; - sw = nm_connection_get_setting_wireless (c); sws = nm_connection_get_setting_wireless_security (c); - if (sw == NULL || sws == NULL) + if (sws == NULL) return; tmp_secret = NULL; @@ -406,10 +401,11 @@ * We'll refresh the UI when secrets arrive. */ if (tmp_secret == NULL) { - nm_remote_connection_get_secrets ((NMRemoteConnection*)c, - nm_setting_wireless_get_security (sw), - get_secrets_cb, - device_wifi); + nm_remote_connection_get_secrets_async ((NMRemoteConnection*)c, + NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, + NULL, + get_secrets_cb, + device_wifi); return; } @@ -422,7 +418,7 @@ static void nm_device_wifi_refresh_hotspot (NetDeviceWifi *device_wifi) { - const GByteArray *ssid; + GBytes *ssid; gchar *hotspot_secret = NULL; gchar *hotspot_security = NULL; gchar *hotspot_ssid = NULL; @@ -432,7 +428,7 @@ nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi)); ssid = device_get_hotspot_ssid (device_wifi, nm_device); if (ssid) - hotspot_ssid = nm_utils_ssid_to_utf8 (ssid); + hotspot_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); device_get_hotspot_security_details (device_wifi, nm_device, &hotspot_secret, @@ -635,49 +631,54 @@ static void connect_to_hidden_network (NetDeviceWifi *device_wifi) { - NMRemoteSettings *remote_settings; NMClient *client; CcNetworkPanel *panel; GtkWidget *toplevel; - remote_settings = net_object_get_remote_settings (NET_OBJECT (device_wifi)); client = net_object_get_client (NET_OBJECT (device_wifi)); panel = net_object_get_panel (NET_OBJECT (device_wifi)); toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel))); - cc_network_panel_connect_to_hidden_network (toplevel, client, remote_settings); + cc_network_panel_connect_to_hidden_network (toplevel, client); } static void -connection_add_or_activate_cb (NMActiveConnection *connection, - GError *error, - NetDeviceWifi *device_wifi) +connection_add_activate_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - if (connection == NULL) { + NMActiveConnection *conn; + GError *error = NULL; + + conn = nm_client_add_and_activate_connection_finish (NM_CLIENT (source_object), res, &error); + if (!conn) { + //FIXME cancelled + nm_device_wifi_refresh_ui (user_data); /* failed to activate */ - g_debug ("Failed to add and/or activate connection '%d': %s", + g_debug ("Failed to add and activate connection '%d': %s", error->code, error->message); - nm_device_wifi_refresh_ui (device_wifi); + g_error_free (error); + return; } } static void -connection_add_activate_cb (NMClient *client, - NMActiveConnection *connection, - const char *path, - GError *error, - gpointer user_data) -{ - connection_add_or_activate_cb (connection, error, user_data); -} - -static void -connection_activate_cb (NMClient *client, - NMActiveConnection *connection, - GError *error, +connection_activate_cb (GObject *source_object, + GAsyncResult *res, gpointer user_data) { - connection_add_or_activate_cb (connection, error, user_data); + GError *error = NULL; + + if (!nm_client_activate_connection_finish (NM_CLIENT (source_object), res, &error)) { + //FIXME cancelled + nm_device_wifi_refresh_ui (user_data); + /* failed to activate */ + g_debug ("Failed to add and activate connection '%d': %s", + error->code, + error->message); + g_error_free (error); + return; + } } static gboolean @@ -704,10 +705,10 @@ static void wireless_try_to_connect (NetDeviceWifi *device_wifi, - const GByteArray *ssid, + GBytes *ssid, const gchar *ap_object_path) { - const GByteArray *match_ssid; + GBytes *match_ssid; const gchar *ssid_target; GSList *list, *l; NMConnection *connection_activate = NULL; @@ -725,7 +726,7 @@ if (device == NULL) goto out; - ssid_target = nm_utils_escape_ssid (ssid->data, ssid->len); + ssid_target = nm_utils_escape_ssid ((gpointer) g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); g_debug ("try to connect to WIFI network %s [%s]", ssid_target, ap_object_path); @@ -733,7 +734,6 @@ list = net_device_get_valid_connections (NET_DEVICE (device_wifi)); g_debug ("%i suitable remote connections to check", g_slist_length (list)); for (l = list; l; l = g_slist_next (l)) { - const GByteArray *match_ssid; NMConnection *connection; connection = NM_CONNECTION (l->data); @@ -743,8 +743,7 @@ match_ssid = nm_setting_wireless_get_ssid (setting_wireless); if (match_ssid == NULL) continue; - if (ssid->len == match_ssid->len && - memcmp (ssid->data, match_ssid->data, ssid->len) == 0) { + if (g_bytes_equal (ssid, match_ssid)) { g_debug ("we found an existing connection %s to activate!", nm_connection_get_id (connection)); connection_activate = connection; @@ -757,10 +756,13 @@ /* activate the connection */ client = net_object_get_client (NET_OBJECT (device_wifi)); if (connection_activate != NULL) { - nm_client_activate_connection (client, - connection_activate, - device, NULL, - connection_activate_cb, device_wifi); + nm_client_activate_connection_async (client, + connection_activate, + device, + NULL, + NULL, + connection_activate_cb, + device_wifi); goto out; } @@ -784,14 +786,18 @@ s_con = (NMSettingConnection *)nm_setting_connection_new (); nm_setting_connection_add_permission (s_con, "user", g_get_user_name (), NULL); - partial = nm_connection_new (); + partial = nm_simple_connection_new (); nm_connection_add_setting (partial, NM_SETTING (s_con)); } g_debug ("no existing connection found for %s, creating and activating one", ssid_target); - nm_client_add_and_activate_connection (client, partial, - device, ap_object_path, - connection_add_activate_cb, device_wifi); + nm_client_add_and_activate_connection_async (client, + partial, + device, + ap_object_path, + NULL, + connection_add_activate_cb, + device_wifi); if (!allowed_to_share) g_object_unref (partial); } else { @@ -815,19 +821,6 @@ return; } -static GByteArray * -ssid_to_byte_array (const gchar *ssid) -{ - guint32 len; - GByteArray *ba; - - len = strlen (ssid); - ba = g_byte_array_sized_new (len); - g_byte_array_append (ba, (guchar *)ssid, len); - - return ba; -} - static gchar * get_hostname (void) { @@ -873,28 +866,25 @@ g_variant_unref (res); } - if (str == NULL || *str == '\0') { - str = g_strdup (g_get_host_name ()); - } - - if (str == NULL || *str == '\0') { - str = g_strdup ("GNOME"); - } - return str; } -static GByteArray * +static GBytes * generate_ssid_for_hotspot (NetDeviceWifi *device_wifi) { - GByteArray *ssid_array; - gchar *ssid; + GBytes *ssid_bytes; + gchar *hostname, *ssid; - ssid = get_hostname (); - ssid_array = ssid_to_byte_array (ssid); - g_free (ssid); + hostname = get_hostname (); + ssid = pretty_hostname_to_ssid (hostname); + g_free (hostname); + + ssid_bytes = g_bytes_new_with_free_func (ssid, + strlen (ssid), + g_free, + NULL); - return ssid_array; + return ssid_bytes; } #define WPA_PASSKEY_SIZE 8 @@ -949,7 +939,8 @@ { NMSettingConnection *sc; NMSettingWireless *sw; - NMSettingIP4Config *sip; + NMSettingIPConfig *sip; + NMSetting *setting; sc = nm_connection_get_setting_connection (connection); if (g_strcmp0 (nm_setting_connection_get_connection_type (sc), "802-11-wireless") != 0) { @@ -960,11 +951,12 @@ g_strcmp0 (nm_setting_wireless_get_mode (sw), "ap") != 0) { return FALSE; } - if (g_strcmp0 (nm_setting_wireless_get_security (sw), "802-11-wireless-security") != 0) { + setting = nm_connection_get_setting_by_name (connection, NM_SETTING_WIRELESS_SETTING_NAME); + if (!setting) return FALSE; - } + sip = nm_connection_get_setting_ip4_config (connection); - if (g_strcmp0 (nm_setting_ip4_config_get_method (sip), "shared") != 0) { + if (g_strcmp0 (nm_setting_ip_config_get_method (sip), "shared") != 0) { return FALSE; } @@ -987,31 +979,46 @@ } static void -activate_cb (NMClient *client, - NMActiveConnection *connection, - GError *error, - NetDeviceWifi *device_wifi) +activate_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - if (error != NULL) { + GError *error = NULL; + + if (nm_client_activate_connection_finish (NM_CLIENT (source_object), res, &error) == NULL) { g_warning ("Failed to add new connection: (%d) %s", error->code, error->message); + g_error_free (error); return; } /* show hotspot tab */ - nm_device_wifi_refresh_ui (device_wifi); - show_hotspot_ui (device_wifi); + nm_device_wifi_refresh_ui (user_data); + show_hotspot_ui (user_data); } static void -activate_new_cb (NMClient *client, - NMActiveConnection *connection, - const gchar *path, - GError *error, - NetDeviceWifi *device_wifi) +activate_new_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) { - activate_cb (client, connection, error, device_wifi); + NMActiveConnection *conn; + GError *error = NULL; + + conn = nm_client_add_and_activate_connection_finish (NM_CLIENT (source_object), + res, &error); + if (!conn) { + g_warning ("Failed to add new connection: (%d) %s", + error->code, + error->message); + g_error_free (error); + return; + } + + /* show hotspot tab */ + nm_device_wifi_refresh_ui (user_data); + show_hotspot_ui (user_data); } static void @@ -1024,7 +1031,7 @@ NMSettingIP4Config *sip; NMSettingWirelessSecurity *sws; NMDevice *device; - GByteArray *ssid_array; + GBytes *ssid; const gchar *str_mac; struct ether_addr *bin_mac; GSList *connections; @@ -1047,20 +1054,29 @@ } g_slist_free (connections); + ssid = generate_ssid_for_hotspot (device_wifi); + client = net_object_get_client (NET_OBJECT (device_wifi)); if (c != NULL) { + NMSettingWireless *sw; + + sw = nm_connection_get_setting_wireless (c); + g_object_set (sw, "ssid", ssid, NULL); + g_bytes_unref (ssid); + g_debug ("activate existing hotspot connection\n"); - nm_client_activate_connection (client, - c, - device, - NULL, - (NMClientActivateFn)activate_cb, - device_wifi); + nm_client_activate_connection_async (client, + c, + device, + NULL, + NULL, + activate_cb, + device_wifi); return; } g_debug ("create new hotspot connection\n"); - c = nm_connection_new (); + c = nm_simple_connection_new (); sc = (NMSettingConnection *)nm_setting_connection_new (); g_object_set (sc, @@ -1081,7 +1097,6 @@ g_object_set (sw, "mode", mode, - "security", "802-11-wireless-security", NULL); str_mac = nm_device_wifi_get_permanent_hw_address (NM_DEVICE_WIFI (device)); @@ -1102,11 +1117,8 @@ g_object_set (sip, "method", "shared", NULL); nm_connection_add_setting (c, (NMSetting *)sip); - ssid_array = generate_ssid_for_hotspot (device_wifi); - g_object_set (sw, - "ssid", ssid_array, - NULL); - g_byte_array_unref (ssid_array); + g_object_set (sw, "ssid", ssid, NULL); + g_bytes_unref (ssid); sws = (NMSettingWirelessSecurity*) nm_setting_wireless_security_new (); @@ -1130,12 +1142,13 @@ nm_connection_add_setting (c, (NMSetting *)sws); - nm_client_add_and_activate_connection (client, - c, - device, - NULL, - (NMClientAddActivateFn)activate_new_cb, - device_wifi); + nm_client_add_and_activate_connection_async (client, + c, + device, + NULL, + NULL, + activate_new_cb, + device_wifi); g_object_unref (c); } @@ -1175,8 +1188,10 @@ devices = nm_active_connection_get_devices (c); if (devices && devices->pdata[0] == device) { NMAccessPoint *ap; + GBytes *ssid; ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)); - active_ssid = nm_utils_ssid_to_utf8 (nm_access_point_get_ssid (ap)); + ssid = nm_access_point_get_ssid (ap); + active_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); break; } } @@ -1229,7 +1244,7 @@ devices = nm_active_connection_get_devices (c); if (devices && devices->pdata[0] == device) { - nm_client_deactivate_connection (client, c); + nm_client_deactivate_connection (client, c, NULL, NULL); found = TRUE; break; } @@ -1297,8 +1312,9 @@ } static void -remote_settings_read_cb (NMRemoteSettings *remote_settings, - NetDeviceWifi *device_wifi) +client_connection_added_cb (NMClient *client, + NMRemoteConnection *connection, + NetDeviceWifi *device_wifi) { gboolean is_hotspot; @@ -1313,11 +1329,44 @@ } static void +client_connection_removed_cb (NMClient *client, + NMRemoteConnection *connection, + NetDeviceWifi *device_wifi) +{ + GtkWidget *swin; + GtkWidget *list; + GList *rows, *l; + const char *uuid; + + uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); + + swin = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, + "scrolledwindow_list")); + list = gtk_bin_get_child (GTK_BIN (gtk_bin_get_child (GTK_BIN (swin)))); + rows = gtk_container_get_children (GTK_CONTAINER (list)); + for (l = rows; l != NULL; l = l->next) { + GtkWidget *row = l->data; + NMConnection *connection; + const char *uuid_r; + + connection = g_object_get_data (G_OBJECT (row), "connection"); + if (!connection) + continue; + + uuid_r = nm_connection_get_uuid (connection); + if (g_strcmp0 (uuid_r, uuid) == 0) { + gtk_widget_destroy (row); + break; + } + } + g_list_free (rows); +} + +static void net_device_wifi_constructed (GObject *object) { NetDeviceWifi *device_wifi = NET_DEVICE_WIFI (object); NMClient *client; - NMRemoteSettings *remote_settings; NMClientPermissionResult perm; NMDevice *nm_device; NMDeviceWifiCapabilities caps; @@ -1353,9 +1402,10 @@ } else gtk_widget_set_sensitive (widget, TRUE); - remote_settings = net_object_get_remote_settings (NET_OBJECT (device_wifi)); - g_signal_connect (remote_settings, "connections-read", - G_CALLBACK (remote_settings_read_cb), device_wifi); + g_signal_connect (client, NM_CLIENT_CONNECTION_ADDED, + G_CALLBACK (client_connection_added_cb), device_wifi); + g_signal_connect (client, NM_CLIENT_CONNECTION_REMOVED, + G_CALLBACK (client_connection_removed_cb), device_wifi); widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, "heading_list")); g_object_bind_property (device_wifi, "title", widget, "label", 0); @@ -1386,11 +1436,11 @@ gchar *cmdline; GError *error = NULL; NetDeviceWifi *device = NET_DEVICE_WIFI (object); - NMRemoteSettings *settings; + NMClient *client; NMRemoteConnection *connection; - settings = net_object_get_remote_settings (object); - connection = nm_remote_settings_get_connection_by_path (settings, device->priv->selected_connection_id); + client = net_object_get_client (object); + connection = nm_client_get_connection_by_path (client, device->priv->selected_connection_id); if (connection == NULL) { g_warning ("failed to get remote connection"); return; @@ -1421,21 +1471,22 @@ } static void -really_forgotten (NMRemoteConnection *connection, - GError *error, +really_forgotten (GObject *source_object, + GAsyncResult *res, gpointer user_data) { - NetDeviceWifi *device_wifi = NET_DEVICE_WIFI (user_data); + GError *error = NULL; - if (error != NULL) { + if (!nm_remote_connection_delete_finish (NM_REMOTE_CONNECTION (source_object), res, &error)) { g_warning ("failed to delete connection %s: %s", - nm_object_get_path (NM_OBJECT (connection)), + nm_object_get_path (NM_OBJECT (source_object)), error->message); + g_error_free (error); return; } /* remove the entry from the list */ - populate_ap_list (device_wifi); + populate_ap_list (user_data); } static void @@ -1458,7 +1509,8 @@ for (r = rows; r; r = r->next) { row = r->data; connection = g_object_get_data (G_OBJECT (row), "connection"); - nm_remote_connection_delete (connection, really_forgotten, device_wifi); + //FIXME cancellable + nm_remote_connection_delete_async (connection, NULL, really_forgotten, device_wifi); gtk_widget_destroy (row); } g_list_free (rows); @@ -1544,7 +1596,7 @@ gboolean connecting; guint security; guint strength; - const GByteArray *ssid; + GBytes *ssid; const gchar *icon_name; guint64 timestamp; NMDeviceState state; @@ -1613,7 +1665,7 @@ if (check_out) *check_out = widget; - title = nm_utils_ssid_to_utf8 (ssid); + title = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); widget = gtk_label_new (title); g_free (title); gtk_widget_set_margin_top (widget, 12); @@ -1694,11 +1746,8 @@ gtk_widget_show_all (row); g_object_set_data (G_OBJECT (row), "ap", ap); - if (connection) { + if (connection) g_object_set_data (G_OBJECT (row), "connection", connection); - g_signal_connect_object (connection, "removed", - G_CALLBACK (gtk_widget_destroy), row, G_CONNECT_SWAPPED); - } g_object_set_data (G_OBJECT (row), "timestamp", GUINT_TO_POINTER (timestamp)); g_object_set_data (G_OBJECT (row), "active", GUINT_TO_POINTER (active)); g_object_set_data (G_OBJECT (row), "strength", GUINT_TO_POINTER (strength)); @@ -1750,7 +1799,6 @@ GtkWidget *window; NetConnectionEditor *editor; NMClient *client; - NMRemoteSettings *settings; NMDevice *device; window = gtk_widget_get_toplevel (GTK_WIDGET (button)); @@ -1761,8 +1809,7 @@ device = net_device_get_nm_device (NET_DEVICE (device_wifi)); client = net_object_get_client (NET_OBJECT (device_wifi)); - settings = net_object_get_remote_settings (NET_OBJECT (device_wifi)); - editor = net_connection_editor_new (GTK_WINDOW (window), connection, device, ap, client, settings); + editor = net_connection_editor_new (GTK_WINDOW (window), connection, device, ap, client); g_signal_connect (editor, "done", G_CALLBACK (editor_done), device_wifi); net_connection_editor_run (editor); } @@ -1847,17 +1894,19 @@ NMConnection *connection = l->data; NMAccessPoint *ap = NULL; NMSetting *setting; - const GByteArray *ssid; + GBytes *ssid; if (connection_is_shared (connection)) continue; setting = nm_connection_get_setting_by_name (connection, NM_SETTING_WIRELESS_SETTING_NAME); ssid = nm_setting_wireless_get_ssid (NM_SETTING_WIRELESS (setting)); for (i = 0; i < aps_unique->len; i++) { - const GByteArray *ssid_ap; + GBytes *ssid_ap; ap = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, i)); ssid_ap = nm_access_point_get_ssid (ap); - if (nm_utils_same_ssid (ssid, ssid_ap, TRUE)) + if (nm_utils_same_ssid (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid), + g_bytes_get_data (ssid_ap, NULL), g_bytes_get_size (ssid_ap), + TRUE)) break; ap = NULL; } @@ -1916,7 +1965,7 @@ active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (nm_device)); for (i = 0; i < aps_unique->len; i++) { - const GByteArray *ssid_ap; + GBytes *ssid_ap; NMAccessPoint *ap; NMConnection *connection = NULL; ap = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, i)); @@ -1924,7 +1973,7 @@ for (l = connections; l; l = l->next) { connection = l->data; NMSetting *setting; - const GByteArray *ssid; + GBytes *ssid; if (connection_is_shared (connection)) { connection = NULL; @@ -1933,7 +1982,9 @@ setting = nm_connection_get_setting_by_name (connection, NM_SETTING_WIRELESS_SETTING_NAME); ssid = nm_setting_wireless_get_ssid (NM_SETTING_WIRELESS (setting)); - if (nm_utils_same_ssid (ssid, ssid_ap, TRUE)) + if (nm_utils_same_ssid (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid), + g_bytes_get_data (ssid_ap, NULL), g_bytes_get_size (ssid_ap), + TRUE)) break; connection = NULL; } @@ -1972,12 +2023,12 @@ gtk_widget_hide (edit); client = net_object_get_client (NET_OBJECT (device_wifi)); nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi)); - nm_client_activate_connection (client, - connection, - nm_device, NULL, - connection_activate_cb, device_wifi); + nm_client_activate_connection_async (client, + connection, + nm_device, NULL, NULL, + connection_activate_cb, device_wifi); } else { - const GByteArray *ssid; + GBytes *ssid; const gchar *object_path; gtk_stack_set_visible_child_name (GTK_STACK (stack), "spinner"); diff -Nru gnome-control-center-3.20.2/panels/network/net-object.c gnome-control-center-3.22.1/panels/network/net-object.c --- gnome-control-center-3.20.2/panels/network/net-object.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-object.c 2016-08-12 12:43:57.000000000 +0000 @@ -35,7 +35,6 @@ gboolean removable; GCancellable *cancellable; NMClient *client; - NMRemoteSettings *remote_settings; CcNetworkPanel *panel; }; @@ -45,7 +44,6 @@ PROP_TITLE, PROP_REMOVABLE, PROP_CLIENT, - PROP_REMOTE_SETTINGS, PROP_CANCELLABLE, PROP_PANEL, PROP_LAST @@ -122,13 +120,6 @@ return object->priv->client; } -NMRemoteSettings * -net_object_get_remote_settings (NetObject *object) -{ - g_return_val_if_fail (NET_IS_OBJECT (object), NULL); - return object->priv->remote_settings; -} - GCancellable * net_object_get_cancellable (NetObject *object) { @@ -213,9 +204,6 @@ case PROP_CLIENT: g_value_set_pointer (value, priv->client); break; - case PROP_REMOTE_SETTINGS: - g_value_set_pointer (value, priv->remote_settings); - break; case PROP_CANCELLABLE: g_value_set_object (value, priv->cancellable); break; @@ -257,11 +245,6 @@ if (priv->client) g_object_add_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client)); break; - case PROP_REMOTE_SETTINGS: - priv->remote_settings = g_value_get_pointer (value); - if (priv->remote_settings) - g_object_add_weak_pointer (G_OBJECT (priv->remote_settings), (gpointer *) (&priv->remote_settings)); - break; case PROP_CANCELLABLE: g_assert (!priv->cancellable); priv->cancellable = g_value_dup_object (value); @@ -291,8 +274,6 @@ if (priv->client) g_object_remove_weak_pointer (G_OBJECT (priv->client), (gpointer *) (&priv->client)); - if (priv->remote_settings) - g_object_remove_weak_pointer (G_OBJECT (priv->remote_settings), (gpointer *) (&priv->remote_settings)); if (priv->panel) g_object_remove_weak_pointer (G_OBJECT (priv->panel), (gpointer *) (&priv->panel)); @@ -327,10 +308,6 @@ G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property (object_class, PROP_CLIENT, pspec); - pspec = g_param_spec_pointer ("remote-settings", NULL, NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - g_object_class_install_property (object_class, PROP_REMOTE_SETTINGS, pspec); - pspec = g_param_spec_object ("cancellable", NULL, NULL, G_TYPE_CANCELLABLE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT); diff -Nru gnome-control-center-3.20.2/panels/network/net-object.h gnome-control-center-3.22.1/panels/network/net-object.h --- gnome-control-center-3.20.2/panels/network/net-object.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-object.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,8 +24,7 @@ #include #include -#include -#include +#include #include "cc-network-panel.h" @@ -73,7 +72,6 @@ void net_object_set_title (NetObject *object, const gchar *title); NMClient *net_object_get_client (NetObject *object); -NMRemoteSettings *net_object_get_remote_settings (NetObject *object); GCancellable *net_object_get_cancellable (NetObject *object); CcNetworkPanel *net_object_get_panel (NetObject *object); void net_object_emit_changed (NetObject *object); diff -Nru gnome-control-center-3.20.2/panels/network/net-virtual-device.c gnome-control-center-3.22.1/panels/network/net-virtual-device.c --- gnome-control-center-3.20.2/panels/network/net-virtual-device.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-virtual-device.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,468 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include - -#include -#include -#include - -#include "panel-common.h" -#include "cc-network-panel.h" - -#include "net-virtual-device.h" - -#define NET_VIRTUAL_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_VIRTUAL_DEVICE, NetVirtualDevicePrivate)) - -struct _NetVirtualDevicePrivate { - NMConnection *connection; - const char *iface; - - GtkBuilder *builder; - gboolean updating_device; -}; - -enum { - PROP_0, - PROP_CONNECTION, - PROP_LAST -}; - -enum { - SIGNAL_DEVICE_SET, - SIGNAL_DEVICE_UNSET, - SIGNAL_LAST -}; - -static guint signals[SIGNAL_LAST] = { 0 }; - -G_DEFINE_TYPE (NetVirtualDevice, net_virtual_device, NET_TYPE_DEVICE) - -static void -connection_changed_cb (NMConnection *connection, - NetObject *object) -{ - net_object_emit_changed (object); -} - -static void -connection_removed_cb (NMConnection *connection, - NetObject *object) -{ - net_object_emit_removed (object); -} - -static void -net_virtual_device_set_connection (NetVirtualDevice *virtual_device, - NMConnection *connection) -{ - NetVirtualDevicePrivate *priv = virtual_device->priv; - - priv->connection = g_object_ref (connection); - priv->iface = nm_connection_get_virtual_iface_name (priv->connection); - - g_signal_connect (priv->connection, - NM_REMOTE_CONNECTION_REMOVED, - G_CALLBACK (connection_removed_cb), - virtual_device); - g_signal_connect (priv->connection, - NM_REMOTE_CONNECTION_UPDATED, - G_CALLBACK (connection_changed_cb), - virtual_device); -} - -static void -net_virtual_device_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NetVirtualDevicePrivate *priv = virtual_device->priv; - - switch (prop_id) { - case PROP_CONNECTION: - g_value_set_object (value, priv->connection); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (virtual_device, prop_id, pspec); - break; - - } -} - -static void -net_virtual_device_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NMConnection *connection; - - switch (prop_id) { - case PROP_CONNECTION: - connection = NM_CONNECTION (g_value_get_object (value)); - net_virtual_device_set_connection (virtual_device, connection); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (virtual_device, prop_id, pspec); - break; - - } -} - -static GtkWidget * -net_virtual_device_add_to_notebook (NetObject *object, - GtkNotebook *notebook, - GtkSizeGroup *heading_size_group) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - GtkWidget *widget; - - /* add widgets to size group */ - widget = GTK_WIDGET (gtk_builder_get_object (virtual_device->priv->builder, - "heading_ipv4")); - gtk_size_group_add_widget (heading_size_group, widget); - - widget = GTK_WIDGET (gtk_builder_get_object (virtual_device->priv->builder, - "vbox6")); - gtk_notebook_append_page (notebook, widget, NULL); - return widget; -} - -static void -update_off_switch_from_device_state (GtkSwitch *sw, - NMDeviceState state, - NetVirtualDevice *virtual_device) -{ - virtual_device->priv->updating_device = TRUE; - switch (state) { - case NM_DEVICE_STATE_UNMANAGED: - case NM_DEVICE_STATE_UNAVAILABLE: - case NM_DEVICE_STATE_DISCONNECTED: - case NM_DEVICE_STATE_DEACTIVATING: - case NM_DEVICE_STATE_FAILED: - gtk_switch_set_active (sw, FALSE); - break; - default: - gtk_switch_set_active (sw, TRUE); - break; - } - virtual_device->priv->updating_device = FALSE; -} - -static void -net_virtual_device_refresh (NetObject *object) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NetVirtualDevicePrivate *priv = virtual_device->priv; - char *hwaddr; - GtkWidget *widget; - NMDevice *nm_device; - NMDeviceState state; - gboolean disconnected; - - nm_device = net_device_get_nm_device (NET_DEVICE (virtual_device)); - state = nm_device ? nm_device_get_state (nm_device) : NM_DEVICE_STATE_DISCONNECTED; - disconnected = (state == NM_DEVICE_STATE_DISCONNECTED || state == NM_DEVICE_STATE_UNAVAILABLE); - - /* set device kind */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "image_device")); - gtk_image_set_from_icon_name (GTK_IMAGE (widget), - disconnected ? "network-wired-disconnected" : "network-wired", - GTK_ICON_SIZE_DIALOG); - - /* set up the device on/off switch */ - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_off_switch")); - update_off_switch_from_device_state (GTK_SWITCH (widget), state, virtual_device); - - /* set device state, with status and optionally speed */ - if (nm_device) { - panel_set_device_status (priv->builder, "label_status", nm_device, NULL); - } else { - widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_status")); - gtk_label_set_label (GTK_LABEL (widget), ""); - } - - /* device MAC */ - if (nm_device) { - g_object_get (G_OBJECT (nm_device), - "hw-address", &hwaddr, - NULL); - } else - hwaddr = g_strdup (""); - panel_set_device_widget_details (priv->builder, "mac", hwaddr); - g_free (hwaddr); - - /* set IP entries */ - if (nm_device) - panel_set_device_widgets (priv->builder, nm_device); - else - panel_unset_device_widgets (priv->builder); -} - -static void -net_virtual_device_delete (NetObject *object) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NetVirtualDevicePrivate *priv = virtual_device->priv; - const char *path; - NMRemoteSettings *settings; - NMRemoteConnection *connection; - - settings = net_object_get_remote_settings (object); - path = nm_connection_get_path (priv->connection); - connection = nm_remote_settings_get_connection_by_path (settings, path); - nm_remote_connection_delete (connection, NULL, NULL); -} - -static void -device_added_cb (NMClient *client, NMDevice *nm_device, gpointer user_data) -{ - NetVirtualDevice *virtual_device = user_data; - NetVirtualDevicePrivate *priv = virtual_device->priv; - const char *iface; - - iface = nm_device_get_iface (nm_device); - if (strcmp (iface, priv->iface) == 0) { - g_object_set (G_OBJECT (virtual_device), - "nm-device", nm_device, - NULL); - g_signal_emit (virtual_device, signals[SIGNAL_DEVICE_SET], 0, nm_device); - net_object_emit_changed (NET_OBJECT (virtual_device)); - net_object_refresh (NET_OBJECT (virtual_device)); - } -} - -static void -device_removed_cb (NMClient *client, NMDevice *nm_device, gpointer user_data) -{ - NetVirtualDevice *virtual_device = user_data; - NetVirtualDevicePrivate *priv = virtual_device->priv; - const char *iface; - - iface = nm_device_get_iface (nm_device); - if (strcmp (iface, priv->iface) == 0) { - g_object_set (G_OBJECT (virtual_device), - "nm-device", NULL, - NULL); - g_signal_emit (virtual_device, signals[SIGNAL_DEVICE_UNSET], 0, nm_device); - net_object_emit_changed (NET_OBJECT (virtual_device)); - net_object_refresh (NET_OBJECT (virtual_device)); - } -} - -static void -device_off_toggled (GtkSwitch *sw, - GParamSpec *pspec, - gpointer user_data) -{ - NetVirtualDevice *virtual_device = user_data; - gboolean active; - NMActiveConnection *ac; - NMClient *client; - NMDevice *nm_device; - - if (virtual_device->priv->updating_device) - return; - - client = net_object_get_client (NET_OBJECT (virtual_device)); - nm_device = net_device_get_nm_device (NET_DEVICE (virtual_device)); - - active = gtk_switch_get_active (sw); - if (active) { - nm_client_activate_connection (client, - virtual_device->priv->connection, - nm_device, - NULL, NULL, NULL); - } else { - g_return_if_fail (nm_device != NULL); - - ac = nm_device_get_active_connection (nm_device); - g_return_if_fail (ac != NULL); - - nm_client_deactivate_connection (client, ac); - } -} - -static void -edit_connection (GtkButton *button, gpointer virtual_device) -{ - net_object_edit (NET_OBJECT (virtual_device)); -} - -static void -net_virtual_device_constructed (GObject *object) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NMClient *client; - const GPtrArray *devices; - int i; - - client = net_object_get_client (NET_OBJECT (virtual_device)); - - g_signal_connect_object (client, "device-added", - G_CALLBACK (device_added_cb), virtual_device, 0); - g_signal_connect_object (client, "device-removed", - G_CALLBACK (device_removed_cb), virtual_device, 0); - devices = nm_client_get_devices (client); - if (devices) { - for (i = 0; i < devices->len; i++) - device_added_cb (client, devices->pdata[i], virtual_device); - } - - net_object_refresh (NET_OBJECT (virtual_device)); - - G_OBJECT_CLASS (net_virtual_device_parent_class)->constructed (object); -} - -static void -net_virtual_device_finalize (GObject *object) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (object); - NetVirtualDevicePrivate *priv = virtual_device->priv; - - if (priv->connection) - g_object_unref (priv->connection); - g_object_unref (priv->builder); - - G_OBJECT_CLASS (net_virtual_device_parent_class)->finalize (object); -} - -static NMConnection * -net_virtual_device_get_find_connection (NetDevice *device) -{ - NetVirtualDevice *virtual_device = NET_VIRTUAL_DEVICE (device); - - return virtual_device->priv->connection; -} - -static void -net_virtual_device_class_init (NetVirtualDeviceClass *klass) -{ - NetDeviceClass *device_class = NET_DEVICE_CLASS (klass); - NetObjectClass *net_object_class = NET_OBJECT_CLASS (klass); - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GParamSpec *pspec; - - object_class->constructed = net_virtual_device_constructed; - object_class->finalize = net_virtual_device_finalize; - object_class->get_property = net_virtual_device_get_property; - object_class->set_property = net_virtual_device_set_property; - - net_object_class->refresh = net_virtual_device_refresh; - net_object_class->add_to_notebook = net_virtual_device_add_to_notebook; - net_object_class->delete = net_virtual_device_delete; - - device_class->get_find_connection = net_virtual_device_get_find_connection; - - g_type_class_add_private (klass, sizeof (NetVirtualDevicePrivate)); - - signals[SIGNAL_DEVICE_SET] = - g_signal_new ("device-set", - G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NetVirtualDeviceClass, device_set), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_OBJECT); - - signals[SIGNAL_DEVICE_UNSET] = - g_signal_new ("device-unset", - G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NetVirtualDeviceClass, device_unset), - NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_OBJECT); - - pspec = g_param_spec_object ("connection", NULL, NULL, - NM_TYPE_CONNECTION, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); - g_object_class_install_property (object_class, PROP_CONNECTION, pspec); -} - -static void -net_virtual_device_init (NetVirtualDevice *virtual_device) -{ - GError *error = NULL; - GtkWidget *widget; - - virtual_device->priv = NET_VIRTUAL_DEVICE_GET_PRIVATE (virtual_device); - - virtual_device->priv->builder = gtk_builder_new (); - gtk_builder_add_from_resource (virtual_device->priv->builder, - "/org/gnome/control-center/network/network-simple.ui", - &error); - if (error != NULL) { - g_warning ("Could not load interface file: %s", error->message); - g_error_free (error); - return; - } - - widget = GTK_WIDGET (gtk_builder_get_object (virtual_device->priv->builder, - "label_device")); - g_object_bind_property (virtual_device, "title", widget, "label", 0); - - widget = GTK_WIDGET (gtk_builder_get_object (virtual_device->priv->builder, - "device_off_switch")); - g_signal_connect (widget, "notify::active", - G_CALLBACK (device_off_toggled), virtual_device); - - widget = GTK_WIDGET (gtk_builder_get_object (virtual_device->priv->builder, - "button_options")); - g_signal_connect (widget, "clicked", - G_CALLBACK (edit_connection), virtual_device); -} - -void -net_virtual_device_add_row (NetVirtualDevice *virtual_device, - const char *label_string, - const char *property_name) -{ - NetVirtualDevicePrivate *priv = virtual_device->priv; - GtkGrid *grid; - GtkWidget *label, *value; - GtkStyleContext *context; - gint top_attach; - - grid = GTK_GRID (gtk_builder_get_object (priv->builder, "grid")); - - label = gtk_label_new (label_string); - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_container_add (GTK_CONTAINER (grid), label); - - context = gtk_widget_get_style_context (label); - gtk_style_context_add_class (context, "dim-label"); - gtk_widget_show (label); - - gtk_container_child_get (GTK_CONTAINER (grid), label, - "top-attach", &top_attach, - NULL); - - value = gtk_label_new (NULL); - gtk_widget_set_halign (value, GTK_ALIGN_START); - g_object_bind_property (virtual_device, property_name, value, "label", 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), value); - gtk_grid_attach (grid, value, 1, top_attach, 1, 1); - gtk_widget_show (value); -} diff -Nru gnome-control-center-3.20.2/panels/network/net-virtual-device.h gnome-control-center-3.22.1/panels/network/net-virtual-device.h --- gnome-control-center-3.20.2/panels/network/net-virtual-device.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-virtual-device.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Red Hat, Inc. - * - * Licensed under the GNU General Public License Version 2 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __NET_VIRTUAL_DEVICE_H -#define __NET_VIRTUAL_DEVICE_H - -#include - -#include "net-device.h" - -G_BEGIN_DECLS - -#define NET_TYPE_VIRTUAL_DEVICE (net_virtual_device_get_type ()) -#define NET_VIRTUAL_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NET_TYPE_VIRTUAL_DEVICE, NetVirtualDevice)) -#define NET_VIRTUAL_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NET_TYPE_VIRTUAL_DEVICE, NetVirtualDeviceClass)) -#define NET_IS_VIRTUAL_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NET_TYPE_VIRTUAL_DEVICE)) -#define NET_IS_VIRTUAL_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NET_TYPE_VIRTUAL_DEVICE)) -#define NET_VIRTUAL_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NET_TYPE_VIRTUAL_DEVICE, NetVirtualDeviceClass)) - -typedef struct _NetVirtualDevicePrivate NetVirtualDevicePrivate; -typedef struct _NetVirtualDevice NetVirtualDevice; -typedef struct _NetVirtualDeviceClass NetVirtualDeviceClass; - -struct _NetVirtualDevice -{ - NetDevice parent; - NetVirtualDevicePrivate *priv; -}; - -struct _NetVirtualDeviceClass -{ - NetDeviceClass parent_class; - - /* signals */ - void (*device_set) (NetVirtualDevice *virtual_device, - NMDevice *nm_device); - void (*device_unset) (NetVirtualDevice *virtual_device, - NMDevice *nm_device); -}; - -GType net_virtual_device_get_type (void); - -void net_virtual_device_add_row (NetVirtualDevice *virtual_device, - const char *label_string, - const char *property_name); - -G_END_DECLS - -#endif /* __NET_VIRTUAL_DEVICE_H */ - diff -Nru gnome-control-center-3.20.2/panels/network/net-vpn.c gnome-control-center-3.22.1/panels/network/net-vpn.c --- gnome-control-center-3.20.2/panels/network/net-vpn.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-vpn.c 2016-08-12 12:43:57.000000000 +0000 @@ -23,13 +23,11 @@ #include #include +#include #include "panel-common.h" #include "net-vpn.h" -#include "nm-client.h" -#include "nm-remote-connection.h" -#include "nm-setting-vpn.h" #include "connection-editor/net-connection-editor.h" @@ -54,9 +52,9 @@ G_DEFINE_TYPE (NetVpn, net_vpn, NET_TYPE_OBJECT) static void -connection_vpn_state_changed_cb (NMVPNConnection *connection, - NMVPNConnectionState state, - NMVPNConnectionStateReason reason, +connection_vpn_state_changed_cb (NMVpnConnection *connection, + NMVpnConnectionState state, + NMVpnConnectionStateReason reason, NetVpn *vpn) { net_object_emit_changed (NET_OBJECT (vpn)); @@ -70,10 +68,14 @@ } static void -connection_removed_cb (NMConnection *connection, - NetVpn *vpn) +connection_removed_cb (NMClient *client, + NMConnection *connection, + NetVpn *vpn) { - net_object_emit_removed (NET_OBJECT (vpn)); + NetVpnPrivate *priv = vpn->priv; + + if (priv->connection == connection) + net_object_emit_removed (NET_OBJECT (vpn)); } static char * @@ -91,6 +93,8 @@ net_vpn_set_connection (NetVpn *vpn, NMConnection *connection) { NetVpnPrivate *priv = vpn->priv; + NMClient *client; + /* * vpnc config exmaple: * key=IKE DH Group, value=dh2 @@ -102,14 +106,17 @@ * key=Xauth username, value=rhughes */ priv->connection = g_object_ref (connection); - g_signal_connect (priv->connection, - NM_REMOTE_CONNECTION_REMOVED, + + client = net_object_get_client (NET_OBJECT (vpn)); + g_signal_connect (client, + NM_CLIENT_CONNECTION_REMOVED, G_CALLBACK (connection_removed_cb), vpn); - g_signal_connect (priv->connection, - NM_REMOTE_CONNECTION_UPDATED, + g_signal_connect (connection, + NM_CONNECTION_CHANGED, G_CALLBACK (connection_changed_cb), vpn); + if (NM_IS_VPN_CONNECTION (priv->connection)) { g_signal_connect (priv->connection, NM_VPN_CONNECTION_VPN_STATE, @@ -120,7 +127,7 @@ priv->service_type = net_vpn_connection_to_type (priv->connection); } -static NMVPNConnectionState +static NMVpnConnectionState net_vpn_get_state (NetVpn *vpn) { NetVpnPrivate *priv = vpn->priv; @@ -225,8 +232,8 @@ vpn_proxy_delete (NetObject *object) { NetVpn *vpn = NET_VPN (object); - nm_remote_connection_delete (NM_REMOTE_CONNECTION (vpn->priv->connection), - NULL, vpn); + nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (vpn->priv->connection), + NULL, NULL, vpn); } static GtkWidget * @@ -258,9 +265,7 @@ const GPtrArray *acs; NMActiveConnection *a; gint i; - const gchar *path; - const gchar *apath; - NMVPNConnectionState state; + NMVpnConnectionState state; gchar *title; NMClient *client; @@ -293,12 +298,16 @@ client = net_object_get_client (NET_OBJECT (vpn)); acs = nm_client_get_active_connections (client); if (acs != NULL) { - path = nm_connection_get_path (vpn->priv->connection); + const gchar *uuid; + + uuid = nm_connection_get_uuid (vpn->priv->connection); for (i = 0; i < acs->len; i++) { + const gchar *auuid; + a = (NMActiveConnection*)acs->pdata[i]; - apath = nm_active_connection_get_connection (a); - if (NM_IS_VPN_CONNECTION (a) && strcmp (apath, path) == 0) { + auuid = nm_active_connection_get_uuid (a); + if (NM_IS_VPN_CONNECTION (a) && strcmp (auuid, uuid) == 0) { priv->active_connection = g_object_ref (a); g_signal_connect_swapped (a, "notify::vpn-state", G_CALLBACK (nm_device_refresh_vpn_ui), @@ -363,7 +372,6 @@ GParamSpec *pspec, NetVpn *vpn) { - const gchar *path; const GPtrArray *acs; gboolean active; gint i; @@ -376,17 +384,19 @@ active = gtk_switch_get_active (sw); if (active) { client = net_object_get_client (NET_OBJECT (vpn)); - nm_client_activate_connection (client, - vpn->priv->connection, NULL, NULL, - NULL, NULL); + nm_client_activate_connection_async (client, + vpn->priv->connection, NULL, NULL, + NULL, NULL, NULL); } else { - path = nm_connection_get_path (vpn->priv->connection); + const gchar *uuid; + + uuid = nm_connection_get_uuid (vpn->priv->connection); client = net_object_get_client (NET_OBJECT (vpn)); acs = nm_client_get_active_connections (client); for (i = 0; acs && i < acs->len; i++) { a = (NMActiveConnection*)acs->pdata[i]; - if (strcmp (nm_active_connection_get_connection (a), path) == 0) { - nm_client_deactivate_connection (client, a); + if (strcmp (nm_active_connection_get_uuid (a), uuid) == 0) { + nm_client_deactivate_connection (client, a, NULL, NULL); break; } } @@ -416,7 +426,6 @@ GtkWidget *button, *window; NetConnectionEditor *editor; NMClient *client; - NMRemoteSettings *settings; gchar *title; button = GTK_WIDGET (gtk_builder_get_object (vpn->priv->builder, @@ -424,11 +433,10 @@ window = gtk_widget_get_toplevel (button); client = net_object_get_client (object); - settings = net_object_get_remote_settings (object); editor = net_connection_editor_new (GTK_WINDOW (window), vpn->priv->connection, - NULL, NULL, client, settings); + NULL, NULL, client); title = g_strdup_printf (_("%s VPN"), nm_connection_get_id (vpn->priv->connection)); net_connection_editor_set_title (editor, title); g_free (title); diff -Nru gnome-control-center-3.20.2/panels/network/net-vpn.h gnome-control-center-3.22.1/panels/network/net-vpn.h --- gnome-control-center-3.20.2/panels/network/net-vpn.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/net-vpn.h 2016-08-12 12:43:57.000000000 +0000 @@ -23,11 +23,9 @@ #define __NET_VPN_H #include +#include -#include "NetworkManagerVPN.h" #include "net-object.h" -#include "nm-connection.h" -#include "nm-vpn-connection.h" G_BEGIN_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/network-dialogs.c gnome-control-center-3.22.1/panels/network/network-dialogs.c --- gnome-control-center-3.20.2/panels/network/network-dialogs.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/network-dialogs.c 2016-08-12 12:43:57.000000000 +0000 @@ -20,26 +20,18 @@ * Copyright 2008 - 2011 Red Hat, Inc. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include "network-dialogs.h" -#include "nm-wifi-dialog.h" -#include "nm-mobile-wizard.h" typedef struct { NMClient *client; - NMRemoteSettings *settings; } WirelessDialogClosure; typedef struct { NMClient *client; - NMRemoteSettings *settings; NMDevice *device; } MobileDialogClosure; @@ -49,7 +41,6 @@ { WirelessDialogClosure *closure = data; g_object_unref (closure->client); - g_object_unref (closure->settings); g_slice_free (WirelessDialogClosure, data); } @@ -59,7 +50,6 @@ { MobileDialogClosure *closure = data; g_object_unref (closure->client); - g_object_unref (closure->settings); g_object_unref (closure->device); g_slice_free (MobileDialogClosure, data); @@ -82,24 +72,29 @@ } static void -activate_existing_cb (NMClient *client, - NMActiveConnection *active, - GError *error, +activate_existing_cb (GObject *source_object, + GAsyncResult *res, gpointer user_data) { - if (error) + GError *error = NULL; + + if (!nm_client_activate_connection_finish (NM_CLIENT (source_object), res, &error)) { g_warning ("Failed to activate connection: (%d) %s", error->code, error->message); + g_error_free (error); + } } static void -activate_new_cb (NMClient *client, - NMActiveConnection *active, - const char *connection_path, - GError *error, +activate_new_cb (GObject *source_object, + GAsyncResult *res, gpointer user_data) { - if (error) + GError *error = NULL; + + if (!nm_client_add_and_activate_connection_finish (NM_CLIENT (source_object), res, &error)) { g_warning ("Failed to add new connection: (%d) %s", error->code, error->message); + g_error_free (error); + } } static void @@ -125,7 +120,8 @@ NMConnection *connection, *fuzzy_match = NULL; NMDevice *device; NMAccessPoint *ap; - GSList *all, *iter; + const GPtrArray *all; + guint i; if (response != GTK_RESPONSE_OK) goto done; @@ -154,24 +150,24 @@ g_assert (device); /* Find a similar connection and use that instead */ - all = nm_remote_settings_list_connections (closure->settings); - for (iter = all; iter; iter = g_slist_next (iter)) { + all = nm_client_get_connections (closure->client); + for (i = 0; i < all->len; i++) { if (nm_connection_compare (connection, - NM_CONNECTION (iter->data), + NM_CONNECTION (g_ptr_array_index (all, i)), (NM_SETTING_COMPARE_FLAG_FUZZY | NM_SETTING_COMPARE_FLAG_IGNORE_ID))) { - fuzzy_match = NM_CONNECTION (iter->data); + fuzzy_match = NM_CONNECTION (g_ptr_array_index (all, i)); break; } } - g_slist_free (all); if (fuzzy_match) { - nm_client_activate_connection (closure->client, - fuzzy_match, - device, - ap ? nm_object_get_path (NM_OBJECT (ap)) : NULL, - activate_existing_cb, - NULL); + nm_client_activate_connection_async (closure->client, + fuzzy_match, + device, + ap ? nm_object_get_path (NM_OBJECT (ap)) : NULL, + NULL, + activate_existing_cb, + NULL); } else { NMSetting *s_con; NMSettingWireless *s_wifi; @@ -192,12 +188,13 @@ g_object_set (G_OBJECT (s_con), NM_SETTING_CONNECTION_AUTOCONNECT, FALSE, NULL); } - nm_client_add_and_activate_connection (closure->client, - connection, - device, - ap ? nm_object_get_path (NM_OBJECT (ap)) : NULL, - activate_new_cb, - NULL); + nm_client_add_and_activate_connection_async (closure->client, + connection, + device, + ap ? nm_object_get_path (NM_OBJECT (ap)) : NULL, + NULL, + activate_new_cb, + NULL); } /* Balance nma_wifi_dialog_get_connection() */ @@ -211,7 +208,6 @@ static void show_wireless_dialog (GtkWidget *toplevel, NMClient *client, - NMRemoteSettings *settings, GtkWidget *dialog) { WirelessDialogClosure *closure; @@ -226,7 +222,6 @@ closure = g_slice_new (WirelessDialogClosure); closure->client = g_object_ref (client); - closure->settings = g_object_ref (settings); g_signal_connect_data (dialog, "response", G_CALLBACK (wireless_dialog_response_cb), closure, wireless_dialog_closure_closure_notify, 0); @@ -238,29 +233,26 @@ void cc_network_panel_create_wifi_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { if (wifi_can_create_wifi_network (client)) { - show_wireless_dialog (toplevel, client, settings, - nma_wifi_dialog_new_for_create (client, settings)); + show_wireless_dialog (toplevel, client, + nma_wifi_dialog_new_for_create (client)); } } void cc_network_panel_connect_to_hidden_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings) + NMClient *client) { g_debug ("connect to hidden wifi"); - show_wireless_dialog (toplevel, client, settings, - nma_wifi_dialog_new_for_other (client, settings)); + show_wireless_dialog (toplevel, client, + nma_wifi_dialog_new_for_hidden (client)); } void cc_network_panel_connect_to_8021x_network (GtkWidget *toplevel, NMClient *client, - NMRemoteSettings *settings, NMDevice *device, const gchar *arg_access_point) { @@ -293,7 +285,7 @@ return; } - connection = nm_connection_new (); + connection = nm_simple_connection_new (); /* Need a UUID for the "always ask" stuff in the Dialog of Doom */ s_con = (NMSettingConnection *) nm_setting_connection_new (); @@ -306,7 +298,6 @@ nm_connection_add_setting (connection, NM_SETTING (s_wifi)); g_object_set (s_wifi, NM_SETTING_WIRELESS_SSID, nm_access_point_get_ssid (ap), - NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); @@ -318,8 +309,8 @@ g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, "mschapv2", NULL); nm_connection_add_setting (connection, NM_SETTING (s_8021x)); - dialog = nma_wifi_dialog_new (client, settings, connection, device, ap, FALSE); - show_wireless_dialog (toplevel, client, settings, dialog); + dialog = nma_wifi_dialog_new (client, connection, device, ap, FALSE); + show_wireless_dialog (toplevel, client, dialog); } static void @@ -335,12 +326,13 @@ /* Ask NM to add the new connection and activate it; NM will fill in the * missing details based on the specific object and the device. */ - nm_client_add_and_activate_connection (closure->client, - connection, - closure->device, - "/", - activate_new_cb, - NULL); + nm_client_add_and_activate_connection_async (closure->client, + connection, + closure->device, + "/", + NULL, + activate_new_cb, + NULL); } mobile_dialog_closure_free (closure); @@ -364,7 +356,7 @@ goto done; } - connection = nm_connection_new (); + connection = nm_simple_connection_new (); setting = nm_setting_cdma_new (); g_object_set (setting, @@ -426,7 +418,7 @@ goto done; } - connection = nm_connection_new (); + connection = nm_simple_connection_new (); setting = nm_setting_gsm_new (); g_object_set (setting, @@ -493,7 +485,6 @@ void cc_network_panel_connect_to_3g_network (GtkWidget *toplevel, NMClient *client, - NMRemoteSettings *settings, NMDevice *device) { MobileDialogClosure *closure; @@ -510,7 +501,6 @@ closure = g_slice_new (MobileDialogClosure); closure->client = g_object_ref (client); - closure->settings = g_object_ref (settings); closure->device = g_object_ref (device); caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device)); diff -Nru gnome-control-center-3.20.2/panels/network/network-dialogs.h gnome-control-center-3.22.1/panels/network/network-dialogs.h --- gnome-control-center-3.20.2/panels/network/network-dialogs.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/network-dialogs.h 2016-08-12 12:43:57.000000000 +0000 @@ -20,29 +20,22 @@ #ifndef _NETWORK_DIALOGS_H #define _NETWORK_DIALOGS_H -#include -#include -#include -#include +#include #include void cc_network_panel_create_wifi_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); void cc_network_panel_connect_to_hidden_network (GtkWidget *toplevel, - NMClient *client, - NMRemoteSettings *settings); + NMClient *client); void cc_network_panel_connect_to_8021x_network (GtkWidget *toplevel, NMClient *client, - NMRemoteSettings *settings, NMDevice *device, const gchar *arg_access_point); void cc_network_panel_connect_to_3g_network (GtkWidget *toplevel, NMClient *client, - NMRemoteSettings *settings, NMDevice *device); #endif /* _NETWORK_DIALOGS_H */ diff -Nru gnome-control-center-3.20.2/panels/network/panel-common.c gnome-control-center-3.22.1/panels/network/panel-common.c --- gnome-control-center-3.20.2/panels/network/panel-common.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/panel-common.c 2016-08-12 12:43:57.000000000 +0000 @@ -25,11 +25,7 @@ #include #include #include - -#include -#include -#include -#include +#include #include "panel-common.h" @@ -196,7 +192,7 @@ * panel_vpn_state_to_localized_string: **/ const gchar * -panel_vpn_state_to_localized_string (NMVPNConnectionState type) +panel_vpn_state_to_localized_string (NMVpnConnectionState type) { const gchar *value = NULL; switch (type) { @@ -245,7 +241,7 @@ * (eg, NM_DEVICE_STATE_REASON_CARRIER). */ - nm_device_get_state_reason (device, &state_reason); + state_reason = nm_device_get_state_reason (device); switch (state_reason) { case NM_DEVICE_STATE_REASON_CONFIG_FAILED: /* TRANSLATORS: device status reason */ @@ -407,10 +403,6 @@ /* TRANSLATORS: device status reason */ value = _("SIM wrong"); break; - case NM_DEVICE_STATE_REASON_INFINIBAND_MODE: - /* TRANSLATORS: device status reason */ - value = _("InfiniBand device does not support connected mode"); - break; case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: /* TRANSLATORS: device status reason */ value = _("Connection dependency failed"); @@ -420,6 +412,7 @@ value = ""; break; } + return value; } @@ -442,9 +435,6 @@ !nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (nm_device))) { /* TRANSLATORS: device status */ state_str = _("Cable unplugged"); - } else if (NM_IS_DEVICE_INFINIBAND (nm_device) && - !nm_device_infiniband_get_carrier (NM_DEVICE_INFINIBAND (nm_device))) { - state_str = _("Cable unplugged"); } } if (!state_str) @@ -543,94 +533,53 @@ } gchar * -panel_get_ip4_address_as_string (NMIP4Config *ip4_config, const char *what) +panel_get_ip4_address_as_string (NMIPConfig *ip4_config, const char *what) { - const GSList *list; - struct in_addr addr; - gchar *str = NULL; - gchar tmp[INET_ADDRSTRLEN]; - NMIP4Address *address; - - /* get address */ - list = nm_ip4_config_get_addresses (ip4_config); - if (list == NULL) - goto out; + const gchar *str = NULL; /* we only care about one address */ - address = list->data; - if (!strcmp (what, "address")) - addr.s_addr = nm_ip4_address_get_address (address); - else if (!strcmp (what, "gateway")) - addr.s_addr = nm_ip4_address_get_gateway (address); - else if (!strcmp (what, "netmask")) - addr.s_addr = nm_utils_ip4_prefix_to_netmask (nm_ip4_address_get_prefix (address)); - else - goto out; - - if (!inet_ntop (AF_INET, &addr, tmp, sizeof(tmp))) - goto out; - if (g_strcmp0 (tmp, "0.0.0.0") == 0) - goto out; - str = g_strdup (tmp); + if (!strcmp (what, "address")) { + GPtrArray *array; + NMIPAddress *address; + + array = nm_ip_config_get_addresses (ip4_config); + if (array->len < 1) + goto out; + address = array->pdata[0]; + str = nm_ip_address_get_address (address); + } else if (!strcmp (what, "gateway")) { + str = nm_ip_config_get_gateway (ip4_config); + } + out: - return str; + return g_strdup (str); } gchar * -panel_get_ip4_dns_as_string (NMIP4Config *ip4_config) +panel_get_ip4_dns_as_string (NMIPConfig *ip4_config) { - const GArray *array; - GString *dns; - struct in_addr addr; - gchar tmp[INET_ADDRSTRLEN]; - int i; - gchar *str = NULL; - - array = nm_ip4_config_get_nameservers (ip4_config); - if (array == NULL || array->len == 0) - goto out; - - dns = g_string_new (NULL); - for (i = 0; i < array->len; i++) { - addr.s_addr = g_array_index (array, guint32, i); - if (inet_ntop (AF_INET, &addr, tmp, sizeof(tmp))) - g_string_append_printf (dns, "%s ", tmp); - } - str = g_string_free (dns, FALSE); -out: - return str; + return g_strjoinv (" ", + (char **) nm_ip_config_get_nameservers (ip4_config)); } gchar * -panel_get_ip6_address_as_string (NMIP6Config *ip6_config) +panel_get_ip6_address_as_string (NMIPConfig *ip6_config) { - const GSList *list; - const struct in6_addr *addr; - gchar *str = NULL; - gchar tmp[INET6_ADDRSTRLEN]; - NMIP6Address *address; - - /* get address */ - list = nm_ip6_config_get_addresses (ip6_config); - if (list == NULL) - goto out; + GPtrArray *array; + NMIPAddress *address; - /* we only care about one address */ - address = list->data; - addr = nm_ip6_address_get_address (address); - if (addr == NULL) - goto out; - inet_ntop (AF_INET6, addr, tmp, sizeof(tmp)); - str = g_strdup (tmp); -out: - return str; + array = nm_ip_config_get_addresses (ip6_config); + if (array->len < 1) + return NULL; + address = array->pdata[0]; + return g_strdup (nm_ip_address_get_address (address)); } void panel_set_device_widgets (GtkBuilder *builder, NMDevice *device) { - NMIP4Config *ip4_config = NULL; - NMIP6Config *ip6_config = NULL; + NMIPConfig *ip4_config = NULL; + NMIPConfig *ip6_config = NULL; gboolean has_ip4; gboolean has_ip6; gchar *str_tmp; diff -Nru gnome-control-center-3.20.2/panels/network/panel-common.h gnome-control-center-3.22.1/panels/network/panel-common.h --- gnome-control-center-3.20.2/panels/network/panel-common.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/panel-common.h 2016-08-12 12:43:57.000000000 +0000 @@ -24,8 +24,6 @@ #include #include -#include -#include #include G_BEGIN_DECLS @@ -34,7 +32,7 @@ gboolean symbolic); const gchar *panel_device_to_sortable_string (NMDevice *device); const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode); -const gchar *panel_vpn_state_to_localized_string (NMVPNConnectionState type); +const gchar *panel_vpn_state_to_localized_string (NMVpnConnectionState type); void panel_set_device_status (GtkBuilder *builder, const gchar *label_name, NMDevice *nm_device, @@ -48,9 +46,9 @@ void panel_set_device_widgets (GtkBuilder *builder, NMDevice *device); void panel_unset_device_widgets (GtkBuilder *builder); -gchar *panel_get_ip4_address_as_string (NMIP4Config *config, const gchar *what); -gchar *panel_get_ip4_dns_as_string (NMIP4Config *config); -gchar *panel_get_ip6_address_as_string (NMIP6Config *config); +gchar *panel_get_ip4_address_as_string (NMIPConfig *config, const gchar *what); +gchar *panel_get_ip4_dns_as_string (NMIPConfig *config); +gchar *panel_get_ip6_address_as_string (NMIPConfig *config); G_END_DECLS diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method.c 2016-08-12 12:43:57.000000000 +0000 @@ -18,34 +18,31 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" -#include -#include -#include #include #include #include #include #include -#include -#include #include "eap-method.h" #include "nm-utils.h" +#include "utils.h" +#include "helpers.h" GType -eap_method_get_g_type (void) +eap_method_get_type (void) { static GType type_id = 0; if (!type_id) { type_id = g_boxed_type_register_static ("CcEAPMethod", - (GBoxedCopyFunc) eap_method_ref, - (GBoxedFreeFunc) eap_method_unref); + (GBoxedCopyFunc) eap_method_ref, + (GBoxedFreeFunc) eap_method_unref); } return type_id; @@ -60,12 +57,17 @@ } gboolean -eap_method_validate (EAPMethod *method) +eap_method_validate (EAPMethod *method, GError **error) { + gboolean result; + g_return_val_if_fail (method != NULL, FALSE); g_assert (method->validate); - return (*(method->validate)) (method); + result = (*(method->validate)) (method, error); + if (!result && error && !*error) + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("undefined error in 802.1x security (wpa-eap)")); + return result; } void @@ -79,13 +81,15 @@ } void -eap_method_fill_connection (EAPMethod *method, NMConnection *connection) +eap_method_fill_connection (EAPMethod *method, + NMConnection *connection, + NMSettingSecretFlags flags) { g_return_if_fail (method != NULL); g_return_if_fail (connection != NULL); g_assert (method->fill_connection); - return (*(method->fill_connection)) (method, connection); + return (*(method->fill_connection)) (method, connection, flags); } void @@ -98,197 +102,6 @@ method->update_secrets (method, connection); } -typedef struct { - EAPMethod *method; - NMConnection *connection; -} NagDialogResponseInfo; - -static void -nag_dialog_destroyed (gpointer data, GObject *dialog_ptr) -{ - NagDialogResponseInfo *info = (NagDialogResponseInfo *) data; - - memset (info, '\0', sizeof (NagDialogResponseInfo)); - g_free (info); -} - -static GSettings * -_get_ca_ignore_settings (const char *uuid) -{ - GSettings *settings; - char *path = NULL; - - path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); - settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); - g_free (path); - - return settings; -} - -static void -_set_ignore_ca_cert (const char *uuid, gboolean phase2, gboolean ignore) -{ - GSettings *settings; - const char *key; - - g_return_if_fail (uuid != NULL); - - settings = _get_ca_ignore_settings (uuid); - key = phase2 ? "ignore-phase2-ca-cert" : "ignore-ca-cert"; - g_settings_set_boolean (settings, key, ignore); - g_object_unref (settings); -} - -static void -nag_dialog_response_cb (GtkDialog *nag_dialog, - gint response, - gpointer user_data) -{ - NagDialogResponseInfo *info = (NagDialogResponseInfo *) user_data; - EAPMethod *method = (EAPMethod *) info->method; - NMConnection *connection = (NMConnection *) info->connection; - GtkWidget *widget; - - if (response == GTK_RESPONSE_NO) { - /* Grab the value of the "don't bother me" checkbox */ - widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_checkbox")); - g_assert (widget); - - method->ignore_ca_cert = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - /* And save it */ - _set_ignore_ca_cert (nm_connection_get_uuid (connection), - method->phase2, - method->ignore_ca_cert); - } - - gtk_widget_hide (GTK_WIDGET (nag_dialog)); -} - -static gboolean -nag_dialog_delete_event_cb (GtkDialog *nag_dialog, GdkEvent *e, gpointer user_data) -{ - // FIXME?: By emitting response signal, dismissing nag dialog with upper right "x" icon, - // Alt-F4, or Esc would have the same behaviour as clicking "Ignore" button. - //g_signal_emit_by_name (nag_dialog, "response", GTK_RESPONSE_NO, user_data); - return TRUE; /* do not destroy */ -} - -GtkWidget * -eap_method_nag_user (EAPMethod *method) -{ - GtkWidget *widget; - char *filename = NULL; - - g_return_val_if_fail (method != NULL, NULL); - - if (!method->nag_dialog || method->ignore_ca_cert) - return NULL; - - /* Checkbox should be unchecked each time dialog comes up */ - widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_checkbox")); - g_assert (widget); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - - /* Nag the user if the CA Cert is blank, since it's a security risk. */ - widget = GTK_WIDGET (gtk_builder_get_object (method->builder, method->ca_cert_chooser)); - g_assert (widget); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - if (filename != NULL) { - g_free (filename); - return NULL; - } - - gtk_window_present (GTK_WINDOW (method->nag_dialog)); - return method->nag_dialog; -} - -#define NAG_DIALOG_UI "/org/gnome/control-center/network/nag-user-dialog.ui" - -static gboolean -_get_ignore_ca_cert (const char *uuid, gboolean phase2) -{ - GSettings *settings; - const char *key; - gboolean ignore = FALSE; - - g_return_val_if_fail (uuid != NULL, FALSE); - - settings = _get_ca_ignore_settings (uuid); - - key = phase2 ? "ignore-phase2-ca-cert" : "ignore-ca-cert"; - ignore = g_settings_get_boolean (settings, key); - - g_object_unref (settings); - return ignore; -} - -gboolean -eap_method_nag_init (EAPMethod *method, - const char *ca_cert_chooser, - NMConnection *connection) -{ - GtkWidget *dialog, *widget; - NagDialogResponseInfo *info; - GError *error = NULL; - char *text; - - g_return_val_if_fail (method != NULL, FALSE); - g_return_val_if_fail (ca_cert_chooser != NULL, FALSE); - - method->nag_builder = gtk_builder_new (); - if (!gtk_builder_add_from_resource (method->nag_builder, NAG_DIALOG_UI, &error)) { - g_warning ("Couldn't load UI builder file " NAG_DIALOG_UI ": %s", - error->message); - g_error_free (error); - return FALSE; - } - - method->ca_cert_chooser = g_strdup (ca_cert_chooser); - if (connection) { - NMSettingConnection *s_con; - const char *uuid; - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - uuid = nm_setting_connection_get_uuid (s_con); - g_assert (uuid); - - /* Figure out if the user wants to ignore missing CA cert */ - method->ignore_ca_cert = _get_ignore_ca_cert (uuid, method->phase2); - } - - info = g_malloc0 (sizeof (NagDialogResponseInfo)); - info->method = method; - info->connection = connection; - - dialog = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "nag_user_dialog")); - g_assert (dialog); - g_signal_connect (dialog, "response", G_CALLBACK (nag_dialog_response_cb), info); - g_signal_connect (dialog, "delete-event", G_CALLBACK (nag_dialog_delete_event_cb), info); - g_object_weak_ref (G_OBJECT (dialog), nag_dialog_destroyed, info); - - widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "content_label")); - g_assert (widget); - - text = g_strdup_printf ("%s\n\n%s", - _("No Certificate Authority certificate chosen"), - _("Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate Authority certificate?")); - gtk_label_set_markup (GTK_LABEL (widget), text); - g_free (text); - - widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "ignore_button")); - gtk_button_set_label (GTK_BUTTON (widget), _("Ignore")); - g_assert (widget); - - widget = GTK_WIDGET (gtk_builder_get_object (method->nag_builder, "change_button")); - gtk_button_set_label (GTK_BUTTON (widget), _("Choose CA Certificate")); - g_assert (widget); - - method->nag_dialog = dialog; - return TRUE; -} - void eap_method_phase2_update_secrets_helper (EAPMethod *method, NMConnection *connection, @@ -349,7 +162,6 @@ method->add_to_size_group = add_to_size_group; method->fill_connection = fill_connection; method->update_secrets = update_secrets; - method->destroy = destroy; method->default_field = default_field; method->phase2 = phase2; @@ -370,6 +182,8 @@ } g_object_ref_sink (method->ui_widget); + method->destroy = destroy; + return method; } @@ -395,11 +209,6 @@ if (method->destroy) method->destroy (method); - if (method->nag_dialog) - gtk_widget_destroy (method->nag_dialog); - if (method->nag_builder) - g_object_unref (method->nag_builder); - g_free (method->ca_cert_chooser); if (method->builder) g_object_unref (method->builder); if (method->ui_widget) @@ -414,50 +223,46 @@ const char *name, guint32 item_type, const char *password, - NMSetting8021xCKFormat *out_format) + NMSetting8021xCKFormat *out_format, + GError **error) { GtkWidget *widget; char *filename; NMSetting8021x *setting; - gboolean success = FALSE; - GError *error = NULL; + gboolean success = TRUE; if (item_type == TYPE_PRIVATE_KEY) { - g_return_val_if_fail (password != NULL, FALSE); - g_return_val_if_fail (strlen (password), FALSE); + if (!password || *password == '\0') + success = FALSE; } widget = GTK_WIDGET (gtk_builder_get_object (builder, name)); g_assert (widget); filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); - if (!filename) - return (item_type == TYPE_CA_CERT) ? TRUE : FALSE; + if (!filename) { + if (item_type != TYPE_CA_CERT) { + success = FALSE; + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("no file selected")); + } + goto out; + } - if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { + success = FALSE; goto out; + } setting = (NMSetting8021x *) nm_setting_802_1x_new (); + success = FALSE; if (item_type == TYPE_PRIVATE_KEY) { - if (!nm_setting_802_1x_set_private_key (setting, filename, password, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, &error)) { - g_warning ("Error: couldn't verify private key: %d %s", - error ? error->code : -1, error ? error->message : "(none)"); - g_clear_error (&error); - } else + if (nm_setting_802_1x_set_private_key (setting, filename, password, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, error)) success = TRUE; } else if (item_type == TYPE_CLIENT_CERT) { - if (!nm_setting_802_1x_set_client_cert (setting, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, &error)) { - g_warning ("Error: couldn't verify client certificate: %d %s", - error ? error->code : -1, error ? error->message : "(none)"); - g_clear_error (&error); - } else + if (nm_setting_802_1x_set_client_cert (setting, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, error)) success = TRUE; } else if (item_type == TYPE_CA_CERT) { - if (!nm_setting_802_1x_set_ca_cert (setting, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, &error)) { - g_warning ("Error: couldn't verify CA certificate: %d %s", - error ? error->code : -1, error ? error->message : "(none)"); - g_clear_error (&error); - } else + if (nm_setting_802_1x_set_ca_cert (setting, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, out_format, error)) success = TRUE; } else g_warning ("%s: invalid item type %d.", __func__, item_type); @@ -466,9 +271,18 @@ out: g_free (filename); + + if (!success && error && !*error) + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("unspecified error validating eap-method file")); + + if (success) + widget_unset_error (widget); + else + widget_set_error (widget); return success; } +#ifdef LIBNM_GLIB_BUILD static const char * find_tag (const char *tag, const char *buf, gsize len) { @@ -596,23 +410,35 @@ close (fd); return success; } +#endif static gboolean default_filter_privkey (const GtkFileFilterInfo *filter_info, gpointer user_data) { - const char *extensions[] = { ".der", ".pem", ".p12", NULL }; +#ifdef LIBNM_GLIB_BUILD + const char *extensions[] = { ".der", ".pem", ".p12", ".key", NULL }; +#endif gboolean require_encrypted = !!user_data; - gboolean is_encrypted = TRUE; + gboolean is_encrypted; if (!filter_info->filename) return FALSE; +#if defined (LIBNM_GLIB_BUILD) if (!file_has_extension (filter_info->filename, extensions)) return FALSE; + is_encrypted = TRUE; if ( !file_is_der_or_pem (filter_info->filename, TRUE, &is_encrypted) && !nm_utils_file_is_pkcs12 (filter_info->filename)) return FALSE; +#elif defined (LIBNM_BUILD) + is_encrypted = FALSE; + if (!nm_utils_file_is_private_key (filter_info->filename, &is_encrypted)) + return FALSE; +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif return require_encrypted ? is_encrypted : TRUE; } @@ -620,16 +446,25 @@ static gboolean default_filter_cert (const GtkFileFilterInfo *filter_info, gpointer user_data) { +#ifdef LIBNM_GLIB_BUILD const char *extensions[] = { ".der", ".pem", ".crt", ".cer", NULL }; +#endif if (!filter_info->filename) return FALSE; +#if defined (LIBNM_GLIB_BUILD) if (!file_has_extension (filter_info->filename, extensions)) return FALSE; if (!file_is_der_or_pem (filter_info->filename, FALSE, NULL)) return FALSE; +#elif defined (LIBNM_BUILD) + if (!nm_utils_file_is_certificate (filter_info->filename)) + return FALSE; +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif return TRUE; } @@ -642,7 +477,7 @@ filter = gtk_file_filter_new (); if (privkey) { gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, default_filter_privkey, NULL, NULL); - gtk_file_filter_set_name (filter, _("DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)")); + gtk_file_filter_set_name (filter, _("DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)")); } else { gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME, default_filter_cert, NULL, NULL); gtk_file_filter_set_name (filter, _("DER or PEM certificates (*.der, *.pem, *.crt, *.cer)")); @@ -658,3 +493,211 @@ return default_filter_privkey (&info, (gpointer) TRUE); } +/* Some methods (PEAP, TLS, TTLS) require a CA certificate. The user can choose + * not to provide such a certificate. This method whether the checkbox + * id_ca_cert_not_required_checkbutton is checked or id_ca_cert_chooser has a certificate + * selected. + */ +gboolean +eap_method_ca_cert_required (GtkBuilder *builder, const char *id_ca_cert_not_required_checkbutton, const char *id_ca_cert_chooser) +{ + char *filename; + GtkWidget *widget; + + g_assert (builder && id_ca_cert_not_required_checkbutton && id_ca_cert_chooser); + + widget = GTK_WIDGET (gtk_builder_get_object (builder, id_ca_cert_not_required_checkbutton)); + g_assert (widget && GTK_IS_TOGGLE_BUTTON (widget)); + + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { + widget = GTK_WIDGET (gtk_builder_get_object (builder, id_ca_cert_chooser)); + g_assert (widget && GTK_IS_FILE_CHOOSER (widget)); + + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); + if (!filename) + return TRUE; + g_free (filename); + } + return FALSE; +} + + +void +eap_method_ca_cert_not_required_toggled (GtkBuilder *builder, const char *id_ca_cert_not_required_checkbutton, const char *id_ca_cert_chooser) +{ + char *filename, *filename_old; + gboolean is_not_required; + GtkWidget *widget; + + g_assert (builder && id_ca_cert_not_required_checkbutton && id_ca_cert_chooser); + + widget = GTK_WIDGET (gtk_builder_get_object (builder, id_ca_cert_not_required_checkbutton)); + g_assert (widget && GTK_IS_TOGGLE_BUTTON (widget)); + is_not_required = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + + widget = GTK_WIDGET (gtk_builder_get_object (builder, id_ca_cert_chooser)); + g_assert (widget && GTK_IS_FILE_CHOOSER (widget)); + + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); + filename_old = g_object_steal_data (G_OBJECT (widget), "filename-old"); + if (is_not_required) { + g_free (filename_old); + filename_old = filename; + filename = NULL; + } else { + g_free (filename); + filename = filename_old; + filename_old = NULL; + } + gtk_widget_set_sensitive (widget, !is_not_required); + if (filename) + gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename); + else + gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (widget)); + g_free (filename); + g_object_set_data_full (G_OBJECT (widget), "filename-old", filename_old, g_free); +} + +/* Used as both GSettings keys and GObject data tags */ +#define IGNORE_CA_CERT_TAG "ignore-ca-cert" +#define IGNORE_PHASE2_CA_CERT_TAG "ignore-phase2-ca-cert" + +/** + * eap_method_ca_cert_ignore_set: + * @method: the #EAPMethod object + * @connection: the #NMConnection + * @filename: the certificate file, if any + * @ca_cert_error: %TRUE if an error was encountered loading the given CA + * certificate, %FALSE if not or if a CA certificate is not present + * + * Updates the connection's CA cert ignore value to %TRUE if the "CA certificate + * not required" checkbox is checked. If @ca_cert_error is %TRUE, then the + * connection's CA cert ignore value will always be set to %FALSE, because it + * means that the user selected an invalid certificate (thus he does not want to + * ignore the CA cert).. + */ +void +eap_method_ca_cert_ignore_set (EAPMethod *method, + NMConnection *connection, + const char *filename, + gboolean ca_cert_error) +{ + NMSetting8021x *s_8021x; + gboolean ignore; + + s_8021x = nm_connection_get_setting_802_1x (connection); + if (s_8021x) { + ignore = !ca_cert_error && filename == NULL; + g_object_set_data (G_OBJECT (s_8021x), + method->phase2 ? IGNORE_PHASE2_CA_CERT_TAG : IGNORE_CA_CERT_TAG, + GUINT_TO_POINTER (ignore)); + } +} + +/** + * eap_method_ca_cert_ignore_get: + * @method: the #EAPMethod object + * @connection: the #NMConnection + * + * Returns: %TRUE if a missing CA certificate can be ignored, %FALSE if a CA + * certificate should be required for the connection to be valid. + */ +gboolean +eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection) +{ + NMSetting8021x *s_8021x; + + s_8021x = nm_connection_get_setting_802_1x (connection); + if (s_8021x) { + return !!g_object_get_data (G_OBJECT (s_8021x), + method->phase2 ? IGNORE_PHASE2_CA_CERT_TAG : IGNORE_CA_CERT_TAG); + } + return FALSE; +} + +static GSettings * +_get_ca_ignore_settings (NMConnection *connection) +{ + GSettings *settings; + char *path = NULL; + const char *uuid; + + g_return_val_if_fail (connection, NULL); + + uuid = nm_connection_get_uuid (connection); + g_return_val_if_fail (uuid && *uuid, NULL); + + path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid); + settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path); + g_free (path); + + return settings; +} + +/** + * eap_method_ca_cert_ignore_save: + * @connection: the connection for which to save CA cert ignore values to GSettings + * + * Reads the CA cert ignore tags from the 802.1x setting GObject data and saves + * then to GSettings if present, using the connection UUID as the index. + */ +void +eap_method_ca_cert_ignore_save (NMConnection *connection) +{ + NMSetting8021x *s_8021x; + GSettings *settings; + gboolean ignore = FALSE, phase2_ignore = FALSE; + + g_return_if_fail (connection); + + s_8021x = nm_connection_get_setting_802_1x (connection); + if (s_8021x) { + ignore = !!g_object_get_data (G_OBJECT (s_8021x), IGNORE_CA_CERT_TAG); + phase2_ignore = !!g_object_get_data (G_OBJECT (s_8021x), IGNORE_PHASE2_CA_CERT_TAG); + } + + settings = _get_ca_ignore_settings (connection); + if (!settings) + return; + + g_settings_set_boolean (settings, IGNORE_CA_CERT_TAG, ignore); + g_settings_set_boolean (settings, IGNORE_PHASE2_CA_CERT_TAG, phase2_ignore); + g_object_unref (settings); +} + +/** + * eap_method_ca_cert_ignore_load: + * @connection: the connection for which to load CA cert ignore values to GSettings + * + * Reads the CA cert ignore tags from the 802.1x setting GObject data and saves + * then to GSettings if present, using the connection UUID as the index. + */ +void +eap_method_ca_cert_ignore_load (NMConnection *connection) +{ + GSettings *settings; + NMSetting8021x *s_8021x; + gboolean ignore, phase2_ignore; + + g_return_if_fail (connection); + + s_8021x = nm_connection_get_setting_802_1x (connection); + if (!s_8021x) + return; + + settings = _get_ca_ignore_settings (connection); + if (!settings) + return; + + ignore = g_settings_get_boolean (settings, IGNORE_CA_CERT_TAG); + phase2_ignore = g_settings_get_boolean (settings, IGNORE_PHASE2_CA_CERT_TAG); + + g_object_set_data (G_OBJECT (s_8021x), + IGNORE_CA_CERT_TAG, + GUINT_TO_POINTER (ignore)); + g_object_set_data (G_OBJECT (s_8021x), + IGNORE_PHASE2_CA_CERT_TAG, + GUINT_TO_POINTER (phase2_ignore)); + g_object_unref (settings); +} + diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-fast.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-fast.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-fast.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-fast.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,20 +17,17 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2012 Red Hat, Inc. + * Copyright 2012 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" -#include #include #include -#include -#include - #include "eap-method.h" #include "wireless-security.h" +#include "utils.h" #include "helpers.h" #define I_NAME_COLUMN 0 @@ -54,7 +51,7 @@ } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { GtkWidget *widget; GtkTreeModel *model; @@ -62,7 +59,7 @@ EAPMethod *eap = NULL; const char *file; gboolean provisioning; - gboolean ret = TRUE; + gboolean valid = TRUE; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton")); g_assert (widget); @@ -72,10 +69,10 @@ file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); if (!provisioning && !file) { widget_set_error (widget); - ret = FALSE; - } else { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-FAST PAC file")); + valid = FALSE; + } else widget_unset_error (widget); - } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo")); g_assert (widget); @@ -83,14 +80,9 @@ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - if (!eap_method_validate (eap)) { - widget_set_error (widget); - ret = FALSE; - } else { - widget_unset_error (widget); - } + valid = eap_method_validate (eap, valid ? error : NULL) && valid; eap_method_unref (eap); - return ret; + return valid; } static void @@ -134,7 +126,7 @@ } static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags flags) { NMSetting8021x *s_8021x; GtkWidget *widget; @@ -193,7 +185,7 @@ gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - eap_method_fill_connection (eap, connection); + eap_method_fill_connection (eap, connection, flags); eap_method_unref (eap); } @@ -250,8 +242,9 @@ EAPMethodSimple *em_mschap_v2; guint32 active = 0; const char *phase2_auth = NULL; + EAPMethodSimpleFlags simple_flags; - auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_g_type ()); + auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_type ()); if (s_8021x) { if (nm_setting_802_1x_get_phase2_auth (s_8021x)) @@ -260,12 +253,16 @@ phase2_auth = nm_setting_802_1x_get_phase2_autheap (s_8021x); } + simple_flags = EAP_METHOD_SIMPLE_FLAG_PHASE2; + if (method->is_editor) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_IS_EDITOR; + if (secrets_only) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY; + em_gtc = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_GTC, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("GTC"), @@ -280,8 +277,7 @@ em_mschap_v2 = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2, - TRUE, - method->is_editor, secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("MSCHAPv2"), @@ -360,6 +356,7 @@ if (!parent) return NULL; + parent->password_flags_name = NM_SETTING_802_1X_PASSWORD; method = (EAPMethodFAST *) parent; method->sec_parent = ws_parent; method->is_editor = is_editor; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-fast.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-fast.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-fast.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-fast.ui 2016-08-12 12:43:57.000000000 +0000 @@ -1,6 +1,34 @@ + + + + + + + + + + + + + + + + + + + Anonymous + + + Authenticated + + + Both + + + True False @@ -124,11 +152,12 @@ - PAC pro_visioning + Allow automatic PAC pro_visioning True True False True + True 1 @@ -170,32 +199,4 @@ - - - - - - - - - - - - - - - - - - - Anonymous - - - Authenticated - - - Both - - - diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method.h gnome-control-center-3.22.1/panels/network/wireless-security/eap-method.h --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef EAP_METHOD_H @@ -26,16 +26,22 @@ #include #include +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _EAPMethod EAPMethod; typedef void (*EMAddToSizeGroupFunc) (EAPMethod *method, GtkSizeGroup *group); -typedef void (*EMFillConnectionFunc) (EAPMethod *method, NMConnection *connection); +typedef void (*EMFillConnectionFunc) (EAPMethod *method, NMConnection *connection, NMSettingSecretFlags flags); typedef void (*EMUpdateSecretsFunc) (EAPMethod *method, NMConnection *connection); typedef void (*EMDestroyFunc) (EAPMethod *method); -typedef gboolean (*EMValidateFunc) (EAPMethod *method); +typedef gboolean (*EMValidateFunc) (EAPMethod *method, GError **error); struct _EAPMethod { guint32 refcount; @@ -44,14 +50,11 @@ GtkBuilder *builder; GtkWidget *ui_widget; - GtkBuilder *nag_builder; - char *ca_cert_chooser; const char *default_field; - GtkWidget *nag_dialog; + const char *password_flags_name; gboolean phase2; gboolean secrets_only; - gboolean ignore_ca_cert; EMAddToSizeGroupFunc add_to_size_group; EMFillConnectionFunc fill_connection; @@ -65,21 +68,21 @@ GtkWidget *eap_method_get_widget (EAPMethod *method); -gboolean eap_method_validate (EAPMethod *method); +gboolean eap_method_validate (EAPMethod *method, GError **error); void eap_method_add_to_size_group (EAPMethod *method, GtkSizeGroup *group); -void eap_method_fill_connection (EAPMethod *method, NMConnection *connection); +void eap_method_fill_connection (EAPMethod *method, + NMConnection *connection, + NMSettingSecretFlags flags); void eap_method_update_secrets (EAPMethod *method, NMConnection *connection); -GtkWidget * eap_method_nag_user (EAPMethod *method); - EAPMethod *eap_method_ref (EAPMethod *method); void eap_method_unref (EAPMethod *method); -GType eap_method_get_g_type (void); +GType eap_method_get_type (void); /* Below for internal use only */ @@ -113,16 +116,29 @@ const char *name, guint32 item_type, const char *password, - NMSetting8021xCKFormat *out_format); - -gboolean eap_method_nag_init (EAPMethod *method, - const char *ca_cert_chooser, - NMConnection *connection); + NMSetting8021xCKFormat *out_format, + GError **error); void eap_method_phase2_update_secrets_helper (EAPMethod *method, NMConnection *connection, const char *combo_name, guint32 column); +gboolean eap_method_ca_cert_required (GtkBuilder *builder, + const char *id_ca_cert_is_not_required_checkbox, + const char *id_ca_cert_chooser); +void eap_method_ca_cert_not_required_toggled (GtkBuilder *builder, + const char *id_ca_cert_is_not_required_checkbox, + const char *id_ca_cert_chooser); + +void eap_method_ca_cert_ignore_set (EAPMethod *method, + NMConnection *connection, + const char *filename, + gboolean ca_cert_error); +gboolean eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection); + +void eap_method_ca_cert_ignore_save (NMConnection *connection); +void eap_method_ca_cert_ignore_load (NMConnection *connection); + #endif /* EAP_METHOD_H */ diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-leap.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-leap.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-leap.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-leap.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,62 +17,65 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ +#include "nm-default.h" + #include #include -#include #include "eap-method.h" #include "wireless-security.h" #include "helpers.h" +#include "nma-ui-utils.h" +#include "utils.h" struct _EAPMethodLEAP { EAPMethod parent; - gboolean new_connection; + WirelessSecurity *ws_parent; + + gboolean editing_connection; + + GtkEntry *username_entry; + GtkEntry *password_entry; + GtkToggleButton *show_password; }; static void -show_toggled_cb (GtkCheckButton *button, EAPMethod *method) +show_toggled_cb (GtkToggleButton *button, EAPMethodLEAP *method) { - GtkWidget *widget; gboolean visible; - widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "eap_leap_password_entry")); - g_assert (widget); - - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - gtk_entry_set_visibility (GTK_ENTRY (widget), visible); + visible = gtk_toggle_button_get_active (button); + gtk_entry_set_visibility (method->password_entry, visible); } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { - GtkWidget *widget; + EAPMethodLEAP *method = (EAPMethodLEAP *)parent; const char *text; gboolean ret = TRUE; - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_username_entry")); - g_assert (widget); - text = gtk_entry_get_text (GTK_ENTRY (widget)); + text = gtk_entry_get_text (method->username_entry); if (!text || !strlen (text)) { - widget_set_error (widget); + widget_set_error (GTK_WIDGET (method->username_entry)); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-LEAP username")); ret = FALSE; - } else { - widget_unset_error (widget); - } + } else + widget_unset_error (GTK_WIDGET (method->username_entry)); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry")); - g_assert (widget); - text = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!text || *text == '\0') { - widget_set_error (widget); - ret = FALSE; - } else { - widget_unset_error (widget); - } + text = gtk_entry_get_text (method->password_entry); + if (!text || !strlen (text)) { + widget_set_error (GTK_WIDGET (method->password_entry)); + if (ret) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-LEAP password")); + ret = FALSE; + } + } else + widget_unset_error (GTK_WIDGET (method->password_entry)); return ret; } @@ -92,32 +95,33 @@ } static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags flags) { EAPMethodLEAP *method = (EAPMethodLEAP *) parent; NMSetting8021x *s_8021x; - GtkWidget *widget; + NMSettingSecretFlags secret_flags; + GtkWidget *passwd_entry; s_8021x = nm_connection_get_setting_802_1x (connection); g_assert (s_8021x); nm_setting_802_1x_add_eap_method (s_8021x, "leap"); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_username_entry")); - g_assert (widget); - g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL); + g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (method->username_entry), NULL); + g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (method->password_entry), NULL); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry")); - g_assert (widget); - g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (GTK_ENTRY (widget)), NULL); + passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry")); + g_assert (passwd_entry); - /* Default to agent-owned secrets for new connections */ - if (method->new_connection) { - g_object_set (s_8021x, - NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, - NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE, - NULL); - } + /* Save 802.1X password flags to the connection */ + secret_flags = nma_utils_menu_to_secret_flags (passwd_entry); + nm_setting_set_secret_flags (NM_SETTING (s_8021x), parent->password_flags_name, + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ + if (method->editing_connection) + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_8021x), parent->password_flags_name); } static void @@ -130,6 +134,59 @@ (HelperSecretFunc) nm_setting_802_1x_get_password); } +/* Set the UI fields for user, password and show_password to the + * values as provided by method->ws_parent. */ +static void +set_userpass_ui (EAPMethodLEAP *method) +{ + if (method->ws_parent->username) + gtk_entry_set_text (method->username_entry, method->ws_parent->username); + else + gtk_entry_set_text (method->username_entry, ""); + + if (method->ws_parent->password && !method->ws_parent->always_ask) + gtk_entry_set_text (method->password_entry, method->ws_parent->password); + else + gtk_entry_set_text (method->password_entry, ""); + + gtk_toggle_button_set_active (method->show_password, method->ws_parent->show_password); +} + +static void +widgets_realized (GtkWidget *widget, EAPMethodLEAP *method) +{ + set_userpass_ui (method); +} + +static void +widgets_unrealized (GtkWidget *widget, EAPMethodLEAP *method) +{ + wireless_security_set_userpass (method->ws_parent, + gtk_entry_get_text (method->username_entry), + gtk_entry_get_text (method->password_entry), + (gboolean) -1, + gtk_toggle_button_get_active (method->show_password)); +} + +static void +destroy (EAPMethod *parent) +{ + EAPMethodLEAP *method = (EAPMethodLEAP *) parent; + GtkWidget *widget; + + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); + g_assert (widget); + + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + (GCallback) widgets_realized, + method); + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + (GCallback) widgets_unrealized, + method); + + wireless_security_unref (method->ws_parent); +} + EAPMethodLEAP * eap_method_leap_new (WirelessSecurity *ws_parent, NMConnection *connection, @@ -138,13 +195,14 @@ EAPMethodLEAP *method; EAPMethod *parent; GtkWidget *widget; + NMSetting8021x *s_8021x = NULL; parent = eap_method_init (sizeof (EAPMethodLEAP), validate, add_to_size_group, fill_connection, update_secrets, - NULL, + destroy, "/org/gnome/control-center/network/eap-method-leap.ui", "eap_leap_notebook", "eap_leap_username_entry", @@ -152,41 +210,58 @@ if (!parent) return NULL; + parent->password_flags_name = NM_SETTING_802_1X_PASSWORD; method = (EAPMethodLEAP *) parent; - method->new_connection = secrets_only ? FALSE : TRUE; + method->editing_connection = secrets_only ? FALSE : TRUE; + method->ws_parent = wireless_security_ref (ws_parent); + + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_notebook")); + g_assert (widget); + g_signal_connect (G_OBJECT (widget), "realize", + (GCallback) widgets_realized, + method); + g_signal_connect (G_OBJECT (widget), "unrealize", + (GCallback) widgets_unrealized, + method); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_username_entry")); g_assert (widget); + method->username_entry = GTK_ENTRY (widget); g_signal_connect (G_OBJECT (widget), "changed", (GCallback) wireless_security_changed_cb, ws_parent); - if (connection) { - NMSetting8021x *s_8021x; - - s_8021x = nm_connection_get_setting_802_1x (connection); - if (s_8021x && nm_setting_802_1x_get_identity (s_8021x)) - gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x)); - } if (secrets_only) gtk_widget_set_sensitive (widget, FALSE); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry")); g_assert (widget); + method->password_entry = GTK_ENTRY (widget); g_signal_connect (G_OBJECT (widget), "changed", (GCallback) wireless_security_changed_cb, ws_parent); - /* Fill secrets, if any */ + /* Create password-storage popup menu for password entry under entry's secondary icon */ if (connection) - update_secrets (parent, connection); + s_8021x = nm_connection_get_setting_802_1x (connection); + nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name, + FALSE, secrets_only); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapleap")); g_assert (widget); + method->show_password = GTK_TOGGLE_BUTTON (widget); g_signal_connect (G_OBJECT (widget), "toggled", (GCallback) show_toggled_cb, parent); + /* Initialize the UI fields with the security settings from method->ws_parent. + * This will be done again when the widget gets realized. It must be done here as well, + * because the outer dialog will ask to 'validate' the connection before the security tab + * is shown/realized (to enable the 'Apply' button). + * As 'validate' accesses the contents of the UI fields, they must be initialized now, even + * if the widgets are not yet visible. */ + set_userpass_ui (method); + return method; } diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-leap.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-leap.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-leap.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-leap.ui 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ True False + start 3 2 6 @@ -69,7 +70,6 @@ True False True - 0 True diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-peap.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-peap.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-peap.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-peap.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,20 +17,17 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" -#include #include #include -#include -#include - #include "eap-method.h" #include "wireless-security.h" +#include "utils.h" #define I_NAME_COLUMN 0 #define I_METHOD_COLUMN 1 @@ -53,16 +50,24 @@ } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { GtkWidget *widget; GtkTreeModel *model; GtkTreeIter iter; EAPMethod *eap = NULL; gboolean valid = FALSE; + GError *local = NULL; - if (!eap_method_validate_filepicker (parent->builder, "eap_peap_ca_cert_button", TYPE_CA_CERT, NULL, NULL)) + if (!eap_method_validate_filepicker (parent->builder, "eap_peap_ca_cert_button", TYPE_CA_CERT, NULL, NULL, &local)) { + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-PEAP CA certificate: %s"), local->message); + g_clear_error (&local); + return FALSE; + } + if (eap_method_ca_cert_required (parent->builder, "eap_peap_ca_cert_not_required_checkbox", "eap_peap_ca_cert_button")) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-PEAP CA certificate: no certificate specified")); return FALSE; + } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo")); g_assert (widget); @@ -71,12 +76,20 @@ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - valid = eap_method_validate (eap); + valid = eap_method_validate (eap, error); eap_method_unref (eap); return valid; } static void +ca_cert_not_required_toggled (GtkWidget *ignored, gpointer user_data) +{ + EAPMethod *parent = user_data; + + eap_method_ca_cert_not_required_toggled (parent->builder, "eap_peap_ca_cert_not_required_checkbox", "eap_peap_ca_cert_button"); +} + +static void add_to_size_group (EAPMethod *parent, GtkSizeGroup *group) { EAPMethodPEAP *method = (EAPMethodPEAP *) parent; @@ -89,6 +102,10 @@ g_object_unref (method->size_group); method->size_group = g_object_ref (group); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_not_required_checkbox")); + g_assert (widget); + gtk_size_group_add_widget (group, widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_label")); g_assert (widget); gtk_size_group_add_widget (group, widget); @@ -117,7 +134,7 @@ } static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags flags) { NMSetting8021x *s_8021x; NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -129,6 +146,7 @@ GtkTreeIter iter; int peapver_active = 0; GError *error = NULL; + gboolean ca_cert_error = FALSE; s_8021x = nm_connection_get_setting_802_1x (connection); g_assert (s_8021x); @@ -147,7 +165,10 @@ if (!nm_setting_802_1x_set_ca_cert (s_8021x, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { g_warning ("Couldn't read CA certificate '%s': %s", filename, error ? error->message : "(unknown)"); g_clear_error (&error); + ca_cert_error = TRUE; } + eap_method_ca_cert_ignore_set (parent, connection, filename, ca_cert_error); + g_free (filename); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_combo")); peapver_active = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); @@ -169,7 +190,7 @@ gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - eap_method_fill_connection (eap, connection); + eap_method_fill_connection (eap, connection, flags); eap_method_unref (eap); } static void @@ -225,8 +246,9 @@ EAPMethodSimple *em_gtc; guint32 active = 0; const char *phase2_auth = NULL; + EAPMethodSimpleFlags simple_flags; - auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_g_type ()); + auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_type ()); if (s_8021x) { if (nm_setting_802_1x_get_phase2_auth (s_8021x)) @@ -235,12 +257,16 @@ phase2_auth = nm_setting_802_1x_get_phase2_autheap (s_8021x); } + simple_flags = EAP_METHOD_SIMPLE_FLAG_PHASE2; + if (method->is_editor) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_IS_EDITOR; + if (secrets_only) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY; + em_mschap_v2 = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("MSCHAPv2"), @@ -255,9 +281,7 @@ em_md5 = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_MD5, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("MD5"), @@ -272,9 +296,7 @@ em_gtc = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_GTC, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("GTC"), @@ -316,7 +338,7 @@ { EAPMethod *parent; EAPMethodPEAP *method; - GtkWidget *widget; + GtkWidget *widget, *widget_ca_not_required_checkbox; GtkFileFilter *filter; NMSetting8021x *s_8021x = NULL; const char *filename; @@ -334,8 +356,7 @@ if (!parent) return NULL; - eap_method_nag_init (parent, "eap_peap_ca_cert_button", connection); - + parent->password_flags_name = NM_SETTING_802_1X_PASSWORD; method = (EAPMethodPEAP *) parent; method->sec_parent = ws_parent; method->is_editor = is_editor; @@ -343,6 +364,16 @@ if (connection) s_8021x = nm_connection_get_setting_802_1x (connection); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_not_required_checkbox")); + g_assert (widget); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) ca_cert_not_required_toggled, + parent); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) wireless_security_changed_cb, + ws_parent); + widget_ca_not_required_checkbox = widget; + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button")); g_assert (widget); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); @@ -354,11 +385,14 @@ filter = eap_method_default_file_chooser_filter_new (FALSE); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); if (connection && s_8021x) { + filename = NULL; if (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH) { filename = nm_setting_802_1x_get_ca_cert_path (s_8021x); if (filename) gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename); } + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget_ca_not_required_checkbox), + !filename && eap_method_ca_cert_ignore_get (parent, connection)); } widget = inner_auth_combo_init (method, connection, s_8021x, secrets_only); @@ -399,6 +433,8 @@ gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button")); gtk_widget_hide (widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_not_required_checkbox")); + gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_label")); gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo")); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-peap.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-peap.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-peap.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-peap.ui 2016-08-12 12:43:57.000000000 +0000 @@ -99,6 +99,24 @@ + + No CA certificate is _required + True + True + False + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + True False @@ -108,8 +126,8 @@ 2 - 4 - 5 + 5 + 6 GTK_FILL @@ -123,8 +141,8 @@ eap_peap_inner_auth_combo - 3 - 4 + 4 + 5 GTK_FILL @@ -144,8 +162,8 @@ 1 2 - 3 - 4 + 4 + 5 GTK_FILL GTK_FILL @@ -160,8 +178,8 @@ eap_peap_version_combo - 2 - 3 + 3 + 4 GTK_FILL @@ -181,8 +199,8 @@ 1 2 - 2 - 3 + 3 + 4 GTK_FILL GTK_FILL diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,72 +17,78 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2011 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ +#include "nm-default.h" + #include #include -#include -#include #include "eap-method.h" #include "wireless-security.h" #include "helpers.h" +#include "nma-ui-utils.h" +#include "utils.h" struct _EAPMethodSimple { EAPMethod parent; + WirelessSecurity *ws_parent; + EAPMethodSimpleType type; - gboolean is_editor; - gboolean new_connection; + EAPMethodSimpleFlags flags; + + GtkEntry *username_entry; + GtkEntry *password_entry; + GtkToggleButton *show_password; + guint idle_func_id; }; static void -show_toggled_cb (GtkCheckButton *button, EAPMethod *method) +show_toggled_cb (GtkToggleButton *button, EAPMethodSimple *method) { - GtkWidget *widget; gboolean visible; - widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "eap_simple_password_entry")); - g_assert (widget); + visible = gtk_toggle_button_get_active (button); + gtk_entry_set_visibility (method->password_entry, visible); +} - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - gtk_entry_set_visibility (GTK_ENTRY (widget), visible); +static gboolean +always_ask_selected (GtkEntry *passwd_entry) +{ + return !!( nma_utils_menu_to_secret_flags (GTK_WIDGET (passwd_entry)) + & NM_SETTING_SECRET_FLAG_NOT_SAVED); } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { - GtkWidget *widget; + EAPMethodSimple *method = (EAPMethodSimple *)parent; const char *text; gboolean ret = TRUE; - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_username_entry")); - g_assert (widget); - text = gtk_entry_get_text (GTK_ENTRY (widget)); + text = gtk_entry_get_text (method->username_entry); if (!text || !strlen (text)) { - widget_set_error (widget); + widget_set_error (GTK_WIDGET (method->username_entry)); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP username")); ret = FALSE; - } else { - widget_unset_error (widget); - } + } else + widget_unset_error (GTK_WIDGET (method->username_entry)); /* Check if the password should always be requested */ - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_password_always_ask")); - g_assert (widget); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { - widget_unset_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry"))); - return ret; - } - - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); - g_assert (widget); - text = gtk_entry_get_text (GTK_ENTRY (widget)); - if (!text || !strlen (text)) { - widget_set_error (widget); - ret = FALSE; - } else { - widget_unset_error (widget); + if (always_ask_selected (method->password_entry)) + widget_unset_error (GTK_WIDGET (method->password_entry)); + else { + text = gtk_entry_get_text (method->password_entry); + if (!text || !strlen (text)) { + widget_set_error (GTK_WIDGET (method->password_entry)); + if (ret) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP password")); + ret = FALSE; + } + } else + widget_unset_error (GTK_WIDGET (method->password_entry)); } return ret; @@ -102,15 +108,30 @@ gtk_size_group_add_widget (group, widget); } +typedef struct { + const char *name; + gboolean autheap_allowed; +} EapType; + +/* Indexed by EAP_METHOD_SIMPLE_TYPE_* */ +static const EapType eap_table[EAP_METHOD_SIMPLE_TYPE_LAST] = { + [EAP_METHOD_SIMPLE_TYPE_PAP] = { "pap", FALSE }, + [EAP_METHOD_SIMPLE_TYPE_MSCHAP] = { "mschap", FALSE }, + [EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2] = { "mschapv2", TRUE }, + [EAP_METHOD_SIMPLE_TYPE_MD5] = { "md5", TRUE }, + [EAP_METHOD_SIMPLE_TYPE_PWD] = { "pwd", TRUE }, + [EAP_METHOD_SIMPLE_TYPE_CHAP] = { "chap", FALSE }, + [EAP_METHOD_SIMPLE_TYPE_GTC] = { "gtc", TRUE }, +}; + static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags prev_flags) { EAPMethodSimple *method = (EAPMethodSimple *) parent; NMSetting8021x *s_8021x; - GtkWidget *widget; gboolean not_saved = FALSE; - const char *eap = NULL; - NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE; + NMSettingSecretFlags flags; + const EapType *eap_type; s_8021x = nm_connection_get_setting_802_1x (connection); g_assert (s_8021x); @@ -121,48 +142,28 @@ if (parent->phase2 == FALSE) nm_setting_802_1x_clear_eap_methods (s_8021x); - switch (method->type) { - case EAP_METHOD_SIMPLE_TYPE_PAP: - eap = "pap"; - break; - case EAP_METHOD_SIMPLE_TYPE_MSCHAP: - eap = "mschap"; - break; - case EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2: - eap = "mschapv2"; - break; - case EAP_METHOD_SIMPLE_TYPE_MD5: - eap = "md5"; - break; - case EAP_METHOD_SIMPLE_TYPE_CHAP: - eap = "chap"; - break; - case EAP_METHOD_SIMPLE_TYPE_GTC: - eap = "gtc"; - break; - default: - g_assert_not_reached (); - break; - } - - if (parent->phase2) - g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, eap, NULL); - else - nm_setting_802_1x_add_eap_method (s_8021x, eap); + eap_type = &eap_table[method->type]; + if (parent->phase2) { + /* If the outer EAP method (TLS, TTLS, PEAP, etc) allows inner/phase2 + * EAP methods (which only TTLS allows) *and* the inner/phase2 method + * supports being an inner EAP method, then set PHASE2_AUTHEAP. + * Otherwise the inner/phase2 method goes into PHASE2_AUTH. + */ + if ((method->flags & EAP_METHOD_SIMPLE_FLAG_AUTHEAP_ALLOWED) && eap_type->autheap_allowed) { + g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTHEAP, eap_type->name, NULL); + g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, NULL, NULL); + } else { + g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTH, eap_type->name, NULL); + g_object_set (s_8021x, NM_SETTING_802_1X_PHASE2_AUTHEAP, NULL, NULL); + } + } else + nm_setting_802_1x_add_eap_method (s_8021x, eap_type->name); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_username_entry")); - g_assert (widget); - g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL); + g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (method->username_entry), NULL); /* Save the password always ask setting */ - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_password_always_ask")); - g_assert (widget); - not_saved = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - - nm_setting_get_secret_flags (NM_SETTING (s_8021x), NM_SETTING_802_1X_PASSWORD, &flags, NULL); - flags &= ~(NM_SETTING_SECRET_FLAG_NOT_SAVED); - if (not_saved) - flags |= NM_SETTING_SECRET_FLAG_NOT_SAVED; + not_saved = always_ask_selected (method->password_entry); + flags = nma_utils_menu_to_secret_flags (GTK_WIDGET (method->password_entry)); nm_setting_set_secret_flags (NM_SETTING (s_8021x), NM_SETTING_802_1X_PASSWORD, flags, NULL); /* Fill the connection's password if we're in the applet so that it'll get @@ -170,18 +171,16 @@ * back to NM in response to a GetSecrets() call, we don't save it if the * user checked "Always Ask". */ - if (method->is_editor == FALSE || not_saved == FALSE) { - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); - g_assert (widget); - g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (GTK_ENTRY (widget)), NULL); - } + if (!(method->flags & EAP_METHOD_SIMPLE_FLAG_IS_EDITOR) || not_saved == FALSE) + g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (method->password_entry), NULL); - /* Default to agent-owned secrets for new connections */ - if (method->new_connection && (not_saved == FALSE)) { - g_object_set (s_8021x, - NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, - NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE, - NULL); + /* Update secret flags and popup when editing the connection */ + if (!(method->flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY)) { + GtkWidget *passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); + g_assert (passwd_entry); + + nma_utils_update_password_storage (passwd_entry, flags, + NM_SETTING (s_8021x), parent->password_flags_name); } } @@ -195,43 +194,110 @@ (HelperSecretFunc) nm_setting_802_1x_get_password); } +static gboolean +stuff_changed (EAPMethodSimple *method) +{ + wireless_security_changed_cb (NULL, method->ws_parent); + method->idle_func_id = 0; + return FALSE; +} + static void -password_always_ask_changed (GtkButton *button, EAPMethodSimple *method) +password_storage_changed (GObject *entry, + GParamSpec *pspec, + EAPMethodSimple *method) { - EAPMethod *parent = (EAPMethod *) method; - GtkWidget *password_entry; - GtkWidget *show_checkbox; gboolean always_ask; + gboolean secrets_only = method->flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY; + + always_ask = always_ask_selected (method->password_entry); + + if (always_ask && !secrets_only) { + /* we always clear this button and do not restore it + * (because we want to hide the password). */ + gtk_toggle_button_set_active (method->show_password, FALSE); + } + + gtk_widget_set_sensitive (GTK_WIDGET (method->show_password), + !always_ask || secrets_only); + + if (!method->idle_func_id) + method->idle_func_id = g_idle_add ((GSourceFunc) stuff_changed, method); +} + +/* Set the UI fields for user, password, always_ask and show_password to the + * values as provided by method->ws_parent. */ +static void +set_userpass_ui (EAPMethodSimple *method) +{ + if (method->ws_parent->username) + gtk_entry_set_text (method->username_entry, method->ws_parent->username); + else + gtk_entry_set_text (method->username_entry, ""); + + if (method->ws_parent->password && !method->ws_parent->always_ask) + gtk_entry_set_text (method->password_entry, method->ws_parent->password); + else + gtk_entry_set_text (method->password_entry, ""); + + gtk_toggle_button_set_active (method->show_password, method->ws_parent->show_password); + password_storage_changed (NULL, NULL, method); +} + +static void +widgets_realized (GtkWidget *widget, EAPMethodSimple *method) +{ + set_userpass_ui (method); +} - always_ask = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); +static void +widgets_unrealized (GtkWidget *widget, EAPMethodSimple *method) +{ + wireless_security_set_userpass (method->ws_parent, + gtk_entry_get_text (method->username_entry), + gtk_entry_get_text (method->password_entry), + always_ask_selected (method->password_entry), + gtk_toggle_button_get_active (method->show_password)); +} - password_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); - g_assert (password_entry); +static void +destroy (EAPMethod *parent) +{ + EAPMethodSimple *method = (EAPMethodSimple *) parent; + GtkWidget *widget; + + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); + g_assert (widget); - show_checkbox = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple")); - g_assert (show_checkbox); + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + (GCallback) widgets_realized, + method); + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + (GCallback) widgets_unrealized, + method); - if (always_ask) { - gtk_entry_set_text (GTK_ENTRY (password_entry), ""); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (show_checkbox), FALSE); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); + g_assert (widget); + g_signal_handlers_disconnect_by_func (G_OBJECT (widget), + (GCallback) password_storage_changed, + method); + if (method->idle_func_id > 0) { + g_source_remove (method->idle_func_id); + method->idle_func_id = 0; } - gtk_widget_set_sensitive (password_entry, !always_ask); - gtk_widget_set_sensitive (show_checkbox, !always_ask); + wireless_security_unref (method->ws_parent); } EAPMethodSimple * eap_method_simple_new (WirelessSecurity *ws_parent, NMConnection *connection, EAPMethodSimpleType type, - gboolean phase2, - gboolean is_editor, - gboolean secrets_only) + EAPMethodSimpleFlags flags) { EAPMethod *parent; EAPMethodSimple *method; GtkWidget *widget; - gboolean not_saved = FALSE; NMSetting8021x *s_8021x = NULL; parent = eap_method_init (sizeof (EAPMethodSimple), @@ -239,78 +305,72 @@ add_to_size_group, fill_connection, update_secrets, - NULL, + destroy, "/org/gnome/control-center/network/eap-method-simple.ui", "eap_simple_notebook", "eap_simple_username_entry", - phase2); + flags & EAP_METHOD_SIMPLE_FLAG_PHASE2); if (!parent) return NULL; + parent->password_flags_name = NM_SETTING_802_1X_PASSWORD; method = (EAPMethodSimple *) parent; + method->ws_parent = wireless_security_ref (ws_parent); + method->flags = flags; method->type = type; - method->is_editor = is_editor; - method->new_connection = secrets_only ? FALSE : TRUE; + g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST); + + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_notebook")); + g_assert (widget); + g_signal_connect (G_OBJECT (widget), "realize", + (GCallback) widgets_realized, + method); + g_signal_connect (G_OBJECT (widget), "unrealize", + (GCallback) widgets_unrealized, + method); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_username_entry")); g_assert (widget); + method->username_entry = GTK_ENTRY (widget); g_signal_connect (G_OBJECT (widget), "changed", (GCallback) wireless_security_changed_cb, ws_parent); - if (connection) { - s_8021x = nm_connection_get_setting_802_1x (connection); - if (s_8021x && nm_setting_802_1x_get_identity (s_8021x)) - gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x)); - } - if (secrets_only) + if (method->flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY) gtk_widget_set_sensitive (widget, FALSE); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry")); g_assert (widget); + method->password_entry = GTK_ENTRY (widget); g_signal_connect (G_OBJECT (widget), "changed", (GCallback) wireless_security_changed_cb, ws_parent); - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_password_always_ask")); - g_assert (widget); - g_signal_connect (G_OBJECT (widget), "toggled", - (GCallback) wireless_security_changed_cb, - ws_parent); - if (is_editor) { - /* We only desensitize the password entry from the editor, because - * from nm-applet if the entry was desensitized, there'd be no way to - * get the password back to NetworkManager when NM asked for it. Since - * the editor only sets up the initial connection though, it's safe to - * do there. - */ - g_signal_connect (G_OBJECT (widget), "toggled", - G_CALLBACK (password_always_ask_changed), - method); - } - - if (secrets_only) - gtk_widget_hide (widget); - - if (s_8021x) { - NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE; - - nm_setting_get_secret_flags (NM_SETTING (s_8021x), NM_SETTING_802_1X_PASSWORD, &flags, NULL); - not_saved = (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED); - } - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), not_saved); + /* Create password-storage popup menu for password entry under entry's secondary icon */ + if (connection) + s_8021x = nm_connection_get_setting_802_1x (connection); + nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name, + FALSE, flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY); - /* Fill secrets if there's a static (ie, not OTP) password */ - if (connection && (not_saved == FALSE)) - update_secrets (EAP_METHOD (method), connection); + g_signal_connect (method->password_entry, "notify::secondary-icon-name", + G_CALLBACK (password_storage_changed), + method); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple")); g_assert (widget); + method->show_password = GTK_TOGGLE_BUTTON (widget); g_signal_connect (G_OBJECT (widget), "toggled", (GCallback) show_toggled_cb, method); + /* Initialize the UI fields with the security settings from method->ws_parent. + * This will be done again when the widget gets realized. It must be done here as well, + * because the outer dialog will ask to 'validate' the connection before the security tab + * is shown/realized (to enable the 'Apply' button). + * As 'validate' accesses the contents of the UI fields, they must be initialized now, even + * if the widgets are not yet visible. */ + set_userpass_ui (method); + return method; } diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.h gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.h --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.h 2016-08-12 12:43:57.000000000 +0000 @@ -26,22 +26,37 @@ #include "wireless-security.h" typedef enum { + /* NOTE: when updating this table, also update eap_methods[] */ EAP_METHOD_SIMPLE_TYPE_PAP = 0, EAP_METHOD_SIMPLE_TYPE_MSCHAP, EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2, EAP_METHOD_SIMPLE_TYPE_MD5, + EAP_METHOD_SIMPLE_TYPE_PWD, EAP_METHOD_SIMPLE_TYPE_CHAP, - EAP_METHOD_SIMPLE_TYPE_GTC + EAP_METHOD_SIMPLE_TYPE_GTC, + + /* Boundary value, do not use */ + EAP_METHOD_SIMPLE_TYPE_LAST } EAPMethodSimpleType; +typedef enum { + EAP_METHOD_SIMPLE_FLAG_NONE = 0x00, + /* Indicates the EAP method is an inner/phase2 method */ + EAP_METHOD_SIMPLE_FLAG_PHASE2 = 0x01, + /* Set by TTLS to indicate that inner/phase2 EAP is allowed */ + EAP_METHOD_SIMPLE_FLAG_AUTHEAP_ALLOWED = 0x02, + /* Set from nm-connection-editor or the GNOME network panel */ + EAP_METHOD_SIMPLE_FLAG_IS_EDITOR = 0x04, + /* Set to indicate that this request is only for secrets */ + EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY = 0x08 +} EAPMethodSimpleFlags; + typedef struct _EAPMethodSimple EAPMethodSimple; EAPMethodSimple *eap_method_simple_new (WirelessSecurity *ws_parent, NMConnection *connection, EAPMethodSimpleType type, - gboolean phase2, - gboolean is_editor, - gboolean secrets_only); + EAPMethodSimpleFlags flags); #endif /* EAP_METHOD_SIMPLE_H */ diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-simple.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-simple.ui 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ True False + start 3 2 6 @@ -75,47 +76,26 @@ - + True False - + + Sho_w password True - False - - - As_k for this password every time - True - True - False - True - - - True - True - 0 - - - - - Sho_w password - True - True - False - True - 0 - True - - - True - True - 1 - - - - - + True + False + True + True + + True + True + 0 + + + + @@ -123,7 +103,6 @@ 2 2 3 - diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-tls.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-tls.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-tls.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-tls.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,26 +17,24 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" -#include #include #include -#include -#include - #include "eap-method.h" #include "wireless-security.h" #include "helpers.h" +#include "nma-ui-utils.h" +#include "utils.h" struct _EAPMethodTLS { EAPMethod parent; - gboolean new_connection; + gboolean editing_connection; }; @@ -54,11 +52,12 @@ } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; GtkWidget *widget; const char *password, *identity; + GError *local = NULL; gboolean ret = TRUE; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry")); @@ -66,17 +65,25 @@ identity = gtk_entry_get_text (GTK_ENTRY (widget)); if (!identity || !strlen (identity)) { widget_set_error (widget); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-TLS identity")); ret = FALSE; } else { widget_unset_error (widget); } - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button")); - if (!eap_method_validate_filepicker (parent->builder, "eap_tls_ca_cert_button", TYPE_CA_CERT, NULL, NULL)) { - widget_set_error (widget); - ret = FALSE; - } else { - widget_unset_error (widget); + if (!eap_method_validate_filepicker (parent->builder, "eap_tls_ca_cert_button", TYPE_CA_CERT, NULL, NULL, &local)) { + widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button"))); + if (ret) { + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS CA certificate: %s"), local->message); + ret = FALSE; + } + g_clear_error (&local); + } else if (eap_method_ca_cert_required (parent->builder, "eap_tls_ca_cert_not_required_checkbox", "eap_tls_ca_cert_button")) { + widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button"))); + if (ret) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS CA certificate: no certificate specified")); + ret = FALSE; + } } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry")); @@ -84,28 +91,36 @@ password = gtk_entry_get_text (GTK_ENTRY (widget)); if (!password || !strlen (password)) { widget_set_error (widget); - ret = FALSE; + if (ret) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS password: missing")); + ret = FALSE; + } } else { widget_unset_error (widget); } - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_button")); if (!eap_method_validate_filepicker (parent->builder, "eap_tls_private_key_button", TYPE_PRIVATE_KEY, password, - &format)) { - widget_set_error (widget); - ret = FALSE; + &format, + &local)) { + if (ret) { + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS private-key: %s"), local->message); + ret = FALSE; + } + g_clear_error (&local); + widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_button"))); } if (format != NM_SETTING_802_1X_CK_FORMAT_PKCS12) { - widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button")); - if (!eap_method_validate_filepicker (parent->builder, "eap_tls_user_cert_button", TYPE_CLIENT_CERT, NULL, NULL)) { - widget_set_error (widget); - ret = FALSE; - } else { - widget_unset_error (widget); + if (!eap_method_validate_filepicker (parent->builder, "eap_tls_user_cert_button", TYPE_CLIENT_CERT, NULL, NULL, &local)) { + if (ret) { + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS user-certificate: %s"), local->message); + ret = FALSE; + } + g_clear_error (&local); + widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"))); } } @@ -113,10 +128,22 @@ } static void +ca_cert_not_required_toggled (GtkWidget *ignored, gpointer user_data) +{ + EAPMethod *parent = user_data; + + eap_method_ca_cert_not_required_toggled (parent->builder, "eap_tls_ca_cert_not_required_checkbox", "eap_tls_ca_cert_button"); +} + +static void add_to_size_group (EAPMethod *parent, GtkSizeGroup *group) { GtkWidget *widget; + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_not_required_checkbox")); + g_assert (widget); + gtk_size_group_add_widget (group, widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_label")); g_assert (widget); gtk_size_group_add_widget (group, widget); @@ -139,16 +166,17 @@ } static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags flags) { EAPMethodTLS *method = (EAPMethodTLS *) parent; NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; NMSetting8021x *s_8021x; - GtkWidget *widget; + NMSettingSecretFlags secret_flags; + GtkWidget *widget, *passwd_entry; char *ca_filename, *pk_filename, *cc_filename; const char *password = NULL; GError *error = NULL; - const char *secret_flag_prop = NULL; + gboolean ca_cert_error = FALSE; s_8021x = nm_connection_get_setting_802_1x (connection); g_assert (s_8021x); @@ -167,6 +195,7 @@ g_assert (widget); password = gtk_entry_get_text (GTK_ENTRY (widget)); g_assert (password); + passwd_entry = widget; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_button")); g_assert (widget); @@ -178,22 +207,23 @@ g_warning ("Couldn't read phase2 private key '%s': %s", pk_filename, error ? error->message : "(unknown)"); g_clear_error (&error); } - secret_flag_prop = NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS; } else { if (!nm_setting_802_1x_set_private_key (s_8021x, pk_filename, password, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { g_warning ("Couldn't read private key '%s': %s", pk_filename, error ? error->message : "(unknown)"); g_clear_error (&error); } - secret_flag_prop = NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS; } g_free (pk_filename); - /* Default to agent-owned secrets for new connections */ - if (method->new_connection) { - g_object_set (s_8021x, - secret_flag_prop, NM_SETTING_SECRET_FLAG_AGENT_OWNED, - NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE, - NULL); + /* Save 802.1X password flags to the connection */ + secret_flags = nma_utils_menu_to_secret_flags (passwd_entry); + nm_setting_set_secret_flags (NM_SETTING (s_8021x), parent->password_flags_name, + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ + if (method->editing_connection) { + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_8021x), parent->password_flags_name); } /* TLS client certificate */ @@ -231,13 +261,17 @@ if (!nm_setting_802_1x_set_phase2_ca_cert (s_8021x, ca_filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { g_warning ("Couldn't read phase2 CA certificate '%s': %s", ca_filename, error ? error->message : "(unknown)"); g_clear_error (&error); + ca_cert_error = TRUE; } } else { if (!nm_setting_802_1x_set_ca_cert (s_8021x, ca_filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { g_warning ("Couldn't read CA certificate '%s': %s", ca_filename, error ? error->message : "(unknown)"); g_clear_error (&error); + ca_cert_error = TRUE; } } + eap_method_ca_cert_ignore_set (parent, connection, ca_filename, ca_cert_error); + g_free (ca_filename); } static void @@ -416,6 +450,7 @@ EAPMethod *parent; GtkWidget *widget; NMSetting8021x *s_8021x = NULL; + gboolean ca_not_required = FALSE; parent = eap_method_init (sizeof (EAPMethodTLS), validate, @@ -430,14 +465,24 @@ if (!parent) return NULL; + parent->password_flags_name = phase2 ? + NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD : + NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD; method = (EAPMethodTLS *) parent; - method->new_connection = secrets_only ? FALSE : TRUE; - - eap_method_nag_init (parent, "eap_tls_ca_cert_button", connection); + method->editing_connection = secrets_only ? FALSE : TRUE; if (connection) s_8021x = nm_connection_get_setting_802_1x (connection); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_not_required_checkbox")); + g_assert (widget); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) ca_cert_not_required_toggled, + parent); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) wireless_security_changed_cb, + ws_parent); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry")); g_assert (widget); g_signal_connect (G_OBJECT (widget), "changed", @@ -465,6 +510,13 @@ phase2 ? nm_setting_802_1x_get_phase2_private_key_path : nm_setting_802_1x_get_private_key_path, TRUE, FALSE); + if (connection && eap_method_ca_cert_ignore_get (parent, connection)) { + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button")); + ca_not_required = !gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); + } + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_not_required_checkbox")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required); + /* Fill secrets, if any */ if (connection) update_secrets (parent, connection); @@ -475,6 +527,10 @@ (GCallback) wireless_security_changed_cb, ws_parent); + /* Create password-storage popup menu for password entry under entry's secondary icon */ + nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name, + FALSE, secrets_only); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eaptls")); g_assert (widget); g_signal_connect (G_OBJECT (widget), "toggled", @@ -496,6 +552,8 @@ gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button")); gtk_widget_hide (widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_not_required_checkbox")); + gtk_widget_hide (widget); } return method; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-tls.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-tls.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-tls.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-tls.ui 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ True False + start 6 2 6 @@ -90,6 +91,24 @@ + + No CA certificate is _required + True + True + False + True + True + + + 1 + 2 + 3 + 4 + GTK_FILL + + + + True False @@ -99,8 +118,8 @@ eap_tls_private_key_button - 3 - 4 + 4 + 5 GTK_FILL @@ -113,8 +132,8 @@ 1 2 - 3 - 4 + 4 + 5 GTK_FILL GTK_FILL @@ -129,8 +148,8 @@ eap_tls_private_key_password_entry - 4 - 5 + 5 + 6 GTK_FILL @@ -145,8 +164,8 @@ 1 2 - 4 - 5 + 5 + 6 @@ -157,14 +176,13 @@ True False True - 0 True 1 2 - 5 - 6 + 6 + 7 GTK_FILL diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-ttls.c gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-ttls.c --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-ttls.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-ttls.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,20 +17,17 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" -#include #include #include -#include -#include - #include "eap-method.h" #include "wireless-security.h" +#include "utils.h" #define I_NAME_COLUMN 0 #define I_METHOD_COLUMN 1 @@ -53,16 +50,24 @@ } static gboolean -validate (EAPMethod *parent) +validate (EAPMethod *parent, GError **error) { GtkWidget *widget; GtkTreeModel *model; GtkTreeIter iter; EAPMethod *eap = NULL; gboolean valid = FALSE; + GError *local = NULL; - if (!eap_method_validate_filepicker (parent->builder, "eap_ttls_ca_cert_button", TYPE_CA_CERT, NULL, NULL)) + if (!eap_method_validate_filepicker (parent->builder, "eap_ttls_ca_cert_button", TYPE_CA_CERT, NULL, NULL, &local)) { + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TTLS CA certificate: %s"), local->message); + g_clear_error (&local); + return FALSE; + } + if (eap_method_ca_cert_required (parent->builder, "eap_ttls_ca_cert_not_required_checkbox", "eap_ttls_ca_cert_button")) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TTLS CA certificate: no certificate specified")); return FALSE; + } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo")); g_assert (widget); @@ -71,12 +76,20 @@ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - valid = eap_method_validate (eap); + valid = eap_method_validate (eap, error); eap_method_unref (eap); return valid; } static void +ca_cert_not_required_toggled (GtkWidget *ignored, gpointer user_data) +{ + EAPMethod *parent = user_data; + + eap_method_ca_cert_not_required_toggled (parent->builder, "eap_ttls_ca_cert_not_required_checkbox", "eap_ttls_ca_cert_button"); +} + +static void add_to_size_group (EAPMethod *parent, GtkSizeGroup *group) { EAPMethodTTLS *method = (EAPMethodTTLS *) parent; @@ -89,6 +102,10 @@ g_object_unref (method->size_group); method->size_group = g_object_ref (group); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_not_required_checkbox")); + g_assert (widget); + gtk_size_group_add_widget (group, widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_label")); g_assert (widget); gtk_size_group_add_widget (group, widget); @@ -113,7 +130,7 @@ } static void -fill_connection (EAPMethod *parent, NMConnection *connection) +fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFlags flags) { NMSetting8021x *s_8021x; NMSetting8021xCKFormat format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -124,6 +141,7 @@ GtkTreeModel *model; GtkTreeIter iter; GError *error = NULL; + gboolean ca_cert_error = FALSE; s_8021x = nm_connection_get_setting_802_1x (connection); g_assert (s_8021x); @@ -142,7 +160,10 @@ if (!nm_setting_802_1x_set_ca_cert (s_8021x, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format, &error)) { g_warning ("Couldn't read CA certificate '%s': %s", filename, error ? error->message : "(unknown)"); g_clear_error (&error); + ca_cert_error = TRUE; } + eap_method_ca_cert_ignore_set (parent, connection, filename, ca_cert_error); + g_free (filename); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo")); model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); @@ -150,7 +171,7 @@ gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1); g_assert (eap); - eap_method_fill_connection (eap, connection); + eap_method_fill_connection (eap, connection, flags); eap_method_unref (eap); } @@ -207,10 +228,13 @@ EAPMethodSimple *em_mschap; EAPMethodSimple *em_mschap_v2; EAPMethodSimple *em_chap; + EAPMethodSimple *em_md5; + EAPMethodSimple *em_gtc; guint32 active = 0; const char *phase2_auth = NULL; + EAPMethodSimpleFlags simple_flags; - auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_g_type ()); + auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_type ()); if (s_8021x) { if (nm_setting_802_1x_get_phase2_auth (s_8021x)) @@ -219,12 +243,16 @@ phase2_auth = nm_setting_802_1x_get_phase2_autheap (s_8021x); } + simple_flags = EAP_METHOD_SIMPLE_FLAG_PHASE2 | EAP_METHOD_SIMPLE_FLAG_AUTHEAP_ALLOWED; + if (method->is_editor) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_IS_EDITOR; + if (secrets_only) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY; + em_pap = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_PAP, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("PAP"), @@ -239,9 +267,7 @@ em_mschap = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_MSCHAP, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("MSCHAP"), @@ -256,8 +282,7 @@ em_mschap_v2 = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_MSCHAP_V2, - TRUE, - method->is_editor, secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("MSCHAPv2"), @@ -272,9 +297,7 @@ em_chap = eap_method_simple_new (method->sec_parent, connection, EAP_METHOD_SIMPLE_TYPE_CHAP, - TRUE, - method->is_editor, - secrets_only); + simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, I_NAME_COLUMN, _("CHAP"), @@ -286,6 +309,36 @@ if (phase2_auth && !strcasecmp (phase2_auth, "chap")) active = 3; + em_md5 = eap_method_simple_new (method->sec_parent, + connection, + EAP_METHOD_SIMPLE_TYPE_MD5, + simple_flags); + gtk_list_store_append (auth_model, &iter); + gtk_list_store_set (auth_model, &iter, + I_NAME_COLUMN, _("MD5"), + I_METHOD_COLUMN, em_md5, + -1); + eap_method_unref (EAP_METHOD (em_md5)); + + /* Check for defaulting to MD5 */ + if (phase2_auth && !strcasecmp (phase2_auth, "md5")) + active = 4; + + em_gtc = eap_method_simple_new (method->sec_parent, + connection, + EAP_METHOD_SIMPLE_TYPE_GTC, + simple_flags); + gtk_list_store_append (auth_model, &iter); + gtk_list_store_set (auth_model, &iter, + I_NAME_COLUMN, _("GTC"), + I_METHOD_COLUMN, em_gtc, + -1); + eap_method_unref (EAP_METHOD (em_gtc)); + + /* Check for defaulting to GTC */ + if (phase2_auth && !strcasecmp (phase2_auth, "gtc")) + active = 5; + combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo")); g_assert (combo); @@ -316,7 +369,7 @@ { EAPMethod *parent; EAPMethodTTLS *method; - GtkWidget *widget; + GtkWidget *widget, *widget_ca_not_required_checkbox; GtkFileFilter *filter; NMSetting8021x *s_8021x = NULL; const char *filename; @@ -334,8 +387,7 @@ if (!parent) return NULL; - eap_method_nag_init (parent, "eap_ttls_ca_cert_button", connection); - + parent->password_flags_name = NM_SETTING_802_1X_PASSWORD; method = (EAPMethodTTLS *) parent; method->sec_parent = ws_parent; method->is_editor = is_editor; @@ -343,6 +395,16 @@ if (connection) s_8021x = nm_connection_get_setting_802_1x (connection); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_not_required_checkbox")); + g_assert (widget); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) ca_cert_not_required_toggled, + parent); + g_signal_connect (G_OBJECT (widget), "toggled", + (GCallback) wireless_security_changed_cb, + ws_parent); + widget_ca_not_required_checkbox = widget; + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button")); g_assert (widget); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); @@ -354,11 +416,14 @@ filter = eap_method_default_file_chooser_filter_new (FALSE); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter); if (connection && s_8021x) { + filename = NULL; if (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH) { filename = nm_setting_802_1x_get_ca_cert_path (s_8021x); if (filename) gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename); } + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget_ca_not_required_checkbox), + !filename && eap_method_ca_cert_ignore_get (parent, connection)); } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry")); @@ -380,6 +445,8 @@ gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button")); gtk_widget_hide (widget); + widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_not_required_checkbox")); + gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_label")); gtk_widget_hide (widget); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo")); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-ttls.ui gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-ttls.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/eap-method-ttls.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/eap-method-ttls.ui 2016-08-12 12:43:57.000000000 +0000 @@ -82,6 +82,24 @@ + + No CA certificate is _required + True + True + False + True + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + True False @@ -91,8 +109,8 @@ eap_ttls_inner_auth_combo - 2 - 3 + 3 + 4 GTK_FILL @@ -112,8 +130,8 @@ 1 2 - 2 - 3 + 3 + 4 GTK_FILL GTK_FILL @@ -129,8 +147,8 @@ 2 - 3 - 4 + 4 + 5 GTK_FILL diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/helpers.c gnome-control-center-3.22.1/panels/network/wireless-security/helpers.c --- gnome-control-center-3.20.2/panels/network/wireless-security/helpers.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/helpers.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,9 +17,11 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2009 Red Hat, Inc. + * Copyright 2009 - 2014 Red Hat, Inc. */ +#include "nm-default.h" + #include "helpers.h" void @@ -48,3 +50,4 @@ } } } + diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/helpers.h gnome-control-center-3.22.1/panels/network/wireless-security/helpers.h --- gnome-control-center-3.20.2/panels/network/wireless-security/helpers.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/helpers.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,7 +17,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2009 Red Hat, Inc. + * Copyright 2009 - 2014 Red Hat, Inc. */ #ifndef _HELPERS_H_ @@ -25,8 +25,15 @@ #include #include + +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef const char * (*HelperSecretFunc)(NMSetting *); @@ -36,8 +43,5 @@ GType setting_type, HelperSecretFunc func); -extern void widget_set_error (GtkWidget *widget); -extern void widget_unset_error (GtkWidget *widget); - #endif /* _HELPERS_H_ */ diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/Makefile.am gnome-control-center-3.22.1/panels/network/wireless-security/Makefile.am --- gnome-control-center-3.20.2/panels/network/wireless-security/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -36,7 +36,10 @@ libwireless_security_la_SOURCES = \ $(BUILT_SOURCES) \ - $(NM_APPLET_SOURCES) + $(NM_APPLET_SOURCES) \ + utils.c \ + utils.h \ + nm-default.h libwireless_security_la_CPPFLAGS = \ $(NETWORK_PANEL_CFLAGS) \ @@ -54,12 +57,16 @@ $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name wireless_security $< WIRELESS_SECURITY_DIR=$(top_srcdir)/../network-manager-applet/src/wireless-security -WIRELESS_SECURITY_FILES=$(NM_APPLET_SOURCES) update-from-nma: - FILES="$(WIRELESS_SECURITY_FILES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && changed=true ; \ - patch -p0 < $(srcdir)/nm-connection-editor-to-network-panel.patch ; \ - git commit -m "network: Update wireless-security from network-manager-applet" $(WIRELESS_SECURITY_FILES) + FILES="$(NM_APPLET_SOURCES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \ + patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch && \ + git add $(NM_APPLET_SOURCES) && \ + git commit -m "network: Update wireless-security from network-manager-applet" + FILES="$(resource_files)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \ + patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch && \ + git add $(resource_files) && \ + git commit -m "network: Update wireless-security UI from network-manager-applet" -EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch +EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch nm-connection-editor-ui-to-network-panel.patch -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/Makefile.in gnome-control-center-3.22.1/panels/network/wireless-security/Makefile.in --- gnome-control-center-3.20.2/panels/network/wireless-security/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -122,7 +122,8 @@ libwireless_security_la-eap-method-peap.lo \ libwireless_security_la-eap-method-simple.lo \ libwireless_security_la-helpers.lo -am_libwireless_security_la_OBJECTS = $(am__objects_1) $(am__objects_2) +am_libwireless_security_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ + libwireless_security_la-utils.lo libwireless_security_la_OBJECTS = \ $(am_libwireless_security_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -298,8 +299,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -463,7 +462,10 @@ libwireless_security_la_SOURCES = \ $(BUILT_SOURCES) \ - $(NM_APPLET_SOURCES) + $(NM_APPLET_SOURCES) \ + utils.c \ + utils.h \ + nm-default.h libwireless_security_la_CPPFLAGS = \ $(NETWORK_PANEL_CFLAGS) \ @@ -476,8 +478,7 @@ resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/wireless-security.gresource.xml) WIRELESS_SECURITY_DIR = $(top_srcdir)/../network-manager-applet/src/wireless-security -WIRELESS_SECURITY_FILES = $(NM_APPLET_SOURCES) -EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch +EXTRA_DIST = $(resource_files) wireless-security.gresource.xml nm-connection-editor-to-network-panel.patch nm-connection-editor-ui-to-network-panel.patch all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -541,6 +542,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-eap-method-ttls.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-eap-method.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-helpers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-wireless-security-resources.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-wireless-security.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-ws-dynamic-wep.Plo@am__quote@ @@ -550,22 +552,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwireless_security_la-ws-wpa-psk.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -675,6 +680,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwireless_security_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libwireless_security_la-helpers.lo `test -f 'helpers.c' || echo '$(srcdir)/'`helpers.c +libwireless_security_la-utils.lo: utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwireless_security_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libwireless_security_la-utils.lo -MD -MP -MF $(DEPDIR)/libwireless_security_la-utils.Tpo -c -o libwireless_security_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libwireless_security_la-utils.Tpo $(DEPDIR)/libwireless_security_la-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='libwireless_security_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwireless_security_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libwireless_security_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c + mostlyclean-libtool: -rm -f *.lo @@ -894,9 +906,14 @@ wireless-security-resources.h: wireless-security.gresource.xml $(resource_files) $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name wireless_security $< update-from-nma: - FILES="$(WIRELESS_SECURITY_FILES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && changed=true ; \ - patch -p0 < $(srcdir)/nm-connection-editor-to-network-panel.patch ; \ - git commit -m "network: Update wireless-security from network-manager-applet" $(WIRELESS_SECURITY_FILES) + FILES="$(NM_APPLET_SOURCES)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \ + patch -p4 < $(srcdir)/nm-connection-editor-to-network-panel.patch && \ + git add $(NM_APPLET_SOURCES) && \ + git commit -m "network: Update wireless-security from network-manager-applet" + FILES="$(resource_files)" DIR="$(WIRELESS_SECURITY_DIR)" $(top_srcdir)/update-from-gsd.sh && \ + patch -p4 < $(srcdir)/nm-connection-editor-ui-to-network-panel.patch && \ + git add $(resource_files) && \ + git commit -m "network: Update wireless-security UI from network-manager-applet" -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/nag-user-dialog.ui gnome-control-center-3.22.1/panels/network/wireless-security/nag-user-dialog.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/nag-user-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/nag-user-dialog.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,191 +0,0 @@ - - - - - - 5 - True - center - dialog - - - True - vertical - 14 - - - True - 5 - 12 - - - True - 0 - gtk-dialog-warning - 6 - - - False - 0 - - - - - True - vertical - 12 - - - True - 0 - 0 - alert text - True - True - - - 0 - - - - - Don't _warn me again - True - True - False - True - True - - - False - False - 1 - - - - - 1 - - - - - 1 - - - - - True - end - - - True - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-no - - - False - False - 0 - - - - - True - No - True - - - False - False - 1 - - - - - - - - - False - False - 0 - - - - - True - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-ok - - - False - False - 0 - - - - - True - Yes - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - False - end - 0 - - - - - - ignore_button - change_button - - - diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/nm-connection-editor-to-network-panel.patch gnome-control-center-3.22.1/panels/network/wireless-security/nm-connection-editor-to-network-panel.patch --- gnome-control-center-3.20.2/panels/network/wireless-security/nm-connection-editor-to-network-panel.patch 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/nm-connection-editor-to-network-panel.patch 2016-08-12 12:43:57.000000000 +0000 @@ -1,74 +1,8 @@ ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method.c 2012-12-11 15:51:57.191216362 +0100 -+++ eap-method.c 2013-01-09 17:58:22.167402957 +0100 -@@ -43,7 +43,7 @@ - static GType type_id = 0; - - if (!type_id) { -- type_id = g_boxed_type_register_static ("EAPMethod", -+ type_id = g_boxed_type_register_static ("CcEAPMethod", - (GBoxedCopyFunc) eap_method_ref, - (GBoxedFreeFunc) eap_method_unref); - } -@@ -203,7 +203,7 @@ eap_method_nag_user (EAPMethod *method) - return method->nag_dialog; - } - --#define NAG_DIALOG_UI UIDIR "/nag-user-dialog.ui" -+#define NAG_DIALOG_UI "/org/gnome/control-center/network/nag-user-dialog.ui" - - static gboolean - _get_ignore_ca_cert (const char *uuid, gboolean phase2) -@@ -237,7 +237,7 @@ eap_method_nag_init (EAPMethod *method, - g_return_val_if_fail (ca_cert_chooser != NULL, FALSE); - - method->nag_builder = gtk_builder_new (); -- if (!gtk_builder_add_from_file (method->nag_builder, NAG_DIALOG_UI, &error)) { -+ if (!gtk_builder_add_from_resource (method->nag_builder, NAG_DIALOG_UI, &error)) { - g_warning ("Couldn't load UI builder file " NAG_DIALOG_UI ": %s", - error->message); - g_error_free (error); -@@ -328,7 +328,7 @@ eap_method_init (gsize obj_size, - EMFillConnectionFunc fill_connection, - EMUpdateSecretsFunc update_secrets, - EMDestroyFunc destroy, -- const char *ui_file, -+ const char *ui_resource, - const char *ui_widget_name, - const char *default_field, - gboolean phase2) -@@ -337,7 +337,7 @@ eap_method_init (gsize obj_size, - GError *error = NULL; - - g_return_val_if_fail (obj_size > 0, NULL); -- g_return_val_if_fail (ui_file != NULL, NULL); -+ g_return_val_if_fail (ui_resource != NULL, NULL); - g_return_val_if_fail (ui_widget_name != NULL, NULL); - - method = g_slice_alloc0 (obj_size); -@@ -354,9 +354,9 @@ eap_method_init (gsize obj_size, - method->phase2 = phase2; - - method->builder = gtk_builder_new (); -- if (!gtk_builder_add_from_file (method->builder, ui_file, &error)) { -+ if (!gtk_builder_add_from_resource (method->builder, ui_resource, &error)) { - g_warning ("Couldn't load UI builder file %s: %s", -- ui_file, error->message); -+ ui_resource, error->message); - eap_method_unref (method); - return NULL; - } -@@ -364,7 +364,7 @@ eap_method_init (gsize obj_size, - method->ui_widget = GTK_WIDGET (gtk_builder_get_object (method->builder, ui_widget_name)); - if (!method->ui_widget) { - g_warning ("Couldn't load UI widget '%s' from UI file %s", -- ui_widget_name, ui_file); -+ ui_widget_name, ui_resource); - eap_method_unref (method); - return NULL; - } ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-fast.c 2012-12-11 15:47:51.346453837 +0100 -+++ eap-method-fast.c 2013-01-09 17:58:22.165402936 +0100 -@@ -343,7 +343,7 @@ eap_method_fast_new (WirelessSecurity *w +diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c +index 69b8a86..be5578d 100644 +--- a/panels/network/wireless-security/eap-method-fast.c ++++ b/panels/network/wireless-security/eap-method-fast.c +@@ -351,7 +351,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, @@ -77,31 +11,24 @@ "eap_fast_notebook", "eap_fast_anon_identity_entry", FALSE); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method.h 2012-12-11 15:51:57.191216362 +0100 -+++ eap-method.h 2013-01-09 17:58:22.167402957 +0100 -@@ -96,7 +96,7 @@ EAPMethod *eap_method_init (gsize obj_si - EMFillConnectionFunc fill_connection, - EMUpdateSecretsFunc update_secrets, - EMDestroyFunc destroy, -- const char *ui_file, -+ const char *ui_resource, - const char *ui_widget_name, - const char *default_field, - gboolean phase2); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-leap.c 2012-12-11 15:51:57.190216351 +0100 -+++ eap-method-leap.c 2013-01-09 17:58:22.166402947 +0100 -@@ -136,7 +136,7 @@ eap_method_leap_new (WirelessSecurity *w +diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c +index 5fbdd86..6163468 100644 +--- a/panels/network/wireless-security/eap-method-leap.c ++++ b/panels/network/wireless-security/eap-method-leap.c +@@ -204,7 +204,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, - NULL, + destroy, - UIDIR "/eap-method-leap.ui", + "/org/gnome/control-center/network/eap-method-leap.ui", "eap_leap_notebook", "eap_leap_username_entry", FALSE); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-peap.c 2012-12-11 15:51:57.190216351 +0100 -+++ eap-method-peap.c 2013-01-09 17:58:22.166402947 +0100 -@@ -327,7 +327,7 @@ eap_method_peap_new (WirelessSecurity *w +diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c +index 6462ef2..7f87541 100644 +--- a/panels/network/wireless-security/eap-method-peap.c ++++ b/panels/network/wireless-security/eap-method-peap.c +@@ -349,7 +349,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, @@ -110,20 +37,24 @@ "eap_peap_notebook", "eap_peap_anon_identity_entry", FALSE); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-simple.c 2012-12-11 15:51:57.190216351 +0100 -+++ eap-method-simple.c 2013-01-09 17:58:22.166402947 +0100 -@@ -229,7 +229,7 @@ eap_method_simple_new (WirelessSecurity +diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c +index 0f72029..f9fd473 100644 +--- a/panels/network/wireless-security/eap-method-simple.c ++++ b/panels/network/wireless-security/eap-method-simple.c +@@ -307,7 +307,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, - NULL, + destroy, - UIDIR "/eap-method-simple.ui", + "/org/gnome/control-center/network/eap-method-simple.ui", "eap_simple_notebook", "eap_simple_username_entry", - phase2); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-tls.c 2012-12-11 15:51:57.190216351 +0100 -+++ eap-method-tls.c 2013-01-09 17:58:22.167402957 +0100 -@@ -401,7 +401,7 @@ eap_method_tls_new (WirelessSecurity *ws + flags & EAP_METHOD_SIMPLE_FLAG_PHASE2); +diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c +index 8f33d83..587c399 100644 +--- a/panels/network/wireless-security/eap-method-tls.c ++++ b/panels/network/wireless-security/eap-method-tls.c +@@ -453,7 +453,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, NULL, @@ -132,9 +63,11 @@ "eap_tls_notebook", "eap_tls_identity_entry", phase2); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/eap-method-ttls.c 2012-12-11 15:51:57.190216351 +0100 -+++ eap-method-ttls.c 2013-01-09 17:58:22.167402957 +0100 -@@ -327,7 +327,7 @@ eap_method_ttls_new (WirelessSecurity *w +diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c +index 789f0fa..ef02529 100644 +--- a/panels/network/wireless-security/eap-method-ttls.c ++++ b/panels/network/wireless-security/eap-method-ttls.c +@@ -380,7 +380,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent, fill_connection, update_secrets, destroy, @@ -143,27 +76,115 @@ "eap_ttls_notebook", "eap_ttls_anon_identity_entry", FALSE); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/wireless-security.c 2012-12-11 15:51:57.191216362 +0100 -+++ wireless-security.c 2013-01-09 17:58:22.168402968 +0100 -@@ -35,6 +35,7 @@ - #include +diff --git a/panels/network/wireless-security/eap-method.c b/panels/network/wireless-security/eap-method.c +index 90efea1..6ec4849 100644 +--- a/panels/network/wireless-security/eap-method.c ++++ b/panels/network/wireless-security/eap-method.c +@@ -34,7 +34,19 @@ + #include "utils.h" + #include "helpers.h" + +-G_DEFINE_BOXED_TYPE (EAPMethod, eap_method, eap_method_ref, eap_method_unref) ++GType ++eap_method_get_type (void) ++{ ++ static GType type_id = 0; ++ ++ if (!type_id) { ++ type_id = g_boxed_type_register_static ("CcEAPMethod", ++ (GBoxedCopyFunc) eap_method_ref, ++ (GBoxedFreeFunc) eap_method_unref); ++ } ++ ++ return type_id; ++} + + GtkWidget * + eap_method_get_widget (EAPMethod *method) +@@ -129,7 +141,7 @@ eap_method_init (gsize obj_size, + EMFillConnectionFunc fill_connection, + EMUpdateSecretsFunc update_secrets, + EMDestroyFunc destroy, +- const char *ui_file, ++ const char *ui_resource, + const char *ui_widget_name, + const char *default_field, + gboolean phase2) +@@ -138,7 +150,7 @@ eap_method_init (gsize obj_size, + GError *error = NULL; + + g_return_val_if_fail (obj_size > 0, NULL); +- g_return_val_if_fail (ui_file != NULL, NULL); ++ g_return_val_if_fail (ui_resource != NULL, NULL); + g_return_val_if_fail (ui_widget_name != NULL, NULL); + + method = g_slice_alloc0 (obj_size); +@@ -154,9 +166,9 @@ eap_method_init (gsize obj_size, + method->phase2 = phase2; + + method->builder = gtk_builder_new (); +- if (!gtk_builder_add_from_file (method->builder, ui_file, &error)) { ++ if (!gtk_builder_add_from_resource (method->builder, ui_resource, &error)) { + g_warning ("Couldn't load UI builder file %s: %s", +- ui_file, error->message); ++ ui_resource, error->message); + eap_method_unref (method); + return NULL; + } +@@ -164,7 +176,7 @@ eap_method_init (gsize obj_size, + method->ui_widget = GTK_WIDGET (gtk_builder_get_object (method->builder, ui_widget_name)); + if (!method->ui_widget) { + g_warning ("Couldn't load UI widget '%s' from UI file %s", +- ui_widget_name, ui_file); ++ ui_widget_name, ui_resource); + eap_method_unref (method); + return NULL; + } +diff --git a/panels/network/wireless-security/eap-method.h b/panels/network/wireless-security/eap-method.h +index 84c1c78..de287e3 100644 +--- a/panels/network/wireless-security/eap-method.h ++++ b/panels/network/wireless-security/eap-method.h +@@ -99,7 +99,7 @@ EAPMethod *eap_method_init (gsize obj_size, + EMFillConnectionFunc fill_connection, + EMUpdateSecretsFunc update_secrets, + EMDestroyFunc destroy, +- const char *ui_file, ++ const char *ui_resource, + const char *ui_widget_name, + const char *default_field, + gboolean phase2); +diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c +index 23b8a27..bd233b0 100644 +--- a/panels/network/wireless-security/wireless-security.c ++++ b/panels/network/wireless-security/wireless-security.c +@@ -25,10 +25,25 @@ + #include #include "wireless-security.h" +#include "wireless-security-resources.h" #include "eap-method.h" + #include "utils.h" - GType -@@ -43,6 +44,8 @@ wireless_security_get_g_type (void) - static GType type_id = 0; - - if (!type_id) { +-G_DEFINE_BOXED_TYPE (WirelessSecurity, wireless_security, wireless_security_ref, wireless_security_unref) ++GType ++wireless_security_get_type (void) ++{ ++ static GType type_id = 0; ++ ++ if (!type_id) { + g_resources_register (wireless_security_get_resource ()); + -+ type_id = g_boxed_type_register_static ("CcWirelessSecurity", -- type_id = g_boxed_type_register_static ("WirelessSecurity", - (GBoxedCopyFunc) wireless_security_ref, - (GBoxedFreeFunc) wireless_security_unref); -@@ -155,7 +158,7 @@ wireless_security_init (gsize obj_size, ++ type_id = g_boxed_type_register_static ("CcWirelessSecurity", ++ (GBoxedCopyFunc) wireless_security_ref, ++ (GBoxedFreeFunc) wireless_security_unref); ++ } ++ ++ return type_id; ++} + + GtkWidget * + wireless_security_get_widget (WirelessSecurity *sec) +@@ -146,7 +161,7 @@ wireless_security_init (gsize obj_size, WSFillConnectionFunc fill_connection, WSUpdateSecretsFunc update_secrets, WSDestroyFunc destroy, @@ -172,7 +193,7 @@ const char *ui_widget_name, const char *default_field) { -@@ -163,7 +166,7 @@ wireless_security_init (gsize obj_size, +@@ -154,7 +169,7 @@ wireless_security_init (gsize obj_size, GError *error = NULL; g_return_val_if_fail (obj_size > 0, NULL); @@ -181,7 +202,7 @@ g_return_val_if_fail (ui_widget_name != NULL, NULL); sec = g_slice_alloc0 (obj_size); -@@ -180,9 +183,9 @@ wireless_security_init (gsize obj_size, +@@ -170,9 +185,9 @@ wireless_security_init (gsize obj_size, sec->default_field = default_field; sec->builder = gtk_builder_new (); @@ -193,7 +214,7 @@ g_error_free (error); wireless_security_unref (sec); return NULL; -@@ -191,7 +194,7 @@ wireless_security_init (gsize obj_size, +@@ -181,7 +196,7 @@ wireless_security_init (gsize obj_size, sec->ui_widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, ui_widget_name)); if (!sec->ui_widget) { g_warning ("Couldn't load UI widget '%s' from UI file %s", @@ -202,9 +223,20 @@ wireless_security_unref (sec); return NULL; } ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/wireless-security.h 2012-12-11 15:51:57.191216362 +0100 -+++ wireless-security.h 2013-01-09 17:58:22.168402968 +0100 -@@ -101,7 +101,7 @@ WirelessSecurity *wireless_security_init +diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h +index e9bcf63..3d56fa3 100644 +--- a/panels/network/wireless-security/wireless-security.h ++++ b/panels/network/wireless-security/wireless-security.h +@@ -23,6 +23,8 @@ + #ifndef WIRELESS_SECURITY_H + #define WIRELESS_SECURITY_H + ++#define LIBNM_GLIB_BUILD ++ + #include + #include + +@@ -118,7 +120,7 @@ WirelessSecurity *wireless_security_init (gsize obj_size, WSFillConnectionFunc fill_connection, WSUpdateSecretsFunc update_secrets, WSDestroyFunc destroy, @@ -213,9 +245,11 @@ const char *ui_widget_name, const char *default_field); ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/ws-dynamic-wep.c 2012-12-11 15:51:57.191216362 +0100 -+++ ws-dynamic-wep.c 2013-01-09 17:58:22.168402968 +0100 -@@ -120,7 +120,7 @@ ws_dynamic_wep_new (NMConnection *connec +diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c +index db55119..0192d24 100644 +--- a/panels/network/wireless-security/ws-dynamic-wep.c ++++ b/panels/network/wireless-security/ws-dynamic-wep.c +@@ -109,7 +109,7 @@ ws_dynamic_wep_new (NMConnection *connection, fill_connection, update_secrets, destroy, @@ -224,9 +258,11 @@ "dynamic_wep_notebook", NULL); if (!parent) ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/ws-leap.c 2012-12-11 15:51:57.192216374 +0100 -+++ ws-leap.c 2013-01-09 17:58:22.168402968 +0100 -@@ -140,7 +140,7 @@ ws_leap_new (NMConnection *connection, g +diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c +index 2b8b615..3a0f60c 100644 +--- a/panels/network/wireless-security/ws-leap.c ++++ b/panels/network/wireless-security/ws-leap.c +@@ -155,7 +155,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only) fill_connection, update_secrets, NULL, @@ -235,9 +271,11 @@ "leap_notebook", "leap_username_entry"); if (!parent) ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/ws-wep-key.c 2012-12-11 15:51:57.192216374 +0100 -+++ ws-wep-key.c 2013-01-09 17:58:22.168402968 +0100 -@@ -257,7 +257,7 @@ ws_wep_key_new (NMConnection *connection +diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c +index 045ac4b..cd7dbac 100644 +--- a/panels/network/wireless-security/ws-wep-key.c ++++ b/panels/network/wireless-security/ws-wep-key.c +@@ -264,7 +264,7 @@ ws_wep_key_new (NMConnection *connection, fill_connection, update_secrets, destroy, @@ -246,9 +284,11 @@ "wep_key_notebook", "wep_key_entry"); if (!parent) ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/ws-wpa-eap.c 2012-12-11 15:51:57.192216374 +0100 -+++ ws-wpa-eap.c 2013-01-09 17:58:22.169402979 +0100 -@@ -116,7 +116,7 @@ ws_wpa_eap_new (NMConnection *connection +diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c +index d83218d..7db42df 100644 +--- a/panels/network/wireless-security/ws-wpa-eap.c ++++ b/panels/network/wireless-security/ws-wpa-eap.c +@@ -110,7 +110,7 @@ ws_wpa_eap_new (NMConnection *connection, fill_connection, update_secrets, destroy, @@ -257,9 +297,11 @@ "wpa_eap_notebook", NULL); if (!parent) ---- /home/hadess/Projects/jhbuild/network-manager-applet/src/wireless-security/ws-wpa-psk.c 2012-12-11 15:51:57.192216374 +0100 -+++ ws-wpa-psk.c 2013-01-09 17:58:22.169402979 +0100 -@@ -157,7 +157,7 @@ ws_wpa_psk_new (NMConnection *connection +diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c +index e56f348..4be28f2 100644 +--- a/panels/network/wireless-security/ws-wpa-psk.c ++++ b/panels/network/wireless-security/ws-wpa-psk.c +@@ -182,7 +182,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only) fill_connection, update_secrets, NULL, diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch gnome-control-center-3.22.1/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch --- gnome-control-center-3.20.2/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/nm-connection-editor-ui-to-network-panel.patch 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,495 @@ +diff --git a/panels/network/wireless-security/eap-method-fast.ui b/panels/network/wireless-security/eap-method-fast.ui +index 4b19a66..5307ddb 100644 +--- a/panels/network/wireless-security/eap-method-fast.ui ++++ b/panels/network/wireless-security/eap-method-fast.ui +@@ -46,8 +46,8 @@ + + True + False +- 0 +- Anony_mous identity: ++ 1 ++ Anony_mous identity + True + eap_fast_anon_identity_entry + +@@ -72,8 +72,8 @@ + + True + False +- 0 +- PAC _file: ++ 1 ++ PAC _file + True + eap_fast_pac_file_button + +@@ -117,8 +117,8 @@ + + True + False +- 0 +- _Inner authentication: ++ 1 ++ _Inner authentication + True + eap_fast_inner_auth_combo + +diff --git a/panels/network/wireless-security/eap-method-leap.ui b/panels/network/wireless-security/eap-method-leap.ui +index 1d1f23d..d4c0625 100644 +--- a/panels/network/wireless-security/eap-method-leap.ui ++++ b/panels/network/wireless-security/eap-method-leap.ui +@@ -22,8 +22,8 @@ + + True + False +- 0 +- _Username: ++ 1 ++ _Username + True + eap_leap_username_entry + +@@ -36,8 +36,8 @@ + + True + False +- 0 +- _Password: ++ 1 ++ _Password + True + eap_leap_password_entry + +diff --git a/panels/network/wireless-security/eap-method-peap.ui b/panels/network/wireless-security/eap-method-peap.ui +index a97123a..2f8b8cd 100644 +--- a/panels/network/wireless-security/eap-method-peap.ui ++++ b/panels/network/wireless-security/eap-method-peap.ui +@@ -46,8 +46,8 @@ + + True + False +- 0 +- Anony_mous identity: ++ 1 ++ Anony_mous identity + True + eap_peap_anon_identity_entry + +@@ -72,8 +72,8 @@ + + True + False +- 0 +- C_A certificate: ++ 1 ++ C_A certificate + True + eap_peap_ca_cert_button + +@@ -135,8 +135,8 @@ + + True + False +- 0 +- _Inner authentication: ++ 1 ++ _Inner authentication + True + eap_peap_inner_auth_combo + +@@ -172,8 +172,8 @@ + + True + False +- 0 +- PEAP _version: ++ 1 ++ PEAP _version + True + eap_peap_version_combo + +diff --git a/panels/network/wireless-security/eap-method-simple.ui b/panels/network/wireless-security/eap-method-simple.ui +index b3318e4..7d95d28 100644 +--- a/panels/network/wireless-security/eap-method-simple.ui ++++ b/panels/network/wireless-security/eap-method-simple.ui +@@ -22,8 +22,8 @@ + + True + False +- 0 +- _Username: ++ 1 ++ _Username + True + eap_simple_username_entry + +@@ -36,8 +36,8 @@ + + True + False +- 0 +- _Password: ++ 1 ++ _Password + True + eap_simple_password_entry + +diff --git a/panels/network/wireless-security/eap-method-tls.ui b/panels/network/wireless-security/eap-method-tls.ui +index 5557593..3c6291b 100644 +--- a/panels/network/wireless-security/eap-method-tls.ui ++++ b/panels/network/wireless-security/eap-method-tls.ui +@@ -22,8 +22,8 @@ + + True + False +- 0 +- I_dentity: ++ 1 ++ I_dentity + True + eap_tls_identity_entry + +@@ -48,8 +48,8 @@ + + True + False +- 0 +- _User certificate: ++ 1 ++ _User certificate + True + eap_tls_user_cert_button + +@@ -64,8 +64,8 @@ + + True + False +- 0 +- C_A certificate: ++ 1 ++ C_A certificate + True + eap_tls_ca_cert_button + +@@ -112,8 +112,8 @@ + + True + False +- 0 +- Private _key: ++ 1 ++ Private _key + True + eap_tls_private_key_button + +@@ -142,8 +142,8 @@ + + True + False +- 0 +- _Private key password: ++ 1 ++ _Private key password + True + eap_tls_private_key_password_entry + +diff --git a/panels/network/wireless-security/eap-method-ttls.ui b/panels/network/wireless-security/eap-method-ttls.ui +index ce00c26..70db9ed 100644 +--- a/panels/network/wireless-security/eap-method-ttls.ui ++++ b/panels/network/wireless-security/eap-method-ttls.ui +@@ -29,8 +29,8 @@ + + True + False +- 0 +- Anony_mous identity: ++ 1 ++ Anony_mous identity + True + eap_ttls_anon_identity_entry + +@@ -55,8 +55,8 @@ + + True + False +- 0 +- C_A certificate: ++ 1 ++ C_A certificate + True + eap_ttls_ca_cert_button + +@@ -103,8 +103,8 @@ + + True + False +- 0 +- _Inner authentication: ++ 1 ++ _Inner authentication + True + eap_ttls_inner_auth_combo + +diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui b/panels/network/wireless-security/ws-dynamic-wep.ui +index 4bd8520..cf31f12 100644 +--- a/panels/network/wireless-security/ws-dynamic-wep.ui ++++ b/panels/network/wireless-security/ws-dynamic-wep.ui +@@ -35,8 +35,8 @@ + + True + False +- 0 +- Au_thentication: ++ 1 ++ Au_thentication + True + dynamic_wep_auth_combo + +diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui +index dc936ad..b4d9bec 100644 +--- a/panels/network/wireless-security/ws-leap.ui ++++ b/panels/network/wireless-security/ws-leap.ui +@@ -22,8 +22,8 @@ + + True + False +- 0 +- _Username: ++ 1 ++ _Username + True + leap_username_entry + +@@ -36,8 +36,8 @@ + + True + False +- 0 +- _Password: ++ 1 ++ _Password + True + leap_password_entry + +diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui +index 62b11a5..c0e5f55 100644 +--- a/panels/network/wireless-security/ws-wep-key.ui ++++ b/panels/network/wireless-security/ws-wep-key.ui +@@ -52,8 +52,8 @@ + + True + False +- 0 +- _Key: ++ 1 ++ _Key + True + wep_key_entry + +@@ -111,8 +111,8 @@ + + True + False +- 0 +- Au_thentication: ++ 1 ++ Au_thentication + True + auth_method_combo + +@@ -148,8 +148,8 @@ + + True + False +- 0 +- WEP inde_x: ++ 1 ++ WEP inde_x + True + key_index_combo + +diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui +index 2da2148..942af88 100644 +--- a/panels/network/wireless-security/ws-wpa-eap.ui ++++ b/panels/network/wireless-security/ws-wpa-eap.ui +@@ -29,8 +29,8 @@ + + True + False +- 0 +- Au_thentication: ++ 1 ++ Au_thentication + True + wpa_eap_auth_combo + +diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui +index 4ec6909..b34720a 100644 +--- a/panels/network/wireless-security/ws-wpa-psk.ui ++++ b/panels/network/wireless-security/ws-wpa-psk.ui +@@ -18,8 +18,8 @@ + + True + False +- 0 +- _Password: ++ 1 ++ _Password + True + wpa_psk_entry + +@@ -46,8 +46,8 @@ + + True + False +- 0 +- _Type: ++ 1 ++ _Type + True + wpa_psk_type_combo + +diff --git a/panels/network/wireless-security/eap-method-fast.ui b/panels/network/wireless-security/eap-method-fast.ui +index 5307ddb..36e74c3 100644 +--- a/panels/network/wireless-security/eap-method-fast.ui ++++ b/panels/network/wireless-security/eap-method-fast.ui +@@ -40,7 +40,7 @@ + False + 5 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/eap-method-leap.ui b/panels/network/wireless-security/eap-method-leap.ui +index d4c0625..c4de1dc 100644 +--- a/panels/network/wireless-security/eap-method-leap.ui ++++ b/panels/network/wireless-security/eap-method-leap.ui +@@ -13,7 +13,7 @@ + start + 3 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/eap-method-peap.ui b/panels/network/wireless-security/eap-method-peap.ui +index 2f8b8cd..d16e00a 100644 +--- a/panels/network/wireless-security/eap-method-peap.ui ++++ b/panels/network/wireless-security/eap-method-peap.ui +@@ -40,7 +40,7 @@ + False + 5 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/eap-method-simple.ui b/panels/network/wireless-security/eap-method-simple.ui +index 7d95d28..af00cb9 100644 +--- a/panels/network/wireless-security/eap-method-simple.ui ++++ b/panels/network/wireless-security/eap-method-simple.ui +@@ -13,7 +13,7 @@ + start + 3 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/eap-method-tls.ui b/panels/network/wireless-security/eap-method-tls.ui +index 3c6291b..0079715 100644 +--- a/panels/network/wireless-security/eap-method-tls.ui ++++ b/panels/network/wireless-security/eap-method-tls.ui +@@ -13,7 +13,7 @@ + start + 6 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/eap-method-ttls.ui b/panels/network/wireless-security/eap-method-ttls.ui +index 70db9ed..df942d9 100644 +--- a/panels/network/wireless-security/eap-method-ttls.ui ++++ b/panels/network/wireless-security/eap-method-ttls.ui +@@ -23,7 +23,7 @@ + False + 4 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui b/panels/network/wireless-security/ws-dynamic-wep.ui +index cf31f12..d6bc12b 100644 +--- a/panels/network/wireless-security/ws-dynamic-wep.ui ++++ b/panels/network/wireless-security/ws-dynamic-wep.ui +@@ -23,7 +23,7 @@ + False + 3 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui +index b4d9bec..06cb645 100644 +--- a/panels/network/wireless-security/ws-leap.ui ++++ b/panels/network/wireless-security/ws-leap.ui +@@ -13,7 +13,7 @@ + start + 3 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui +index c0e5f55..a4e14dc 100644 +--- a/panels/network/wireless-security/ws-wep-key.ui ++++ b/panels/network/wireless-security/ws-wep-key.ui +@@ -46,7 +46,7 @@ + False + 4 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui +index 942af88..5d71936 100644 +--- a/panels/network/wireless-security/ws-wpa-eap.ui ++++ b/panels/network/wireless-security/ws-wpa-eap.ui +@@ -23,7 +23,7 @@ + False + 2 + 2 +- 12 ++ 6 + 6 + + +diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui +index b34720a..3c689d3 100644 +--- a/panels/network/wireless-security/ws-wpa-psk.ui ++++ b/panels/network/wireless-security/ws-wpa-psk.ui +@@ -12,7 +12,7 @@ + False + 3 + 2 +- 12 ++ 6 + 6 + + diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/nm-default.h gnome-control-center-3.22.1/panels/network/wireless-security/nm-default.h --- gnome-control-center-3.20.2/panels/network/wireless-security/nm-default.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/nm-default.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,47 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2015 Red Hat, Inc. + */ + +#ifndef __NM_DEFAULT_H__ +#define __NM_DEFAULT_H__ + +#define LIBNM_GLIB_BUILD +#define NETWORKMANAGER_COMPILATION + +/*****************************************************************************/ + +/* always include these headers for our internal source files. */ + +#ifndef ___CONFIG_H__ +#define ___CONFIG_H__ +#include +#endif + +#include + +#include + +/*****************************************************************************/ + +#include + +/*****************************************************************************/ + +#endif /* __NM_DEFAULT_H__ */ diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/utils.c gnome-control-center-3.22.1/panels/network/wireless-security/utils.c --- gnome-control-center-3.20.2/panels/network/wireless-security/utils.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/utils.c 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,77 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager Applet -- allow user control over networking + * + * Dan Williams + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2007 - 2015 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include +#include + +#include "utils.h" + +/** + * Filters the characters from a text that was just input into GtkEditable. + * Returns FALSE, if after filtering no characters were left. TRUE means, + * that valid characters were added and the content of the GtkEditable changed. + **/ +gboolean +utils_filter_editable_on_insert_text (GtkEditable *editable, + const gchar *text, + gint length, + gint *position, + void *user_data, + UtilsFilterGtkEditableFunc validate_character, + gpointer block_func) +{ + int i, count = 0; + gchar *result = g_new (gchar, length+1); + + for (i = 0; i < length; i++) { + if (validate_character (text[i])) + result[count++] = text[i]; + } + result[count] = 0; + + if (count > 0) { + if (block_func) { + g_signal_handlers_block_by_func (G_OBJECT (editable), + G_CALLBACK (block_func), + user_data); + } + gtk_editable_insert_text (editable, result, count, position); + if (block_func) { + g_signal_handlers_unblock_by_func (G_OBJECT (editable), + G_CALLBACK (block_func), + user_data); + } + } + g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text"); + + g_free (result); + + return count > 0; +} + +gboolean +utils_char_is_ascii_print (char character) +{ + return g_ascii_isprint (character); +} diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/utils.h gnome-control-center-3.22.1/panels/network/wireless-security/utils.h --- gnome-control-center-3.20.2/panels/network/wireless-security/utils.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/utils.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,44 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager Applet -- allow user control over networking + * + * Dan Williams + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2007 - 2015 Red Hat, Inc. + */ + +#include +#include + +gboolean utils_char_is_ascii_print (char character); + +#define NMA_ERROR (g_quark_from_static_string ("nma-error-quark")) + +typedef enum { + NMA_ERROR_GENERIC +} NMAError; + +typedef gboolean (*UtilsFilterGtkEditableFunc) (char character); +gboolean utils_filter_editable_on_insert_text (GtkEditable *editable, + const gchar *text, + gint length, + gint *position, + void *user_data, + UtilsFilterGtkEditableFunc validate_character, + gpointer block_func); + +extern void widget_set_error (GtkWidget *widget); +extern void widget_unset_error (GtkWidget *widget); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.c gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.c --- gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,29 +17,20 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2012 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include -#include -#include -#include - -#include -#include -#include -#include -#include - #include "wireless-security.h" #include "wireless-security-resources.h" #include "eap-method.h" +#include "utils.h" GType -wireless_security_get_g_type (void) +wireless_security_get_type (void) { static GType type_id = 0; @@ -47,8 +38,8 @@ g_resources_register (wireless_security_get_resource ()); type_id = g_boxed_type_register_static ("CcWirelessSecurity", - (GBoxedCopyFunc) wireless_security_ref, - (GBoxedFreeFunc) wireless_security_unref); + (GBoxedCopyFunc) wireless_security_ref, + (GBoxedFreeFunc) wireless_security_unref); } return type_id; @@ -83,12 +74,18 @@ } gboolean -wireless_security_validate (WirelessSecurity *sec, const GByteArray *ssid) +wireless_security_validate (WirelessSecurity *sec, GError **error) { + gboolean result; + g_return_val_if_fail (sec != NULL, FALSE); + g_return_val_if_fail (!error || !*error, FALSE); g_assert (sec->validate); - return (*(sec->validate)) (sec, ssid); + result = (*(sec->validate)) (sec, error); + if (!result && error && !*error) + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Unknown error validating 802.1x security")); + return result; } void @@ -143,6 +140,12 @@ if (sec->destroy) sec->destroy (sec); + g_free (sec->username); + if (sec->password) { + memset (sec->password, 0, strlen (sec->password)); + g_free (sec->password); + } + if (sec->builder) g_object_unref (sec->builder); if (sec->ui_widget) @@ -179,7 +182,6 @@ sec->add_to_size_group = add_to_size_group; sec->fill_connection = fill_connection; sec->update_secrets = update_secrets; - sec->destroy = destroy; sec->default_field = default_field; sec->builder = gtk_builder_new (); @@ -200,27 +202,74 @@ } g_object_ref_sink (sec->ui_widget); + sec->destroy = destroy; sec->adhoc_compatible = TRUE; + sec->hotspot_compatible = TRUE; return sec; } -GtkWidget * -wireless_security_nag_user (WirelessSecurity *sec) +gboolean +wireless_security_adhoc_compatible (WirelessSecurity *sec) { - g_return_val_if_fail (sec != NULL, NULL); + g_return_val_if_fail (sec != NULL, FALSE); - if (sec->nag_user) - return (*(sec->nag_user)) (sec); - return NULL; + return sec->adhoc_compatible; } gboolean -wireless_security_adhoc_compatible (WirelessSecurity *sec) +wireless_security_hotspot_compatible (WirelessSecurity *sec) { g_return_val_if_fail (sec != NULL, FALSE); - return sec->adhoc_compatible; + return sec->hotspot_compatible; +} + +void +wireless_security_set_userpass (WirelessSecurity *sec, + const char *user, + const char *password, + gboolean always_ask, + gboolean show_password) +{ + g_free (sec->username); + sec->username = g_strdup (user); + + if (sec->password) { + memset (sec->password, 0, strlen (sec->password)); + g_free (sec->password); + } + sec->password = g_strdup (password); + + if (always_ask != (gboolean) -1) + sec->always_ask = always_ask; + sec->show_password = show_password; +} + +void +wireless_security_set_userpass_802_1x (WirelessSecurity *sec, + NMConnection *connection) +{ + const char *user = NULL, *password = NULL; + gboolean always_ask = FALSE, show_password = FALSE; + NMSetting8021x *setting; + NMSettingSecretFlags flags; + + if (!connection) + goto set; + + setting = nm_connection_get_setting_802_1x (connection); + if (!setting) + goto set; + + user = nm_setting_802_1x_get_identity (setting); + password = nm_setting_802_1x_get_password (setting); + + if (nm_setting_get_secret_flags (NM_SETTING (setting), NM_SETTING_802_1X_PASSWORD, &flags, NULL)) + always_ask = !!(flags & NM_SETTING_SECRET_FLAG_NOT_SAVED); + +set: + wireless_security_set_userpass (sec, user, password, always_ask, show_password); } void @@ -265,7 +314,7 @@ } gboolean -ws_802_1x_validate (WirelessSecurity *sec, const char *combo_name) +ws_802_1x_validate (WirelessSecurity *sec, const char *combo_name, GError **error) { GtkWidget *widget; GtkTreeModel *model; @@ -280,7 +329,7 @@ gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1); g_assert (eap); - valid = eap_method_validate (eap); + valid = eap_method_validate (eap, error); eap_method_unref (eap); return valid; } @@ -347,12 +396,14 @@ EAPMethodSimple *em_md5; EAPMethodTLS *em_tls; EAPMethodLEAP *em_leap; + EAPMethodSimple *em_pwd; EAPMethodFAST *em_fast; EAPMethodTTLS *em_ttls; EAPMethodPEAP *em_peap; const char *default_method = NULL, *ctype = NULL; int active = -1, item = 0; gboolean wired = FALSE; + EAPMethodSimpleFlags simple_flags = EAP_METHOD_SIMPLE_FLAG_NONE; /* Grab the default EAP method out of the security object */ if (connection) { @@ -371,15 +422,18 @@ default_method = nm_setting_802_1x_get_eap_method (s_8021x, 0); } - auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_g_type ()); + /* initialize WirelessSecurity userpass from connection (clear if no connection) */ + wireless_security_set_userpass_802_1x (sec, connection); + + auth_model = gtk_list_store_new (2, G_TYPE_STRING, eap_method_get_type ()); + + if (is_editor) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_IS_EDITOR; + if (secrets_only) + simple_flags |= EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY; if (wired) { - em_md5 = eap_method_simple_new (sec, - connection, - EAP_METHOD_SIMPLE_TYPE_MD5, - FALSE, - is_editor, - secrets_only); + em_md5 = eap_method_simple_new (sec, connection, EAP_METHOD_SIMPLE_TYPE_MD5, simple_flags); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, AUTH_NAME_COLUMN, _("MD5"), @@ -415,6 +469,17 @@ item++; } + em_pwd = eap_method_simple_new (sec, connection, EAP_METHOD_SIMPLE_TYPE_PWD, simple_flags); + gtk_list_store_append (auth_model, &iter); + gtk_list_store_set (auth_model, &iter, + AUTH_NAME_COLUMN, _("PWD"), + AUTH_METHOD_COLUMN, em_pwd, + -1); + eap_method_unref (EAP_METHOD (em_pwd)); + if (default_method && (active < 0) && !strcmp (default_method, "pwd")) + active = item; + item++; + em_fast = eap_method_fast_new (sec, connection, is_editor, secrets_only); gtk_list_store_append (auth_model, &iter); gtk_list_store_set (auth_model, &iter, @@ -472,17 +537,26 @@ NMConnection *connection) { GtkWidget *widget; - NMSettingWireless *s_wireless; NMSettingWirelessSecurity *s_wireless_sec; NMSetting8021x *s_8021x; + NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE; EAPMethod *eap = NULL; GtkTreeModel *model; GtkTreeIter iter; - s_wireless = nm_connection_get_setting_wireless (connection); - g_assert (s_wireless); + /* Get the EAPMethod object */ + widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, combo_name)); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); + gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); + gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1); + g_assert (eap); - g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); + /* Get previous pasword flags, if any. Otherwise default to agent-owned secrets */ + s_8021x = nm_connection_get_setting_802_1x (connection); + if (s_8021x) + nm_setting_get_secret_flags (NM_SETTING (s_8021x), eap->password_flags_name, &secret_flags, NULL); + else + secret_flags = NM_SETTING_SECRET_FLAG_AGENT_OWNED; /* Blow away the old wireless security setting by adding a clear one */ s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); @@ -492,13 +566,7 @@ s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); nm_connection_add_setting (connection, (NMSetting *) s_8021x); - widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, combo_name)); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); - gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1); - g_assert (eap); - - eap_method_fill_connection (eap, connection); + eap_method_fill_connection (eap, connection, secret_flags); eap_method_unref (eap); } @@ -532,23 +600,3 @@ } } -GtkWidget * -ws_802_1x_nag_user (WirelessSecurity *sec, - const char *combo_name) -{ - GtkTreeModel *model; - GtkTreeIter iter; - EAPMethod *eap = NULL; - GtkWidget *widget; - - widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, combo_name)); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter); - gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1); - g_return_val_if_fail (eap != NULL, NULL); - - widget = eap_method_nag_user (eap); - eap_method_unref (eap); - return widget; -} - diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.gresource.xml gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.gresource.xml --- gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.gresource.xml 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.gresource.xml 2016-08-12 12:43:57.000000000 +0000 @@ -7,7 +7,6 @@ eap-method-simple.ui eap-method-tls.ui eap-method-ttls.ui - nag-user-dialog.ui ws-dynamic-wep.ui ws-leap.ui ws-wep-key.ui diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.h gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.h --- gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,16 +17,24 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WIRELESS_SECURITY_H #define WIRELESS_SECURITY_H +#define LIBNM_GLIB_BUILD + #include #include +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _WirelessSecurity WirelessSecurity; @@ -36,7 +44,7 @@ typedef void (*WSFillConnectionFunc) (WirelessSecurity *sec, NMConnection *connection); typedef void (*WSUpdateSecretsFunc) (WirelessSecurity *sec, NMConnection *connection); typedef void (*WSDestroyFunc) (WirelessSecurity *sec); -typedef gboolean (*WSValidateFunc) (WirelessSecurity *sec, const GByteArray *ssid); +typedef gboolean (*WSValidateFunc) (WirelessSecurity *sec, GError **error); typedef GtkWidget * (*WSNagUserFunc) (WirelessSecurity *sec); struct _WirelessSecurity { @@ -48,12 +56,15 @@ gpointer changed_notify_data; const char *default_field; gboolean adhoc_compatible; + gboolean hotspot_compatible; + + char *username, *password; + gboolean always_ask, show_password; WSAddToSizeGroupFunc add_to_size_group; WSFillConnectionFunc fill_connection; WSUpdateSecretsFunc update_secrets; WSValidateFunc validate; - WSNagUserFunc nag_user; WSDestroyFunc destroy; }; @@ -66,7 +77,7 @@ WSChangedFunc func, gpointer user_data); -gboolean wireless_security_validate (WirelessSecurity *sec, const GByteArray *ssid); +gboolean wireless_security_validate (WirelessSecurity *sec, GError **error); void wireless_security_add_to_size_group (WirelessSecurity *sec, GtkSizeGroup *group); @@ -77,15 +88,23 @@ void wireless_security_update_secrets (WirelessSecurity *sec, NMConnection *connection); -GtkWidget * wireless_security_nag_user (WirelessSecurity *sec); - gboolean wireless_security_adhoc_compatible (WirelessSecurity *sec); +gboolean wireless_security_hotspot_compatible (WirelessSecurity *sec); + +void wireless_security_set_userpass (WirelessSecurity *sec, + const char *user, + const char *password, + gboolean always_ask, + gboolean show_password); +void wireless_security_set_userpass_802_1x (WirelessSecurity *sec, + NMConnection *connection); + WirelessSecurity *wireless_security_ref (WirelessSecurity *sec); void wireless_security_unref (WirelessSecurity *sec); -GType wireless_security_get_g_type (void); +GType wireless_security_get_type (void); /* Below for internal use only */ @@ -125,7 +144,7 @@ const char *vbox_name, GtkSizeGroup *size_group); -gboolean ws_802_1x_validate (WirelessSecurity *sec, const char *combo_name); +gboolean ws_802_1x_validate (WirelessSecurity *sec, const char *combo_name, GError **error); void ws_802_1x_add_to_size_group (WirelessSecurity *sec, GtkSizeGroup *size_group, @@ -140,8 +159,5 @@ const char *combo_name, NMConnection *connection); -GtkWidget * ws_802_1x_nag_user (WirelessSecurity *sec, - const char *combo_name); - #endif /* WIRELESS_SECURITY_H */ diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security-resources.c gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security-resources.c --- gnome-control-center-3.20.2/panels/network/wireless-security/wireless-security-resources.c 2016-10-11 14:27:48.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/wireless-security-resources.c 2016-10-11 12:15:18.000000000 +0000 @@ -6,74 +6,72 @@ # define SECTION #endif -static const SECTION union { const guint8 data[53986]; const double alignment; void * const ptr;} wireless_security_resource_data = { { +static const SECTION union { const guint8 data[50020]; const double alignment; void * const ptr;} wireless_security_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x11, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0xe0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x0b, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x37, 0x6f, 0xf4, 0x54, - 0x07, 0x00, 0x00, 0x00, 0xfc, 0x01, 0x00, 0x00, - 0x11, 0x00, 0x76, 0x00, 0x10, 0x02, 0x00, 0x00, - 0x3d, 0x1b, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, - 0x06, 0x00, 0x00, 0x00, 0x3d, 0x1b, 0x00, 0x00, - 0x06, 0x00, 0x4c, 0x00, 0x44, 0x1b, 0x00, 0x00, - 0x48, 0x1b, 0x00, 0x00, 0x4e, 0x1a, 0xa1, 0x6f, - 0x07, 0x00, 0x00, 0x00, 0x48, 0x1b, 0x00, 0x00, - 0x14, 0x00, 0x76, 0x00, 0x60, 0x1b, 0x00, 0x00, - 0x28, 0x2c, 0x00, 0x00, 0xd5, 0xbd, 0xd7, 0x0e, - 0x07, 0x00, 0x00, 0x00, 0x28, 0x2c, 0x00, 0x00, - 0x0d, 0x00, 0x76, 0x00, 0x38, 0x2c, 0x00, 0x00, - 0x7f, 0x35, 0x00, 0x00, 0x2c, 0xa1, 0xa6, 0xf3, - 0x07, 0x00, 0x00, 0x00, 0x7f, 0x35, 0x00, 0x00, - 0x0d, 0x00, 0x76, 0x00, 0x90, 0x35, 0x00, 0x00, - 0x5e, 0x4b, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, - 0xff, 0xff, 0xff, 0xff, 0x5e, 0x4b, 0x00, 0x00, - 0x01, 0x00, 0x4c, 0x00, 0x60, 0x4b, 0x00, 0x00, - 0x64, 0x4b, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, - 0x05, 0x00, 0x00, 0x00, 0x64, 0x4b, 0x00, 0x00, - 0x04, 0x00, 0x4c, 0x00, 0x68, 0x4b, 0x00, 0x00, - 0x6c, 0x4b, 0x00, 0x00, 0x87, 0xd4, 0x78, 0x32, - 0x0b, 0x00, 0x00, 0x00, 0x6c, 0x4b, 0x00, 0x00, - 0x08, 0x00, 0x4c, 0x00, 0x74, 0x4b, 0x00, 0x00, - 0xa4, 0x4b, 0x00, 0x00, 0xb2, 0xcd, 0xf3, 0x0a, - 0x07, 0x00, 0x00, 0x00, 0xa4, 0x4b, 0x00, 0x00, - 0x12, 0x00, 0x76, 0x00, 0xb8, 0x4b, 0x00, 0x00, - 0xb8, 0x60, 0x00, 0x00, 0xc8, 0x6f, 0xc6, 0x81, - 0x07, 0x00, 0x00, 0x00, 0xb8, 0x60, 0x00, 0x00, - 0x11, 0x00, 0x76, 0x00, 0xd0, 0x60, 0x00, 0x00, - 0x82, 0x6a, 0x00, 0x00, 0x12, 0x7b, 0x4f, 0xa4, - 0x07, 0x00, 0x00, 0x00, 0x82, 0x6a, 0x00, 0x00, - 0x12, 0x00, 0x76, 0x00, 0x98, 0x6a, 0x00, 0x00, - 0x95, 0x81, 0x00, 0x00, 0xce, 0xd7, 0x2c, 0x8d, - 0x01, 0x00, 0x00, 0x00, 0x95, 0x81, 0x00, 0x00, - 0x0f, 0x00, 0x4c, 0x00, 0xa4, 0x81, 0x00, 0x00, - 0xa8, 0x81, 0x00, 0x00, 0xab, 0x99, 0xd1, 0x05, - 0x07, 0x00, 0x00, 0x00, 0xa8, 0x81, 0x00, 0x00, - 0x12, 0x00, 0x76, 0x00, 0xc0, 0x81, 0x00, 0x00, - 0x42, 0x93, 0x00, 0x00, 0x86, 0x9f, 0x39, 0x7a, - 0x07, 0x00, 0x00, 0x00, 0x42, 0x93, 0x00, 0x00, - 0x12, 0x00, 0x76, 0x00, 0x58, 0x93, 0x00, 0x00, - 0x62, 0xa0, 0x00, 0x00, 0x0c, 0x3e, 0x1c, 0xeb, - 0x07, 0x00, 0x00, 0x00, 0x62, 0xa0, 0x00, 0x00, - 0x0a, 0x00, 0x76, 0x00, 0x70, 0xa0, 0x00, 0x00, - 0x8f, 0xad, 0x00, 0x00, 0xed, 0x77, 0xc3, 0x29, - 0x07, 0x00, 0x00, 0x00, 0x8f, 0xad, 0x00, 0x00, - 0x0d, 0x00, 0x76, 0x00, 0xa0, 0xad, 0x00, 0x00, - 0xb1, 0xbb, 0x00, 0x00, 0x8a, 0x92, 0x22, 0xae, - 0x07, 0x00, 0x00, 0x00, 0xb1, 0xbb, 0x00, 0x00, - 0x12, 0x00, 0x76, 0x00, 0xc8, 0xbb, 0x00, 0x00, - 0xe2, 0xd2, 0x00, 0x00, 0x65, 0x61, 0x70, 0x2d, - 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x74, - 0x6c, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0x1d, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xb0, 0xb7, 0x24, 0x30, 0x0a, 0x00, 0x00, 0x00, + 0xe0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0xe8, 0x01, 0x00, 0x00, 0xec, 0x01, 0x00, 0x00, + 0x12, 0x7b, 0x4f, 0xa4, 0x05, 0x00, 0x00, 0x00, + 0xec, 0x01, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0x00, 0x02, 0x00, 0x00, 0x3c, 0x19, 0x00, 0x00, + 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, + 0x3c, 0x19, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x40, 0x19, 0x00, 0x00, 0x44, 0x19, 0x00, 0x00, + 0xd5, 0xbd, 0xd7, 0x0e, 0x05, 0x00, 0x00, 0x00, + 0x44, 0x19, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, + 0x58, 0x19, 0x00, 0x00, 0x9f, 0x22, 0x00, 0x00, + 0x86, 0x9f, 0x39, 0x7a, 0x05, 0x00, 0x00, 0x00, + 0x9f, 0x22, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0xb8, 0x22, 0x00, 0x00, 0xc6, 0x2f, 0x00, 0x00, + 0x87, 0xd4, 0x78, 0x32, 0x0f, 0x00, 0x00, 0x00, + 0xc6, 0x2f, 0x00, 0x00, 0x08, 0x00, 0x4c, 0x00, + 0xd0, 0x2f, 0x00, 0x00, 0xfc, 0x2f, 0x00, 0x00, + 0x37, 0x6f, 0xf4, 0x54, 0x05, 0x00, 0x00, 0x00, + 0xfc, 0x2f, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, + 0x10, 0x30, 0x00, 0x00, 0xda, 0x4b, 0x00, 0x00, + 0xc8, 0x6f, 0xc6, 0x81, 0x05, 0x00, 0x00, 0x00, + 0xda, 0x4b, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, + 0xf0, 0x4b, 0x00, 0x00, 0xa2, 0x55, 0x00, 0x00, + 0x8a, 0x92, 0x22, 0xae, 0x05, 0x00, 0x00, 0x00, + 0xa2, 0x55, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0xb8, 0x55, 0x00, 0x00, 0x6c, 0x6f, 0x00, 0x00, + 0xab, 0x99, 0xd1, 0x05, 0x05, 0x00, 0x00, 0x00, + 0x6c, 0x6f, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0x80, 0x6f, 0x00, 0x00, 0x9c, 0x83, 0x00, 0x00, + 0x4b, 0x50, 0x90, 0x0b, 0x02, 0x00, 0x00, 0x00, + 0x9c, 0x83, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0xa0, 0x83, 0x00, 0x00, 0xa4, 0x83, 0x00, 0x00, + 0x0c, 0x3e, 0x1c, 0xeb, 0x05, 0x00, 0x00, 0x00, + 0xa4, 0x83, 0x00, 0x00, 0x0a, 0x00, 0x76, 0x00, + 0xb0, 0x83, 0x00, 0x00, 0xd3, 0x90, 0x00, 0x00, + 0x2c, 0xa1, 0xa6, 0xf3, 0x05, 0x00, 0x00, 0x00, + 0xd3, 0x90, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, + 0xe0, 0x90, 0x00, 0x00, 0xb3, 0xa6, 0x00, 0x00, + 0xed, 0x77, 0xc3, 0x29, 0x05, 0x00, 0x00, 0x00, + 0xb3, 0xa6, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, + 0xc0, 0xa6, 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, + 0x4e, 0x1a, 0xa1, 0x6f, 0x05, 0x00, 0x00, 0x00, + 0x00, 0xb5, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, + 0x18, 0xb5, 0x00, 0x00, 0x4f, 0xc3, 0x00, 0x00, + 0xce, 0xd7, 0x2c, 0x8d, 0x00, 0x00, 0x00, 0x00, + 0x4f, 0xc3, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, + 0x60, 0xc3, 0x00, 0x00, 0x64, 0xc3, 0x00, 0x00, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x65, 0x61, 0x70, 0x2d, + 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x66, + 0x61, 0x73, 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, + 0x2c, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -87,99 +85,160 @@ 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x6e, 0x6f, - 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x38, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x38, 0x22, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, + 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, + 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x39, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, + 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, + 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, + 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x41, 0x6e, 0x6f, 0x6e, 0x79, + 0x6d, 0x6f, 0x75, 0x73, 0x3c, 0x2f, 0x63, 0x6f, + 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, + 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, + 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x68, + 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x64, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, + 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, + 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x42, 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, + 0x74, 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, + 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, - 0x6c, 0x73, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x74, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x49, 0x5f, 0x64, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, + 0x61, 0x73, 0x74, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, + 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, + 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x5f, + 0x6d, 0x6f, 0x75, 0x73, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, @@ -192,74 +251,33 @@ 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, - 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x69, - 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, - 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, + 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x65, + 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x65, 0x6e, + 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, + 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -268,116 +286,196 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x55, 0x73, 0x65, 0x72, 0x20, 0x63, 0x65, 0x72, - 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x63, - 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, + 0x74, 0x5f, 0x70, 0x61, 0x63, 0x5f, 0x66, 0x69, + 0x6c, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, - 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x50, 0x41, 0x43, 0x20, 0x5f, + 0x66, 0x69, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, + 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x70, + 0x61, 0x63, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x43, + 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, + 0x73, 0x74, 0x5f, 0x70, 0x61, 0x63, 0x5f, 0x66, + 0x69, 0x6c, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, 0x63, 0x65, - 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, + 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, + 0x75, 0x74, 0x68, 0x5f, 0x76, 0x62, 0x6f, 0x78, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, - 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -385,170 +483,57 @@ 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x69, - 0x6c, 0x65, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, - 0x72, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, - 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x6e, + 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, - 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x20, 0x5f, 0x6b, - 0x65, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, - 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, - 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x43, - 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x20, + 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, + 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, + 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, @@ -568,20 +553,17 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, - 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, - 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, + 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x66, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x6e, 0x6e, + 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, + 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -594,167 +576,175 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x20, 0x6b, 0x65, 0x79, 0x20, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, - 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, - 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b, - 0x65, 0x79, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, - 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, + 0x3e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, + 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, + 0x72, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, - 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, - 0x77, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x65, 0x61, - 0x70, 0x74, 0x6c, 0x73, 0x22, 0x3e, 0x3c, 0x70, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, + 0x73, 0x74, 0x5f, 0x70, 0x61, 0x63, 0x5f, 0x70, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, + 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x61, 0x75, + 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x20, + 0x50, 0x41, 0x43, 0x20, 0x70, 0x72, 0x6f, 0x5f, + 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, + 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, + 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x61, + 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, + 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, - 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x39, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x65, 0x72, 0x39, 0x22, 0x2f, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, + 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, @@ -770,13 +760,13 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, @@ -786,104 +776,49 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x43, - 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x63, - 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x36, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x33, 0x34, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x6e, 0x6f, - 0x6d, 0x65, 0x2f, 0x00, 0x0b, 0x00, 0x00, 0x00, - 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, 0x74, 0x68, - 0x6f, 0x64, 0x2d, 0x73, 0x69, 0x6d, 0x70, 0x6c, - 0x65, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0xb8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x2f, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x77, 0x73, 0x2d, 0x77, + 0x70, 0x61, 0x2d, 0x65, 0x61, 0x70, 0x2e, 0x75, + 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x37, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -897,38 +832,62 @@ 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, - 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, - 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x35, 0x22, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, + 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, + 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, + 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, + 0x61, 0x70, 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, - 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, + 0x65, 0x61, 0x70, 0x5f, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -941,7 +900,7 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, - 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x33, 0x3c, + 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -959,189 +918,410 @@ 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, - 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, - 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, - 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, + 0x70, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, - 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, - 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, + 0x75, 0x5f, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, 0x70, 0x5f, + 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, + 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, + 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, + 0x70, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, + 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, + 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, 0x70, + 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, + 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x73, - 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x33, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, + 0x61, 0x70, 0x2d, 0x6d, 0x65, 0x74, 0x68, 0x6f, + 0x64, 0x2d, 0x6c, 0x65, 0x61, 0x70, 0x2e, 0x75, + 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xfe, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, + 0x70, 0x5f, 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x6e, + 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, + 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x39, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, + 0x73, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x55, + 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, 0x61, + 0x70, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, + 0x5f, 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, + 0x61, 0x70, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, + 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, @@ -1153,24 +1333,103 @@ 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6d, - 0x70, 0x6c, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, - 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, - 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x22, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, 0x61, + 0x70, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x65, 0x61, 0x70, 0x6c, 0x65, + 0x61, 0x70, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, + 0x6f, 0x5f, 0x77, 0x20, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, @@ -1187,697 +1446,123 @@ 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x6d, 0x65, 0x6e, 0x74, 0x31, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, - 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x61, 0x6c, - 0x77, 0x61, 0x79, 0x73, 0x5f, 0x61, 0x73, 0x6b, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x41, 0x73, 0x5f, 0x6b, - 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x69, - 0x73, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, - 0x20, 0x74, 0x69, 0x6d, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x5f, 0x65, 0x61, 0x70, 0x73, 0x69, - 0x6d, 0x70, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, - 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, - 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, - 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x33, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, - 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x77, 0x73, 0x2d, 0x77, 0x70, 0x61, 0x2d, 0x65, - 0x61, 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0x37, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, - 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x35, 0x22, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, - 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, - 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, - 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, - 0x61, 0x70, 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, - 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, - 0x65, 0x61, 0x70, 0x5f, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, - 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, - 0x70, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, - 0x75, 0x5f, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, 0x70, 0x5f, - 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, - 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, - 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, - 0x70, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, - 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, - 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, - 0x35, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x77, 0x70, 0x61, 0x5f, 0x65, 0x61, 0x70, - 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, - 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x33, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, - 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x77, - 0x73, 0x2d, 0x77, 0x65, 0x70, 0x2d, 0x6b, 0x65, - 0x79, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0xbe, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, - 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x34, 0x22, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, - 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x31, 0x20, - 0x28, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x29, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, - 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, - 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, - 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, - 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x33, 0x22, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, - 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, - 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, - 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, - 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, - 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x53, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, - 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x53, 0x68, 0x61, 0x72, 0x65, - 0x64, 0x20, 0x4b, 0x65, 0x79, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, - 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, - 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, 0x61, 0x70, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, - 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x36, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, - 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x34, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x34, 0x33, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, + 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x0d, 0x00, 0x00, 0x00, 0x65, 0x61, 0x70, 0x2d, + 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x74, + 0x6c, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0xba, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, + 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x6e, 0x6f, + 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -1890,223 +1575,167 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x5f, 0x4b, 0x65, 0x79, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x77, - 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x38, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, - 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x33, 0x31, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, + 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x6c, 0x73, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, + 0x69, 0x74, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x5f, 0x77, 0x65, 0x70, 0x22, 0x3e, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x49, 0x5f, 0x64, 0x65, + 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, - 0x6b, 0x65, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, + 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x69, + 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, + 0x74, 0x79, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, - 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, - 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, - 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 0x5f, - 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, + 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x75, 0x73, 0x65, + 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, @@ -2127,108 +1756,36 @@ 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, - 0x75, 0x5f, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x74, - 0x68, 0x6f, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x62, - 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, - 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, - 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5f, - 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, - 0x3e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, - 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, - 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, - 0x72, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x55, 0x73, 0x65, 0x72, 0x20, 0x63, 0x65, 0x72, + 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x63, + 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -2239,53 +1796,53 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, - 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6b, 0x65, 0x79, 0x5f, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, + 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, 0x63, 0x65, + 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x57, 0x45, - 0x50, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x5f, 0x78, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x5f, 0x63, 0x6f, 0x6d, 0x62, - 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, @@ -2313,11 +1870,13 @@ 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, - 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6b, 0x65, 0x79, 0x5f, - 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5f, 0x63, 0x6f, - 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x69, + 0x6c, 0x65, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, + 0x72, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, + 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -2325,324 +1884,137 @@ 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x34, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, - 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x34, - 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, - 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x32, 0x33, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, - 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x2f, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, - 0x01, 0x00, 0x00, 0x00, 0x6e, 0x65, 0x74, 0x77, - 0x6f, 0x72, 0x6b, 0x2f, 0x0a, 0x00, 0x00, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x0f, 0x00, 0x00, 0x00, 0x6e, 0x61, 0x67, 0x2d, - 0x75, 0x73, 0x65, 0x72, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0xf0, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, - 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x32, 0x2e, - 0x36, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, - 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, - 0x61, 0x67, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, - 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, - 0x6f, 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x34, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, - 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x34, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, - 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x77, - 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, - 0x7a, 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, + 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, + 0x6e, 0x6f, 0x74, 0x5f, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, + 0x63, 0x6b, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4e, 0x6f, 0x20, 0x43, 0x41, 0x20, 0x63, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x20, 0x69, 0x73, 0x20, 0x5f, 0x72, + 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x61, 0x6c, 0x65, 0x72, 0x74, - 0x20, 0x74, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x70, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, - 0x75, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x69, 0x67, 0x6e, 0x6f, - 0x72, 0x65, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x44, - 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x5f, 0x77, 0x61, - 0x72, 0x6e, 0x20, 0x6d, 0x65, 0x20, 0x61, 0x67, - 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -2651,92 +2023,198 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, + 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x20, 0x5f, + 0x6b, 0x65, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, + 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x46, 0x69, 0x6c, 0x65, + 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x74, 0x6c, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, + 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, + 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, - 0x72, 0x65, 0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, - 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x6c, + 0x73, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -2749,362 +2227,216 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, - 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x33, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x73, 0x63, 0x61, 0x6c, 0x65, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, - 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, - 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, - 0x6e, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x37, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, - 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x32, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, - 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x65, + 0x61, 0x70, 0x74, 0x6c, 0x73, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, - 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6f, - 0x6b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x36, 0x22, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x46, 0x69, 0x6c, 0x65, 0x43, 0x68, 0x6f, 0x6f, + 0x73, 0x65, 0x72, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x61, 0x70, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x75, + 0x73, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x59, 0x65, 0x73, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x33, + 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x2d, 0x39, - 0x22, 0x3e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, - 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, - 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, - 0x2d, 0x38, 0x22, 0x3e, 0x63, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x77, 0x73, 0x2d, 0x64, 0x79, 0x6e, 0x61, 0x6d, - 0x69, 0x63, 0x2d, 0x77, 0x65, 0x70, 0x2e, 0x75, - 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, + 0x79, 0x29, 0x77, 0x73, 0x2d, 0x64, 0x79, 0x6e, + 0x61, 0x6d, 0x69, 0x63, 0x2d, 0x77, 0x65, 0x70, + 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, @@ -3416,9 +2748,9 @@ 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x66, 0x61, 0x73, - 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0xed, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x70, 0x65, 0x61, + 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0xa4, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -3432,179 +2764,199 @@ 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x6e, - 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, - 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x38, 0x22, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, + 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, + 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x33, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, - 0x77, 0x73, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x39, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, + 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, + 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, + 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, + 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x63, 0x6f, + 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, + 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, + 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x56, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, + 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x56, 0x65, 0x72, + 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x3c, 0x2f, + 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, + 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, + 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, + 0x61, 0x70, 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, - 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, - 0x6e, 0x6f, 0x6e, 0x79, 0x5f, 0x6d, 0x6f, 0x75, - 0x73, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, - 0x66, 0x61, 0x73, 0x74, 0x5f, 0x61, 0x6e, 0x6f, + 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x70, 0x65, 0x61, 0x70, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x61, 0x6e, - 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, - 0x69, 0x74, 0x79, 0x5f, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x41, 0x6e, 0x6f, 0x6e, 0x79, + 0x5f, 0x6d, 0x6f, 0x75, 0x73, 0x20, 0x69, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, + 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, + 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x70, - 0x61, 0x63, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, + 0x70, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, + 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -3613,33 +2965,76 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x50, 0x41, 0x43, 0x20, 0x5f, 0x66, 0x69, 0x6c, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, + 0x61, 0x70, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, + 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x66, - 0x61, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x63, 0x5f, - 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x62, 0x75, 0x74, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, 0x63, + 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, + 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, + 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, + 0x70, 0x65, 0x61, 0x70, 0x5f, 0x63, 0x61, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, @@ -3647,12 +3042,12 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -3672,112 +3067,266 @@ 0x46, 0x69, 0x6c, 0x65, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, - 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, - 0x70, 0x61, 0x63, 0x5f, 0x66, 0x69, 0x6c, 0x65, - 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, 0x5f, + 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, + 0x65, 0x61, 0x70, 0x5f, 0x63, 0x61, 0x5f, 0x63, + 0x65, 0x72, 0x74, 0x5f, 0x6e, 0x6f, 0x74, 0x5f, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, + 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x6f, 0x20, + 0x43, 0x41, 0x20, 0x63, 0x65, 0x72, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x69, + 0x73, 0x20, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, + 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, 0x5f, 0x69, + 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, + 0x68, 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, + 0x65, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x49, 0x6e, 0x6e, 0x65, 0x72, 0x20, 0x61, 0x75, + 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, + 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, 0x5f, 0x69, + 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, + 0x68, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x6e, - 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, - 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, - 0x73, 0x74, 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, - 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, + 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, + 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, + 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, + 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -3790,172 +3339,105 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x49, - 0x6e, 0x6e, 0x65, 0x72, 0x20, 0x61, 0x75, 0x74, - 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, - 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x6e, - 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, - 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x38, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, + 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x38, + 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, - 0x74, 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, - 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, - 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x38, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, - 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, - 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x38, 0x22, - 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, + 0x61, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, - 0x61, 0x70, 0x5f, 0x66, 0x61, 0x73, 0x74, 0x5f, - 0x70, 0x61, 0x63, 0x5f, 0x70, 0x72, 0x6f, 0x76, - 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x41, 0x43, - 0x20, 0x70, 0x72, 0x6f, 0x5f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x50, 0x45, 0x41, 0x50, 0x20, + 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, + 0x61, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, + 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, @@ -3963,12 +3445,12 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -3986,88 +3468,10 @@ 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x66, - 0x61, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x63, 0x5f, - 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, - 0x6e, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x39, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, - 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, - 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x39, 0x22, 0x2f, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x36, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, + 0x65, 0x61, 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -4077,89 +3481,101 @@ 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x39, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, + 0x64, 0x65, 0x72, 0x65, 0x72, 0x39, 0x22, 0x2f, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, + 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x38, 0x22, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, - 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, - 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, - 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, - 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, - 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x39, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, - 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, - 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, - 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x41, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, - 0x6f, 0x75, 0x73, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, - 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x68, 0x65, - 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, - 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x42, 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x2f, 0x07, 0x00, 0x00, 0x00, - 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, 0x74, 0x68, - 0x6f, 0x64, 0x2d, 0x74, 0x74, 0x6c, 0x73, 0x2e, - 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x72, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x36, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x65, 0x61, 0x70, 0x2d, + 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x74, + 0x74, 0x6c, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, + 0x0c, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -4303,250 +3719,11 @@ 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, - 0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, - 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, - 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, - 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, - 0x65, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, - 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, - 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, - 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, - 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x68, 0x6f, - 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, - 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, - 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x69, - 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, - 0x68, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x49, 0x6e, 0x6e, 0x65, 0x72, - 0x20, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, - 0x73, 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, - 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, - 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, @@ -4560,12 +3737,12 @@ 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, - 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, - 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, - 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, + 0x6c, 0x73, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, + 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, + 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -4574,128 +3751,41 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x22, 0x3e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, - 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, - 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, - 0x65, 0x72, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, - 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x6e, - 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, - 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, - 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, 0x63, + 0x65, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -4705,189 +3795,150 @@ 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, - 0x74, 0x68, 0x6f, 0x64, 0x2d, 0x6c, 0x65, 0x61, - 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0xfa, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, - 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, - 0x70, 0x5f, 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x6e, - 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, + 0x61, 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, + 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, + 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, - 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x39, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, - 0x73, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, - 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6b, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x68, 0x6f, + 0x6f, 0x73, 0x65, 0x72, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, + 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x55, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, 0x61, - 0x70, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, - 0x5f, 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x5f, 0x6e, 0x6f, 0x74, + 0x5f, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x6f, + 0x20, 0x43, 0x41, 0x20, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, + 0x69, 0x73, 0x20, 0x5f, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -4897,88 +3948,108 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, - 0x61, 0x70, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, + 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, + 0x75, 0x74, 0x68, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x6c, 0x65, 0x61, - 0x70, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x49, 0x6e, 0x6e, + 0x65, 0x72, 0x20, 0x61, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x74, + 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, + 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -4989,60 +4060,108 @@ 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x5f, 0x65, 0x61, 0x70, 0x6c, 0x65, - 0x61, 0x70, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, - 0x6f, 0x5f, 0x77, 0x20, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x61, 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, + 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, + 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, + 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, + 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x65, 0x72, 0x36, 0x22, 0x2f, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, + 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, - 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, - 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, + 0x70, 0x5f, 0x74, 0x74, 0x6c, 0x73, 0x5f, 0x69, + 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, + 0x68, 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, + 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, @@ -5051,33 +4170,31 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x75, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x34, 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -5086,62 +4203,25 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, - 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x77, 0x73, 0x2d, 0x6c, 0x65, 0x61, - 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0x0f, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2f, + 0x00, 0x00, 0x00, 0x00, 0x77, 0x73, 0x2d, 0x6c, + 0x65, 0x61, 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, + 0x13, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -5197,6 +4277,11 @@ 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -5442,128 +4527,123 @@ 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x65, 0x61, 0x70, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x61, + 0x70, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, - 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x77, - 0x73, 0x2d, 0x77, 0x70, 0x61, 0x2d, 0x70, 0x73, - 0x6b, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, + 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x77, 0x73, 0x2d, 0x77, 0x65, + 0x70, 0x2d, 0x6b, 0x65, 0x79, 0x2e, 0x75, 0x69, + 0xc3, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -5577,248 +4657,204 @@ 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, - 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x6e, 0x6f, - 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x34, 0x22, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, + 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, + 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, + 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, + 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x31, 0x20, + 0x28, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x29, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, + 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, + 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, + 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, + 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x63, 0x6f, + 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, + 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, + 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x33, 0x22, + 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, + 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, + 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, + 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, + 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, + 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, + 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x53, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, + 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x53, 0x68, 0x61, 0x72, 0x65, + 0x64, 0x20, 0x4b, 0x65, 0x79, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, + 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, - 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x36, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, - 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x72, + 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, - 0x6b, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x6c, - 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3e, 0x36, - 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, - 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x54, - 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x4b, 0x65, 0x79, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x77, 0x70, 0x61, - 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x77, + 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x33, 0x32, 0x22, 0x3e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x77, 0x65, 0x70, 0x5f, 0x6b, 0x65, 0x79, + 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -5827,117 +4863,241 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x6c, 0x65, + 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x33, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x5f, 0x77, 0x70, 0x61, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x5f, 0x77, 0x65, 0x70, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x5f, 0x77, + 0x20, 0x6b, 0x65, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x74, + 0x68, 0x6f, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, 0x5f, 0x74, + 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, 0x75, 0x74, + 0x68, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, + 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6d, 0x65, + 0x74, 0x68, 0x6f, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, @@ -5949,6 +5109,27 @@ 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x33, 0x22, + 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -5965,203 +5146,33 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x32, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, - 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, - 0x29, 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, 0x74, - 0x68, 0x6f, 0x64, 0x2d, 0x70, 0x65, 0x61, 0x70, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0a, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, - 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x38, 0x22, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, - 0x61, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x20, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, - 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x39, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, - 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, - 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, - 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, - 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, - 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, - 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x20, 0x30, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x56, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, - 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, - 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, - 0x61, 0x70, 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, - 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x70, 0x65, 0x61, 0x70, 0x5f, 0x61, 0x6e, 0x6f, - 0x6e, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -6182,89 +5193,53 @@ 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x6e, 0x6f, 0x6e, 0x79, - 0x5f, 0x6d, 0x6f, 0x75, 0x73, 0x20, 0x69, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, - 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, 0x64, - 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, - 0x70, 0x5f, 0x61, 0x6e, 0x6f, 0x6e, 0x5f, 0x69, - 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x73, 0x22, 0x3e, 0x57, 0x45, 0x50, 0x20, 0x69, + 0x6e, 0x64, 0x65, 0x5f, 0x78, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6b, + 0x65, 0x79, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, - 0x61, 0x70, 0x5f, 0x63, 0x61, 0x5f, 0x63, 0x65, - 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -6277,65 +5252,115 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, + 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, + 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x65, 0x72, 0x34, 0x22, 0x2f, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, + 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x43, 0x5f, 0x41, 0x20, 0x63, - 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, - 0x70, 0x65, 0x61, 0x70, 0x5f, 0x63, 0x61, 0x5f, - 0x63, 0x65, 0x72, 0x74, 0x5f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, + 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x32, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x77, 0x73, 0x2d, 0x77, 0x70, + 0x61, 0x2d, 0x70, 0x73, 0x6b, 0x2e, 0x75, 0x69, + 0x30, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x46, 0x69, 0x6c, 0x65, 0x43, 0x68, 0x6f, 0x6f, - 0x73, 0x65, 0x72, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, - 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, 0x5f, - 0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, + 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x6e, 0x6f, + 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -6346,51 +5371,24 @@ 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, + 0x74, 0x61, 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, - 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, - 0x70, 0x65, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x6e, - 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, + 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -6401,230 +5399,355 @@ 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, - 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x70, 0x61, + 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, + 0x6b, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x6c, + 0x65, 0x6e, 0x67, 0x74, 0x68, 0x22, 0x3e, 0x36, + 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, - 0x70, 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, - 0x61, 0x75, 0x74, 0x68, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x22, 0x77, 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x54, + 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x77, 0x70, 0x61, + 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x49, 0x6e, - 0x6e, 0x65, 0x72, 0x20, 0x61, 0x75, 0x74, 0x68, - 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x33, 0x32, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, - 0x70, 0x65, 0x61, 0x70, 0x5f, 0x69, 0x6e, 0x6e, - 0x65, 0x72, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x5f, - 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x77, 0x70, 0x61, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, - 0x5f, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, - 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6d, 0x62, - 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, + 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, + 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, - 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x65, 0x72, 0x38, 0x22, 0x2f, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, - 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, - 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, + 0x70, 0x61, 0x5f, 0x70, 0x73, 0x6b, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x50, 0x45, 0x41, 0x50, 0x20, 0x5f, 0x76, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, 0x70, - 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, - 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, @@ -6636,24 +5759,22 @@ 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x61, 0x70, 0x5f, 0x70, 0x65, 0x61, - 0x70, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, - 0x6e, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -6664,50 +5785,223 @@ 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x22, 0x3e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x39, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, - 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, - 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x39, 0x22, 0x2f, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, + 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x65, 0x61, 0x70, 0x2d, 0x6d, 0x65, 0x74, 0x68, + 0x6f, 0x64, 0x2d, 0x73, 0x69, 0x6d, 0x70, 0x6c, + 0x65, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0x27, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, + 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, + 0x5f, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, + 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, + 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, + 0x72, 0x6f, 0x77, 0x73, 0x22, 0x3e, 0x33, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, + 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, + 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x61, + 0x70, 0x5f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x65, 0x61, 0x70, 0x5f, 0x73, + 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, @@ -6717,45 +6011,255 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x65, 0x61, 0x70, 0x5f, + 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x61, 0x70, 0x5f, 0x73, 0x69, 0x6d, + 0x70, 0x6c, 0x65, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x36, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x5f, 0x65, 0x61, 0x70, 0x73, 0x69, + 0x6d, 0x70, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x68, 0x6f, 0x5f, 0x77, 0x20, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, + 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, + 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29 + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x35, 0x33, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { wireless_security_resource_data.data, sizeof (wireless_security_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-dynamic-wep.c gnome-control-center-3.22.1/panels/network/wireless-security/ws-dynamic-wep.c --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-dynamic-wep.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-dynamic-wep.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include +#include "nm-default.h" + #include #include -#include #include "wireless-security.h" #include "eap-method.h" @@ -44,9 +44,9 @@ } static gboolean -validate (WirelessSecurity *parent, const GByteArray *ssid) +validate (WirelessSecurity *parent, GError **error) { - return ws_802_1x_validate (parent, "dynamic_wep_auth_combo"); + return ws_802_1x_validate (parent, "dynamic_wep_auth_combo", error); } static void @@ -75,11 +75,6 @@ g_assert (s_wireless_sec); g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x", NULL); - - nm_setting_wireless_security_add_pairwise (s_wireless_sec, "wep40"); - nm_setting_wireless_security_add_pairwise (s_wireless_sec, "wep104"); - nm_setting_wireless_security_add_group (s_wireless_sec, "wep40"); - nm_setting_wireless_security_add_group (s_wireless_sec, "wep104"); } static void @@ -94,12 +89,6 @@ sec->size_group); } -static GtkWidget * -nag_user (WirelessSecurity *parent) -{ - return ws_802_1x_nag_user (parent, "dynamic_wep_auth_combo"); -} - static void update_secrets (WirelessSecurity *parent, NMConnection *connection) { @@ -126,8 +115,8 @@ if (!parent) return NULL; - parent->nag_user = nag_user; parent->adhoc_compatible = FALSE; + parent->hotspot_compatible = FALSE; widget = ws_802_1x_auth_combo_init (parent, "dynamic_wep_auth_combo", diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-dynamic-wep.h gnome-control-center-3.22.1/panels/network/wireless-security/ws-dynamic-wep.h --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-dynamic-wep.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-dynamic-wep.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WS_DYNAMIC_WEP_H #define WS_DYNAMIC_WEP_H +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _WirelessSecurityDynamicWEP WirelessSecurityDynamicWEP; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.c gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.c --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,18 +17,22 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ +#include "nm-default.h" + #include -#include #include "wireless-security.h" #include "helpers.h" +#include "nma-ui-utils.h" +#include "utils.h" struct _WirelessSecurityLEAP { WirelessSecurity parent; - gboolean new_connection; + gboolean editing_connection; + const char *password_flags_name; }; static void @@ -45,7 +49,7 @@ } static gboolean -validate (WirelessSecurity *parent, const GByteArray *ssid) +validate (WirelessSecurity *parent, GError **error) { GtkWidget *entry; const char *text; @@ -56,20 +60,22 @@ text = gtk_entry_get_text (GTK_ENTRY (entry)); if (!text || !strlen (text)) { widget_set_error (entry); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing leap-username")); ret = FALSE; - } else { + } else widget_unset_error (entry); - } entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry")); g_assert (entry); text = gtk_entry_get_text (GTK_ENTRY (entry)); - if (!text || *text == '\0') { + if (!text || !strlen (text)) { widget_set_error (entry); - ret = FALSE; - } else { + if (ret) { + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing leap-password")); + ret = FALSE; + } + } else widget_unset_error (entry); - } return ret; } @@ -90,16 +96,11 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) { WirelessSecurityLEAP *sec = (WirelessSecurityLEAP *) parent; - NMSettingWireless *s_wireless; NMSettingWirelessSecurity *s_wireless_sec; - GtkWidget *widget; + NMSettingSecretFlags secret_flags; + GtkWidget *widget, *passwd_entry; const char *leap_password = NULL, *leap_username = NULL; - s_wireless = nm_connection_get_setting_wireless (connection); - g_assert (s_wireless); - - g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); - /* Blow away the old security setting by adding a clear one */ s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec); @@ -108,6 +109,7 @@ leap_username = gtk_entry_get_text (GTK_ENTRY (widget)); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry")); + passwd_entry = widget; leap_password = gtk_entry_get_text (GTK_ENTRY (widget)); g_object_set (s_wireless_sec, @@ -117,12 +119,15 @@ NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, leap_password, NULL); - /* Default to agent-owned secrets for new connections */ - if (sec->new_connection) { - g_object_set (s_wireless_sec, - NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED, - NULL); - } + /* Save LEAP_PASSWORD_FLAGS to the connection */ + secret_flags = nma_utils_menu_to_secret_flags (passwd_entry); + nm_setting_set_secret_flags (NM_SETTING (s_wireless_sec), sec->password_flags_name, + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ + if (sec->editing_connection) + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_wireless_sec), sec->password_flags_name); } static void @@ -168,14 +173,21 @@ } parent->adhoc_compatible = FALSE; + parent->hotspot_compatible = FALSE; sec = (WirelessSecurityLEAP *) parent; - sec->new_connection = secrets_only ? FALSE : TRUE; + sec->editing_connection = secrets_only ? FALSE : TRUE; + sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry")); g_assert (widget); g_signal_connect (G_OBJECT (widget), "changed", (GCallback) wireless_security_changed_cb, sec); + + /* Create password-storage popup menu for password entry under entry's secondary icon */ + nma_utils_setup_password_storage (widget, 0, (NMSetting *) wsec, sec->password_flags_name, + FALSE, secrets_only); + if (wsec) update_secrets (WIRELESS_SECURITY (sec), connection); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.h gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.h --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WS_LEAP_H #define WS_LEAP_H +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _WirelessSecurityLEAP WirelessSecurityLEAP; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.ui gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-leap.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-leap.ui 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ True False + start 3 2 6 @@ -69,7 +70,6 @@ True False True - 0 True diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.c gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.c --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,21 +17,24 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include -#include +#include "nm-default.h" -#include -#include +#include #include "wireless-security.h" +#include "utils.h" #include "helpers.h" +#include "nma-ui-utils.h" struct _WirelessSecurityWEPKey { WirelessSecurity parent; + gboolean editing_connection; + const char *password_flags_name; + NMWepKeyType type; char keys[4][65]; guint8 cur_index; @@ -62,7 +65,7 @@ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry")); key = gtk_entry_get_text (GTK_ENTRY (entry)); if (key) - strcpy (sec->keys[sec->cur_index], key); + g_strlcpy (sec->keys[sec->cur_index], key, sizeof (sec->keys[sec->cur_index])); else memset (sec->keys[sec->cur_index], 0, sizeof (sec->keys[sec->cur_index])); @@ -88,7 +91,7 @@ } static gboolean -validate (WirelessSecurity *parent, const GByteArray *ssid) +validate (WirelessSecurity *parent, GError **error) { WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent; GtkWidget *entry; @@ -101,31 +104,39 @@ key = gtk_entry_get_text (GTK_ENTRY (entry)); if (!key) { widget_set_error (entry); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing wep-key")); return FALSE; } if (sec->type == NM_WEP_KEY_TYPE_KEY) { if ((strlen (key) == 10) || (strlen (key) == 26)) { for (i = 0; i < strlen (key); i++) { - if (!isxdigit (key[i])) { + if (!g_ascii_isxdigit (key[i])) { widget_set_error (entry); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wep-key: key with a length of %zu must contain only hex-digits"), strlen (key)); return FALSE; } } } else if ((strlen (key) == 5) || (strlen (key) == 13)) { for (i = 0; i < strlen (key); i++) { - if (!isascii (key[i])) { + if (!utils_char_is_ascii_print (key[i])) { widget_set_error (entry); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wep-key: key with a length of %zu must contain only ascii characters"), strlen (key)); return FALSE; } } } else { widget_set_error (entry); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wep-key: wrong key length %zu. A key must be either of length 5/13 (ascii) or 10/26 (hex)"), strlen (key)); return FALSE; } } else if (sec->type == NM_WEP_KEY_TYPE_PASSPHRASE) { - if (!strlen (key) || (strlen (key) > 64)) { + if (!*key || (strlen (key) > 64)) { widget_set_error (entry); + if (!*key) + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wep-key: passphrase must be non-empty")); + else + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wep-key: passphrase must be shorter than 64 characters")); return FALSE; } } @@ -153,9 +164,9 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection) { WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent; - NMSettingWireless *s_wireless; NMSettingWirelessSecurity *s_wsec; - GtkWidget *widget; + NMSettingSecretFlags secret_flags; + GtkWidget *widget, *passwd_entry; gint auth_alg; const char *key; int i; @@ -164,13 +175,9 @@ auth_alg = gtk_combo_box_get_active (GTK_COMBO_BOX (widget)); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry")); + passwd_entry = widget; key = gtk_entry_get_text (GTK_ENTRY (widget)); - strcpy (sec->keys[sec->cur_index], key); - - s_wireless = nm_connection_get_setting_wireless (connection); - g_assert (s_wireless); - - g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); + g_strlcpy (sec->keys[sec->cur_index], key, sizeof (sec->keys[sec->cur_index])); /* Blow away the old security setting by adding a clear one */ s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); @@ -187,44 +194,32 @@ if (strlen (sec->keys[i])) nm_setting_wireless_security_set_wep_key (s_wsec, i, sec->keys[i]); } + + /* Save WEP_KEY_FLAGS to the connection */ + secret_flags = nma_utils_menu_to_secret_flags (passwd_entry); + g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ + if (sec->editing_connection) + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_wsec), sec->password_flags_name); } static void -wep_entry_filter_cb (GtkEntry * entry, - const gchar *text, - gint length, - gint * position, - gpointer data) +wep_entry_filter_cb (GtkEditable *editable, + gchar *text, + gint length, + gint *position, + gpointer data) { WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) data; - GtkEditable *editable = GTK_EDITABLE (entry); - int i, count = 0; - gchar *result; - - result = g_malloc0 (length + 1); if (sec->type == NM_WEP_KEY_TYPE_KEY) { - for (i = 0; i < length; i++) { - if (isxdigit(text[i]) || isascii(text[i])) - result[count++] = text[i]; - } - } else if (sec->type == NM_WEP_KEY_TYPE_PASSPHRASE) { - for (i = 0; i < length; i++) - result[count++] = text[i]; - } - - if (count > 0) { - g_signal_handlers_block_by_func (G_OBJECT (editable), - G_CALLBACK (wep_entry_filter_cb), - data); - gtk_editable_insert_text (editable, result, count, position); - g_signal_handlers_unblock_by_func (G_OBJECT (editable), - G_CALLBACK (wep_entry_filter_cb), - data); + utils_filter_editable_on_insert_text (editable, + text, length, position, data, + utils_char_is_ascii_print, + wep_entry_filter_cb); } - - g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text"); - g_free (result); } static void @@ -240,7 +235,7 @@ for (i = 0; s_wsec && i < 4; i++) { tmp = nm_setting_wireless_security_get_wep_key (s_wsec, i); if (tmp) - strcpy (sec->keys[i], tmp); + g_strlcpy (sec->keys[i], tmp, sizeof (sec->keys[i])); } widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry")); @@ -258,6 +253,7 @@ WirelessSecurityWEPKey *sec; GtkWidget *widget; NMSettingWirelessSecurity *s_wsec = NULL; + NMSetting *setting = NULL; guint8 default_key_idx = 0; gboolean is_adhoc = adhoc_create; gboolean is_shared_key = FALSE; @@ -273,14 +269,22 @@ "wep_key_entry"); if (!parent) return NULL; - + sec = (WirelessSecurityWEPKey *) parent; + sec->editing_connection = secrets_only ? FALSE : TRUE; + sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_WEP_KEY0; sec->type = type; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry")); g_assert (widget); gtk_entry_set_width_chars (GTK_ENTRY (widget), 28); + /* Create password-storage popup menu for password entry under entry's secondary icon */ + if (connection) + setting = (NMSetting *) nm_connection_get_setting_wireless_security (connection); + nma_utils_setup_password_storage (widget, 0, setting, sec->password_flags_name, + FALSE, secrets_only); + if (connection) { NMSettingWireless *s_wireless; const char *mode, *auth_alg; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.h gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.h --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WS_WEP_KEY_H #define WS_WEP_KEY_H +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _WirelessSecurityWEPKey WirelessSecurityWEPKey; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.ui gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wep-key.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wep-key.ui 2016-08-12 12:43:57.000000000 +0000 @@ -66,6 +66,7 @@ True True + 64 False True @@ -95,7 +96,6 @@ True False True - 0 True diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-eap.c gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-eap.c --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-eap.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-eap.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,13 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ -#include +#include "nm-default.h" + #include #include -#include #include "wireless-security.h" #include "eap-method.h" @@ -45,9 +45,9 @@ } static gboolean -validate (WirelessSecurity *parent, const GByteArray *ssid) +validate (WirelessSecurity *parent, GError **error) { - return ws_802_1x_validate (parent, "wpa_eap_auth_combo"); + return ws_802_1x_validate (parent, "wpa_eap_auth_combo", error); } static void @@ -90,12 +90,6 @@ sec->size_group); } -static GtkWidget * -nag_user (WirelessSecurity *parent) -{ - return ws_802_1x_nag_user (parent, "wpa_eap_auth_combo"); -} - static void update_secrets (WirelessSecurity *parent, NMConnection *connection) { @@ -122,8 +116,8 @@ if (!parent) return NULL; - parent->nag_user = nag_user; parent->adhoc_compatible = FALSE; + parent->hotspot_compatible = FALSE; widget = ws_802_1x_auth_combo_init (parent, "wpa_eap_auth_combo", diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-eap.h gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-eap.h --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-eap.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-eap.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,13 +17,19 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WS_WPA_EAP_H #define WS_WPA_EAP_H +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) #include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif typedef struct _WirelessSecurityWPAEAP WirelessSecurityWPAEAP; diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.c gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.c --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,20 +17,26 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ +#include "nm-default.h" + #include #include -#include #include "wireless-security.h" #include "helpers.h" +#include "nma-ui-utils.h" +#include "utils.h" #define WPA_PMK_LEN 32 struct _WirelessSecurityWPAPSK { WirelessSecurity parent; + + gboolean editing_connection; + const char *password_flags_name; }; static void @@ -47,29 +53,30 @@ } static gboolean -validate (WirelessSecurity *parent, const GByteArray *ssid) +validate (WirelessSecurity *parent, GError **error) { GtkWidget *entry; const char *key; - guint32 len; + gsize len; int i; entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry")); g_assert (entry); key = gtk_entry_get_text (GTK_ENTRY (entry)); - len = strlen (key); + len = key ? strlen (key) : 0; if ((len < 8) || (len > 64)) { widget_set_error (entry); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex digits"), len); return FALSE; } - widget_unset_error (entry); if (len == 64) { /* Hex PSK */ for (i = 0; i < len; i++) { if (!isxdigit (key[i])) { widget_set_error (entry); + g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid wpa-psk: cannot interpret key with 64 bytes as hex")); return FALSE; } } @@ -96,10 +103,12 @@ static void fill_connection (WirelessSecurity *parent, NMConnection *connection) { - GtkWidget *widget; + WirelessSecurityWPAPSK *wpa_psk = (WirelessSecurityWPAPSK *) parent; + GtkWidget *widget, *passwd_entry; const char *key; NMSettingWireless *s_wireless; NMSettingWirelessSecurity *s_wireless_sec; + NMSettingSecretFlags secret_flags; const char *mode; gboolean is_adhoc = FALSE; @@ -110,16 +119,25 @@ if (mode && !strcmp (mode, "adhoc")) is_adhoc = TRUE; - g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NULL); - /* Blow away the old security setting by adding a clear one */ s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry")); + passwd_entry = widget; key = gtk_entry_get_text (GTK_ENTRY (widget)); g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL); + /* Save PSK_FLAGS to the connection */ + secret_flags = nma_utils_menu_to_secret_flags (passwd_entry); + nm_setting_set_secret_flags (NM_SETTING (s_wireless_sec), NM_SETTING_WIRELESS_SECURITY_PSK, + secret_flags, NULL); + + /* Update secret flags and popup when editing the connection */ + if (wpa_psk->editing_connection) + nma_utils_update_password_storage (passwd_entry, secret_flags, + NM_SETTING (s_wireless_sec), wpa_psk->password_flags_name); + wireless_security_clear_ciphers (connection); if (is_adhoc) { /* Ad-Hoc settings as specified by the supplicant */ @@ -155,6 +173,7 @@ { WirelessSecurity *parent; WirelessSecurityWPAPSK *sec; + NMSetting *setting = NULL; GtkWidget *widget; parent = wireless_security_init (sizeof (WirelessSecurityWPAPSK), @@ -171,6 +190,8 @@ parent->adhoc_compatible = FALSE; sec = (WirelessSecurityWPAPSK *) parent; + sec->editing_connection = secrets_only ? FALSE : TRUE; + sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_PSK; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry")); g_assert (widget); @@ -179,6 +200,12 @@ sec); gtk_entry_set_width_chars (GTK_ENTRY (widget), 28); + /* Create password-storage popup menu for password entry under entry's secondary icon */ + if (connection) + setting = (NMSetting *) nm_connection_get_setting_wireless_security (connection); + nma_utils_setup_password_storage (widget, 0, setting, sec->password_flags_name, + FALSE, secrets_only); + /* Fill secrets, if any */ if (connection) update_secrets (WIRELESS_SECURITY (sec), connection); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.h gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.h --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.h 2016-08-12 12:43:57.000000000 +0000 @@ -17,12 +17,20 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2007 - 2010 Red Hat, Inc. + * Copyright 2007 - 2014 Red Hat, Inc. */ #ifndef WS_WPA_PSK_H #define WS_WPA_PSK_H +#if defined (LIBNM_BUILD) +#include +#elif defined (LIBNM_GLIB_BUILD) +#include +#else +#error neither LIBNM_BUILD nor LIBNM_GLIB_BUILD defined +#endif + typedef struct _WirelessSecurityWPAPSK WirelessSecurityWPAPSK; WirelessSecurityWPAPSK * ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only); diff -Nru gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.ui gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.ui --- gnome-control-center-3.20.2/panels/network/wireless-security/ws-wpa-psk.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/network/wireless-security/ws-wpa-psk.ui 2016-08-12 12:43:57.000000000 +0000 @@ -78,6 +78,7 @@ True False True + True 1 diff -Nru gnome-control-center-3.20.2/panels/notifications/gnome-notifications-panel.desktop.in.in gnome-control-center-3.22.1/panels/notifications/gnome-notifications-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/notifications/gnome-notifications-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/notifications/gnome-notifications-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Notifications +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=No­ti­fi­ca­tions _Comment=Control which notifications are displayed and what they show Exec=gnome-control-center notifications Icon=preferences-system-notifications @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/notifications/Makefile.in gnome-control-center-3.22.1/panels/notifications/Makefile.in --- gnome-control-center-3.20.2/panels/notifications/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/notifications/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -315,8 +315,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -531,22 +529,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-notifications-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/online-accounts/cc-online-accounts-add-account-dialog.c gnome-control-center-3.22.1/panels/online-accounts/cc-online-accounts-add-account-dialog.c --- gnome-control-center-3.20.2/panels/online-accounts/cc-online-accounts-add-account-dialog.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/cc-online-accounts-add-account-dialog.c 2016-08-12 12:43:57.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- * - * Copyright (C) 2012, 2013 Red Hat, Inc. + * Copyright (C) 2012, 2013, 2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +35,7 @@ struct _GoaPanelAddAccountDialogPrivate { GtkListBox *branded_list_box; + GtkListBox *calendar_list_box; GtkListBox *contacts_list_box; GtkListBox *mail_list_box; GtkListBox *chat_list_box; @@ -43,6 +44,7 @@ GoaClient *client; GoaObject *object; GoaProvider *provider; + GtkWidget *calendar_grid; GtkWidget *contacts_grid; GtkWidget *mail_grid; GtkWidget *chat_grid; @@ -326,6 +328,12 @@ _("Mail")); add_account_dialog_create_group_ui (add_account, + &priv->calendar_list_box, + &priv->calendar_grid, + grid, + _("Calendar")); + + add_account_dialog_create_group_ui (add_account, &priv->contacts_list_box, &priv->contacts_grid, grid, @@ -398,48 +406,56 @@ { GoaPanelAddAccountDialogPrivate *priv = add_account->priv; GtkListBox *list_box; - GoaProviderGroup group; + GoaProviderFeatures features; GtkWidget *group_grid = NULL; g_return_if_fail (provider != NULL); - group = goa_provider_get_provider_group (provider); + features = goa_provider_get_provider_features (provider); /* The list of providers returned by GOA are sorted such that all * the branded providers are at the beginning of the list, followed * by the others. Since this is the order in which they are added, * we can rely on this fact, which helps to simplify the code. */ - if (group != GOA_PROVIDER_GROUP_BRANDED && !priv->add_other) + if ((features & GOA_PROVIDER_FEATURE_BRANDED) == 0 && !priv->add_other) { add_account_dialog_create_provider_ui (add_account, NULL, priv->branded_list_box); priv->add_other = TRUE; } - switch (group) + if ((features & GOA_PROVIDER_FEATURE_BRANDED) != 0) { - case GOA_PROVIDER_GROUP_BRANDED: list_box = priv->branded_list_box; - break; - case GOA_PROVIDER_GROUP_CONTACTS: + } + else if ((features & GOA_PROVIDER_FEATURE_CALENDAR) != 0) + { + group_grid = priv->calendar_grid; + list_box = priv->calendar_list_box; + } + else if ((features & GOA_PROVIDER_FEATURE_CONTACTS) != 0) + { group_grid = priv->contacts_grid; list_box = priv->contacts_list_box; - break; - case GOA_PROVIDER_GROUP_MAIL: + } + else if ((features & GOA_PROVIDER_FEATURE_MAIL) != 0) + { group_grid = priv->mail_grid; list_box = priv->mail_list_box; - break; - case GOA_PROVIDER_GROUP_CHAT: + } + else if ((features & GOA_PROVIDER_FEATURE_CHAT) != 0) + { group_grid = priv->chat_grid; list_box = priv->chat_list_box; - break; - case GOA_PROVIDER_GROUP_TICKETING: + } + else if ((features & GOA_PROVIDER_FEATURE_TICKETING) != 0) + { group_grid = priv->ticketing_grid; list_box = priv->ticketing_list_box; - break; - default: + } + else + { g_assert_not_reached (); - break; } add_account_dialog_create_provider_ui (add_account, provider, list_box); diff -Nru gnome-control-center-3.20.2/panels/online-accounts/cc-online-accounts-panel.c gnome-control-center-3.22.1/panels/online-accounts/cc-online-accounts-panel.c --- gnome-control-center-3.20.2/panels/online-accounts/cc-online-accounts-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/cc-online-accounts-panel.c 2016-08-23 15:00:29.000000000 +0000 @@ -377,76 +377,15 @@ } static void -on_sign_in_button_clicked (GtkButton *button, - gpointer user_data) -{ - CcGoaPanel *panel = CC_GOA_PANEL (user_data); - GtkTreeIter iter; - - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (panel->accounts_treeview)), - NULL, - &iter)) - { - GoaProvider *provider; - const gchar *provider_type; - GoaAccount *account; - GoaObject *object; - GtkWindow *parent; - GError *error; - - gtk_tree_model_get (GTK_TREE_MODEL (panel->accounts_model), - &iter, - GOA_PANEL_ACCOUNTS_MODEL_COLUMN_OBJECT, &object, - -1); - - account = goa_object_peek_account (object); - provider_type = goa_account_get_provider_type (account); - provider = goa_provider_get_for_provider_type (provider_type); - - parent = GTK_WINDOW (cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)))); - - error = NULL; - if (!goa_provider_refresh_account (provider, - panel->client, - object, - parent, - &error)) - { - if (!(error->domain == GOA_ERROR && error->code == GOA_ERROR_DIALOG_DISMISSED)) - { - GtkWidget *dialog; - dialog = gtk_message_dialog_new (parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Error logging into the account")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - "%s", - error->message); - gtk_widget_show_all (dialog); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - g_error_free (error); - } - g_object_unref (provider); - g_object_unref (object); - } -} - -static void show_page_account (CcGoaPanel *panel, GoaObject *object) { GList *children; GList *l; GtkWidget *box; - GtkWidget *button; - GtkWidget *grid; GtkWidget *label; GoaProvider *provider; GoaAccount *account; - GtkWidget *image; const gchar *provider_type; provider = NULL; @@ -468,63 +407,16 @@ provider_type = goa_account_get_provider_type (account); provider = goa_provider_get_for_provider_type (provider_type); - /* And in with the new */ - if (goa_account_get_attention_needed (account)) - { - GtkWidget *labels_grid; - - grid = gtk_grid_new (); - gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_HORIZONTAL); - gtk_grid_set_column_spacing (GTK_GRID (grid), 12); - - image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_widget_set_valign (image, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (grid), image); - - labels_grid = gtk_grid_new (); - gtk_widget_set_halign (labels_grid, GTK_ALIGN_FILL); - gtk_widget_set_hexpand (labels_grid, TRUE); - gtk_widget_set_valign (labels_grid, GTK_ALIGN_CENTER); - gtk_orientable_set_orientation (GTK_ORIENTABLE (labels_grid), GTK_ORIENTATION_VERTICAL); - gtk_grid_set_column_spacing (GTK_GRID (labels_grid), 0); - gtk_container_add (GTK_CONTAINER (grid), labels_grid); - - label = gtk_label_new (_("Credentials have expired.")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (labels_grid), label); - - label = gtk_label_new (_("Sign in to enable this account.")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); - gtk_container_add (GTK_CONTAINER (labels_grid), label); - - button = gtk_button_new_with_mnemonic (_("_Sign In")); - if (provider == NULL) - gtk_widget_set_sensitive (button, FALSE); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (grid), button); - g_signal_connect (button, "clicked", G_CALLBACK (on_sign_in_button_clicked), panel); - - gtk_box_pack_end (GTK_BOX (panel->accounts_vbox), grid, FALSE, TRUE, 0); - } - - grid = gtk_grid_new (); - gtk_widget_set_halign (grid, GTK_ALIGN_CENTER); - gtk_widget_set_hexpand (grid, TRUE); - gtk_grid_set_column_spacing (GTK_GRID (grid), 12); - gtk_grid_set_row_spacing (GTK_GRID (grid), 6); - if (provider != NULL) { goa_provider_show_account (provider, panel->client, object, GTK_BOX (panel->accounts_vbox), - GTK_GRID (grid), - GTK_GRID (grid)); + NULL, + NULL); } - gtk_box_pack_start (GTK_BOX (panel->accounts_vbox), grid, FALSE, TRUE, 0); gtk_widget_show_all (panel->accounts_vbox); g_clear_object (&provider); diff -Nru gnome-control-center-3.20.2/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in gnome-control-center-3.22.1/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Online Accounts +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=On­line Accounts _Comment=Connect to your online accounts and decide what to use them for Exec=gnome-control-center online-accounts Icon=goa-panel @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-AccountSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/16x16/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/16x16/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/16x16/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/16x16/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/22x22/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/22x22/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/22x22/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/22x22/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/24x24/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/24x24/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/24x24/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/24x24/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/256x256/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/256x256/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/256x256/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/256x256/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/32x32/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/32x32/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/32x32/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/32x32/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/48x48/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/48x48/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/48x48/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/48x48/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/icons/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/icons/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/icons/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/icons/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/online-accounts/Makefile.in gnome-control-center-3.22.1/panels/online-accounts/Makefile.in --- gnome-control-center-3.20.2/panels/online-accounts/Makefile.in 2016-10-11 14:26:39.000000000 +0000 +++ gnome-control-center-3.22.1/panels/online-accounts/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -362,8 +362,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -589,22 +587,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-online-accounts-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/power/cc-power-panel.c gnome-control-center-3.22.1/panels/power/cc-power-panel.c --- gnome-control-center-3.20.2/panels/power/cc-power-panel.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/cc-power-panel.c 2016-09-27 12:37:36.000000000 +0000 @@ -26,7 +26,7 @@ #include #ifdef HAVE_NETWORK_MANAGER -#include +#include #endif #include "shell/list-box-helper.h" @@ -1295,7 +1295,7 @@ NMDevice *device; gint i; - if (!nm_client_get_manager_running (client)) + if (!nm_client_get_nm_running (client)) return FALSE; devices = nm_client_get_devices (client); @@ -1336,7 +1336,7 @@ NMDevice *device; gint i; - if (!nm_client_get_manager_running (client)) + if (!nm_client_get_nm_running (client)) return FALSE; devices = nm_client_get_devices (client); @@ -1425,6 +1425,47 @@ gtk_widget_set_visible (priv->mobile_row, has_mobile_devices (priv->nm_client)); } +static void +nm_client_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + CcPowerPanel *self; + CcPowerPanelPrivate *priv; + NMClient *client; + GError *error = NULL; + + client = nm_client_new_finish (res, &error); + if (!client) + { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + { + g_warning ("Failed to create NetworkManager client: %s", + error->message); + + self = user_data; + gtk_widget_set_sensitive (self->priv->wifi_row, FALSE); + gtk_widget_set_sensitive (self->priv->mobile_row, FALSE); + } + g_error_free (error); + return; + } + + self = user_data; + priv = self->priv; + priv->nm_client = client; + + g_signal_connect (priv->nm_client, "notify", + G_CALLBACK (nm_client_state_changed), self); + g_signal_connect (priv->nm_client, "device-added", + G_CALLBACK (nm_device_changed), self); + g_signal_connect (priv->nm_client, "device-removed", + G_CALLBACK (nm_device_changed), self); + + nm_client_state_changed (priv->nm_client, NULL, self); + nm_device_changed (priv->nm_client, NULL, self); +} + #endif static gboolean @@ -1835,13 +1876,7 @@ g_signal_connect (G_OBJECT (priv->mobile_switch), "notify::active", G_CALLBACK (mobile_switch_changed), self); - priv->nm_client = nm_client_new (); - g_signal_connect (priv->nm_client, "notify", - G_CALLBACK (nm_client_state_changed), self); - g_signal_connect (priv->nm_client, "device-added", - G_CALLBACK (nm_device_changed), self); - g_signal_connect (priv->nm_client, "device-removed", - G_CALLBACK (nm_device_changed), self); + nm_client_new_async (priv->cancellable, nm_client_ready_cb, self); g_signal_connect (G_OBJECT (priv->wifi_switch), "notify::active", G_CALLBACK (wifi_switch_changed), self); @@ -1898,13 +1933,10 @@ #endif gtk_widget_show_all (widget); - -#ifdef HAVE_NETWORK_MANAGER - nm_client_state_changed (priv->nm_client, NULL, self); - nm_device_changed (priv->nm_client, NULL, self); -#endif } +#define NEVER 0 + static void update_automatic_suspend_label (CcPowerPanel *self) { @@ -1920,31 +1952,37 @@ ac_timeout = g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout"); battery_timeout = g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout"); - if (ac_action == GSD_POWER_ACTION_NOTHING) - ac_timeout = 0; - if (battery_action == GSD_POWER_ACTION_NOTHING) - battery_timeout = 0; + if (ac_timeout < 0) + g_warning ("Invalid negative timeout for 'sleep-inactive-ac-timeout': %d", ac_timeout); + if (battery_timeout < 0) + g_warning ("Invalid negative timeout for 'sleep-inactive-battery-timeout': %d", battery_timeout); + + if (ac_action == GSD_POWER_ACTION_NOTHING || ac_timeout < 0) + ac_timeout = NEVER; + if (battery_action == GSD_POWER_ACTION_NOTHING || battery_timeout < 0) + battery_timeout = NEVER; if (priv->has_batteries) { - if (ac_timeout == 0 && battery_timeout == 0) + if (ac_timeout == NEVER && battery_timeout == NEVER) s = _("Off"); - else if (ac_timeout == 0 && battery_timeout != 0) + else if (ac_timeout == NEVER && battery_timeout > 0) s = _("When on battery power"); - else if (ac_timeout != 0 && battery_timeout == 0) + else if (ac_timeout > 0 && battery_timeout == NEVER) s = _("When plugged in"); else s = _("On"); } else { - if (ac_timeout == 0) + if (ac_timeout == NEVER) s = _("Off"); else s = _("On"); } - gtk_label_set_label (GTK_LABEL (priv->automatic_suspend_label), s); + if (priv->automatic_suspend_label) + gtk_label_set_label (GTK_LABEL (priv->automatic_suspend_label), s); } static void @@ -2018,7 +2056,9 @@ } static void -populate_power_button_model (GtkTreeModel *model) +populate_power_button_model (GtkTreeModel *model, + gboolean can_suspend, + gboolean can_hibernate) { struct { char *name; @@ -2032,6 +2072,12 @@ for (i = 0; i < G_N_ELEMENTS (actions); i++) { + if (!can_suspend && actions[i].value == GSD_POWER_BUTTON_ACTION_SUSPEND) + continue; + + if (!can_hibernate && actions[i].value == GSD_POWER_BUTTON_ACTION_HIBERNATE) + continue; + gtk_list_store_insert_with_values (GTK_LIST_STORE (model), NULL, -1, 0, _(actions[i].name), @@ -2040,6 +2086,58 @@ } } +static gboolean +can_suspend_or_hibernate (CcPowerPanel *self, + const char *method_name) +{ + CcPowerPanelPrivate *priv = self->priv; + GDBusConnection *connection; + GVariant *variant; + gboolean result = FALSE; + GError *error = NULL; + const char *s; + + connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, + priv->cancellable, + &error); + if (!connection) + { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_warning ("system bus not available: %s", error->message); + g_error_free (error); + goto out; + } + + variant = g_dbus_connection_call_sync (connection, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + method_name, + NULL, + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, + priv->cancellable, + &error); + g_object_unref (connection); + + if (!variant) + { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + g_debug ("Failed to call %s(): %s", method_name, error->message); + g_error_free (error); + goto out; + } + + g_variant_get (variant, "(&s)", &s); + if (g_strcmp0 (s, "yes") == 0) + result = TRUE; + g_variant_unref (variant); + + out: + return result; +} + static void add_suspend_and_power_off_section (CcPowerPanel *self) { @@ -2053,6 +2151,14 @@ GtkWidget *combo; GtkTreeModel *model; GsdPowerButtonActionType button_value; + gboolean can_suspend, can_hibernate; + + can_suspend = can_suspend_or_hibernate (self, "CanSuspend"); + can_hibernate = can_suspend_or_hibernate (self, "CanHibernate"); + + /* If the machine can neither suspend nor hibernate, we have nothing to do */ + if (!can_suspend && !can_hibernate) + return; /* The default values for these settings are unfortunate for us; * timeout == 0, action == suspend means 'do nothing' - just @@ -2071,7 +2177,6 @@ g_settings_set_int (priv->gsd_settings, "sleep-inactive-battery-timeout", 1800); } - vbox = WID (priv->builder, "vbox_power"); /* Frame header */ @@ -2113,64 +2218,69 @@ gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0); /* Automatic suspend row */ - self->priv->automatic_suspend_row = row = gtk_list_box_row_new (); - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50); - gtk_container_add (GTK_CONTAINER (row), box); - label = gtk_label_new (_("_Automatic suspend")); - atk_object_set_name (ATK_OBJECT (gtk_widget_get_accessible (self->priv->automatic_suspend_row)), _("Automatic suspend")); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_label_set_use_underline (GTK_LABEL (label), TRUE); - gtk_widget_set_margin_start (label, 20); - gtk_widget_set_margin_end (label, 20); - gtk_widget_set_margin_top (label, 6); - gtk_widget_set_margin_bottom (label, 6); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); - - priv->automatic_suspend_label = sw = gtk_label_new (""); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw); - g_signal_connect (sw, "mnemonic-activate", - G_CALLBACK (automatic_suspend_activate), self); - gtk_widget_set_halign (sw, GTK_ALIGN_END); - gtk_widget_set_margin_start (sw, 24); - gtk_widget_set_margin_end (sw, 24); - gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (widget), row); - gtk_size_group_add_widget (priv->row_sizegroup, row); - update_automatic_suspend_label (self); + if (can_suspend) + { + self->priv->automatic_suspend_row = row = gtk_list_box_row_new (); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 50); + gtk_container_add (GTK_CONTAINER (row), box); + label = gtk_label_new (_("_Automatic suspend")); + atk_object_set_name (ATK_OBJECT (gtk_widget_get_accessible (self->priv->automatic_suspend_row)), _("Automatic suspend")); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_label_set_use_underline (GTK_LABEL (label), TRUE); + gtk_widget_set_margin_start (label, 20); + gtk_widget_set_margin_end (label, 20); + gtk_widget_set_margin_top (label, 6); + gtk_widget_set_margin_bottom (label, 6); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + + priv->automatic_suspend_label = sw = gtk_label_new (""); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), sw); + g_signal_connect (sw, "mnemonic-activate", + G_CALLBACK (automatic_suspend_activate), self); + gtk_widget_set_halign (sw, GTK_ALIGN_END); + gtk_widget_set_margin_start (sw, 24); + gtk_widget_set_margin_end (sw, 24); + gtk_box_pack_start (GTK_BOX (box), sw, FALSE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (widget), row); + gtk_size_group_add_widget (priv->row_sizegroup, row); + + dialog = priv->automatic_suspend_dialog; + g_signal_connect (dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL); + g_signal_connect (priv->gsd_settings, "changed", G_CALLBACK (on_suspend_settings_changed), self); + + sw = WID (priv->builder, "suspend_on_battery_switch"); + g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-battery-type", + sw, "active", + G_SETTINGS_BIND_DEFAULT, + get_sleep_type, set_sleep_type, NULL, NULL); + + combo = WID (priv->builder, "suspend_on_battery_delay_combo"); + g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-battery-timeout"); + value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout"); + set_value_for_combo (GTK_COMBO_BOX (combo), value); + g_signal_connect (combo, "changed", + G_CALLBACK (combo_time_changed_cb), self); + g_object_bind_property (sw, "active", combo, "sensitive", + G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); + + sw = WID (priv->builder, "suspend_on_ac_switch"); + g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-ac-type", + sw, "active", + G_SETTINGS_BIND_DEFAULT, + get_sleep_type, set_sleep_type, NULL, NULL); + + combo = WID (priv->builder, "suspend_on_ac_delay_combo"); + g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-ac-timeout"); + value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout"); + set_value_for_combo (GTK_COMBO_BOX (combo), value); + g_signal_connect (combo, "changed", + G_CALLBACK (combo_time_changed_cb), self); + g_object_bind_property (sw, "active", combo, "sensitive", + G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); - dialog = priv->automatic_suspend_dialog; - g_signal_connect (dialog, "delete-event", G_CALLBACK (gtk_widget_hide_on_delete), NULL); - g_signal_connect (priv->gsd_settings, "changed", G_CALLBACK (on_suspend_settings_changed), self); - - sw = WID (priv->builder, "suspend_on_battery_switch"); - g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-battery-type", - sw, "active", - G_SETTINGS_BIND_DEFAULT, - get_sleep_type, set_sleep_type, NULL, NULL); - - combo = WID (priv->builder, "suspend_on_battery_delay_combo"); - g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-battery-timeout"); - value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-battery-timeout"); - set_value_for_combo (GTK_COMBO_BOX (combo), value); - g_signal_connect (combo, "changed", - G_CALLBACK (combo_time_changed_cb), self); - g_object_bind_property (sw, "active", combo, "sensitive", - G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); - - sw = WID (priv->builder, "suspend_on_ac_switch"); - g_settings_bind_with_mapping (priv->gsd_settings, "sleep-inactive-ac-type", - sw, "active", - G_SETTINGS_BIND_DEFAULT, - get_sleep_type, set_sleep_type, NULL, NULL); - - combo = WID (priv->builder, "suspend_on_ac_delay_combo"); - g_object_set_data (G_OBJECT (combo), "_gsettings_key", "sleep-inactive-ac-timeout"); - value = g_settings_get_int (priv->gsd_settings, "sleep-inactive-ac-timeout"); - set_value_for_combo (GTK_COMBO_BOX (combo), value); - g_signal_connect (combo, "changed", - G_CALLBACK (combo_time_changed_cb), self); - g_object_bind_property (sw, "active", combo, "sensitive", - G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); + set_ac_battery_ui_mode (self); + update_automatic_suspend_label (self); + } if (g_strcmp0 (priv->chassis_type, "vm") == 0 || g_strcmp0 (priv->chassis_type, "tablet") == 0) @@ -2193,7 +2303,7 @@ combo = gtk_combo_box_text_new (); gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo), 0); model = GTK_TREE_MODEL (gtk_builder_get_object (priv->builder, "liststore_power_button")); - populate_power_button_model (model); + populate_power_button_model (model, can_suspend, can_hibernate); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model); button_value = g_settings_get_enum (priv->gsd_settings, "power-button-action"); set_value_for_combo (GTK_COMBO_BOX (combo), button_value); @@ -2430,9 +2540,6 @@ priv->boxes = g_list_copy (priv->boxes_reverse); priv->boxes = g_list_reverse (priv->boxes); - set_ac_battery_ui_mode (self); - update_automatic_suspend_label (self); - /* populate batteries */ g_signal_connect (priv->up_client, "device-added", G_CALLBACK (up_client_device_added), self); g_signal_connect (priv->up_client, "device-removed", G_CALLBACK (up_client_device_removed), self); diff -Nru gnome-control-center-3.20.2/panels/power/gnome-power-panel.desktop.in.in gnome-control-center-3.22.1/panels/power/gnome-power-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/power/gnome-power-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/gnome-power-panel.desktop.in.in 2016-05-02 16:24:31.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Power +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Po­wer _Comment=View your battery status and change power saving settings Exec=gnome-control-center power Icon=gnome-power-manager diff -Nru gnome-control-center-3.20.2/panels/power/icons/16x16/Makefile.in gnome-control-center-3.22.1/panels/power/icons/16x16/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/16x16/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/16x16/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/22x22/Makefile.in gnome-control-center-3.22.1/panels/power/icons/22x22/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/22x22/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/22x22/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/24x24/Makefile.in gnome-control-center-3.22.1/panels/power/icons/24x24/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/24x24/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/24x24/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/256x256/Makefile.in gnome-control-center-3.22.1/panels/power/icons/256x256/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/256x256/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/256x256/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/32x32/Makefile.in gnome-control-center-3.22.1/panels/power/icons/32x32/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/32x32/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/32x32/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/48x48/Makefile.in gnome-control-center-3.22.1/panels/power/icons/48x48/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/48x48/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/48x48/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/icons/Makefile.in gnome-control-center-3.22.1/panels/power/icons/Makefile.in --- gnome-control-center-3.20.2/panels/power/icons/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/icons/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/power/Makefile.in gnome-control-center-3.22.1/panels/power/Makefile.in --- gnome-control-center-3.20.2/panels/power/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/power/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -362,8 +362,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -575,22 +573,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-power-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/printers/cc-printers-panel.c gnome-control-center-3.22.1/panels/printers/cc-printers-panel.c --- gnome-control-center-3.20.2/panels/printers/cc-printers-panel.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/cc-printers-panel.c 2016-10-10 16:16:39.000000000 +0000 @@ -20,6 +20,7 @@ #include "cc-printers-panel.h" #include "cc-printers-resources.h" +#include "pp-printer.h" #include #include @@ -113,6 +114,8 @@ gboolean new_printer_on_network; gboolean select_new_printer; + gchar *renamed_printer_name; + gpointer dummy; }; @@ -170,6 +173,8 @@ g_clear_pointer (&priv->new_printer_location, g_free); g_clear_pointer (&priv->new_printer_make_and_model, g_free); + g_clear_pointer (&priv->renamed_printer_name, g_free); + if (priv->builder) { g_object_unref (priv->builder); @@ -733,9 +738,8 @@ priv->dests != NULL) { widget = (GtkWidget*) - gtk_builder_get_object (priv->builder, "notebook"); - if (gtk_notebook_get_current_page (GTK_NOTEBOOK (widget)) >= NOTEBOOK_NO_PRINTERS_PAGE) - gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_INFO_PAGE); + gtk_builder_get_object (priv->builder, "main-vbox"); + gtk_stack_set_visible_child_name (GTK_STACK (widget), "printers-list"); for (i = 0; i < priv->dests[id].num_options; i++) { @@ -1036,9 +1040,8 @@ printer_model = g_strdup (priv->new_printer_make_and_model); widget = (GtkWidget*) - gtk_builder_get_object (priv->builder, "notebook"); - if (gtk_notebook_get_current_page (GTK_NOTEBOOK (widget)) >= NOTEBOOK_NO_PRINTERS_PAGE) - gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_INFO_PAGE); + gtk_builder_get_object (priv->builder, "main-vbox"); + gtk_stack_set_visible_child_name (GTK_STACK (widget), "printers-list"); } } @@ -1143,9 +1146,9 @@ g_object_unref (source_object); if (success) - gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_PRINTERS_PAGE); + gtk_stack_set_visible_child_name (GTK_STACK (widget), "empty-state"); else - gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_CUPS_PAGE); + gtk_stack_set_visible_child_name (GTK_STACK (widget), "no-cups-page"); } static void @@ -1191,6 +1194,13 @@ -1); } + if (priv->renamed_printer_name != NULL) + { + g_free (current_printer_name); + current_printer_name = priv->renamed_printer_name; + priv->renamed_printer_name = NULL; + } + if (priv->new_printer_name && priv->select_new_printer) { @@ -1219,7 +1229,7 @@ if (priv->num_dests == 0 && !priv->new_printer_name) { widget = (GtkWidget*) - gtk_builder_get_object (priv->builder, "notebook"); + gtk_builder_get_object (priv->builder, "main-vbox"); pp_cups_connection_test_async (g_object_ref (cups), set_current_page, widget); @@ -1937,14 +1947,38 @@ } static void +printer_rename_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + CcPrintersPanelPrivate *priv; + CcPrintersPanel *self = (CcPrintersPanel *) user_data; + gboolean result; + GError *error = NULL; + gchar *printer_name = NULL; + + priv = PRINTERS_PANEL_PRIVATE (self); + + result = pp_printer_rename_finish (PP_PRINTER (source_object), res, &error); + if (result) + { + g_object_get (source_object, "printer-name", &printer_name, NULL); + priv->renamed_printer_name = printer_name; + } + + g_object_unref (source_object); + + actualize_printers_list (self); +} + +static void printer_name_edit_cb (GtkWidget *entry, gpointer user_data) { CcPrintersPanelPrivate *priv; CcPrintersPanel *self = (CcPrintersPanel*) user_data; const gchar *new_name; - gchar *old_name = NULL; - gint i; + PpPrinter *printer; priv = PRINTERS_PANEL_PRIVATE (self); @@ -1953,24 +1987,14 @@ if (priv->current_dest >= 0 && priv->current_dest < priv->num_dests && priv->dests != NULL) - old_name = priv->dests[priv->current_dest].name; - - if (printer_rename (old_name, new_name)) { - free_dests (self); - priv->num_dests = cupsGetDests (&priv->dests); - priv->dest_model_names = g_new0 (gchar *, priv->num_dests); - priv->ppd_file_names = g_new0 (gchar *, priv->num_dests); - - for (i = 0; i < priv->num_dests; i++) - if (g_strcmp0 (priv->dests[i].name, new_name) == 0) - { - priv->current_dest = i; - break; - } + printer = pp_printer_new (priv->dests[priv->current_dest].name); + pp_printer_rename_async (printer, + new_name, + NULL, + printer_rename_cb, + self); } - - actualize_printers_list (self); } static void @@ -2518,6 +2542,27 @@ g_object_unref (command); } +static gchar * +get_testprint_filename (const gchar *datadir) +{ + const gchar *testprint[] = { "/data/testprint", + "/data/testprint.ps", + NULL }; + gchar *filename = NULL; + gint i; + + for (i = 0; testprint[i] != NULL; i++) + { + filename = g_strconcat (datadir, testprint[i], NULL); + if (g_access (filename, R_OK) == 0) + break; + + g_clear_pointer (&filename, g_free); + } + + return filename; +} + static void test_page_cb (GtkButton *button, gpointer user_data) @@ -2556,30 +2601,15 @@ ipp_t *response = NULL; ipp_t *request; - if ((datadir = getenv ("CUPS_DATADIR")) != NULL) + datadir = getenv ("CUPS_DATADIR"); + if (datadir != NULL) { - filename = g_strdup_printf ("%s/data/testprint", datadir); - if (g_access (filename, R_OK) != 0) - { - g_free (filename); - filename = g_strdup_printf ("%s/data/testprint.ps", datadir); - if (g_access (filename, R_OK) != 0) - g_clear_pointer (&filename, g_free); - } + filename = get_testprint_filename (datadir); } else { - for (i = 0; (datadir = dirs[i]) != NULL && filename == NULL; i++) - { - filename = g_strdup_printf ("%s/data/testprint", datadir); - if (g_access (filename, R_OK) != 0) - { - g_free (filename); - filename = g_strdup_printf ("%s/data/testprint.ps", datadir); - if (g_access (filename, R_OK) != 0) - g_clear_pointer (&filename, g_free); - } - } + for (i = 0; dirs[i] != NULL && filename == NULL; i++) + filename = get_testprint_filename (dirs[i]); } if (filename) @@ -2658,7 +2688,6 @@ gboolean already_present_local; GList *iter; gchar *current_printer_name = NULL; - gchar *no_printer_label; gint i; priv = PRINTERS_PANEL_PRIVATE (self); @@ -2740,11 +2769,6 @@ widget = (GtkWidget*) gtk_builder_get_object (priv->builder, "printer-add-button2"); gtk_widget_set_sensitive (widget, local_server && is_authorized && !no_cups && !priv->new_printer_name); - widget = (GtkWidget*) gtk_builder_get_object (priv->builder, "no-printer-label"); - no_printer_label = g_strdup_printf ("%s", _("No printers")); - gtk_label_set_markup (GTK_LABEL (widget), no_printer_label); - g_free (no_printer_label); - widget = (GtkWidget*) gtk_builder_get_object (priv->builder, "printer-remove-button"); gtk_widget_set_sensitive (widget, already_present_local && printer_selected && !no_cups); @@ -3070,6 +3094,8 @@ priv->new_printer_on_network = FALSE; priv->select_new_printer = FALSE; + priv->renamed_printer_name = NULL; + priv->permission = NULL; priv->lockdown_settings = NULL; diff -Nru gnome-control-center-3.20.2/panels/printers/cc-printers-resources.c gnome-control-center-3.22.1/panels/printers/cc-printers-resources.c --- gnome-control-center-3.20.2/panels/printers/cc-printers-resources.c 2016-10-11 14:27:42.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/cc-printers-resources.c 2016-10-11 12:15:12.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[48955]; const double alignment; void * const ptr;} cc_printers_resource_data = { { +static const SECTION union { const guint8 data[48867]; const double alignment; void * const ptr;} cc_printers_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00, @@ -40,16 +40,16 @@ 0x7c, 0x2a, 0x00, 0x00, 0x17, 0x7f, 0x38, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x2a, 0x00, 0x00, 0x0b, 0x00, 0x76, 0x00, 0x88, 0x2a, 0x00, 0x00, - 0xa5, 0x7a, 0x00, 0x00, 0xb8, 0xbe, 0x8b, 0x73, - 0x00, 0x00, 0x00, 0x00, 0xa5, 0x7a, 0x00, 0x00, - 0x15, 0x00, 0x76, 0x00, 0xc0, 0x7a, 0x00, 0x00, - 0x84, 0x9d, 0x00, 0x00, 0x94, 0xc1, 0x3b, 0x71, - 0x00, 0x00, 0x00, 0x00, 0x84, 0x9d, 0x00, 0x00, - 0x17, 0x00, 0x76, 0x00, 0xa0, 0x9d, 0x00, 0x00, - 0x8f, 0xb1, 0x00, 0x00, 0xcb, 0xcd, 0x51, 0x5f, - 0x00, 0x00, 0x00, 0x00, 0x8f, 0xb1, 0x00, 0x00, - 0x0e, 0x00, 0x76, 0x00, 0xa0, 0xb1, 0x00, 0x00, - 0x3b, 0xbf, 0x00, 0x00, 0x70, 0x72, 0x69, 0x6e, + 0x51, 0x7a, 0x00, 0x00, 0xb8, 0xbe, 0x8b, 0x73, + 0x00, 0x00, 0x00, 0x00, 0x51, 0x7a, 0x00, 0x00, + 0x15, 0x00, 0x76, 0x00, 0x68, 0x7a, 0x00, 0x00, + 0x2c, 0x9d, 0x00, 0x00, 0x94, 0xc1, 0x3b, 0x71, + 0x00, 0x00, 0x00, 0x00, 0x2c, 0x9d, 0x00, 0x00, + 0x17, 0x00, 0x76, 0x00, 0x48, 0x9d, 0x00, 0x00, + 0x37, 0xb1, 0x00, 0x00, 0xcb, 0xcd, 0x51, 0x5f, + 0x00, 0x00, 0x00, 0x00, 0x37, 0xb1, 0x00, 0x00, + 0x0e, 0x00, 0x76, 0x00, 0x48, 0xb1, 0x00, 0x00, + 0xe3, 0xbe, 0x00, 0x00, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, @@ -1368,7 +1368,7 @@ 0x00, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x01, 0x00, 0x00, 0x00, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x75, 0x69, 0x00, - 0x0d, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xb9, 0x4f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, @@ -1385,51 +1385,98 @@ 0x63, 0x74, 0x2d, 0x77, 0x69, 0x64, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, - 0x69, 0x6e, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x2d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x2d, 0x65, 0x6e, 0x64, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x74, 0x61, + 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6d, 0x61, 0x69, 0x6e, 0x2d, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x2d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x2d, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x2d, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x2d, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x61, 0x64, + 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x70, 0x69, 0x6e, + 0x6e, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x2d, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x6f, 0x61, 0x64, + 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x61, 0x67, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, + 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x2d, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x68, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -1437,682 +1484,739 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x76, 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, - 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x73, 0x2d, 0x73, 0x63, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x77, 0x69, 0x6e, - 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, - 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, - 0x22, 0x3e, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x73, 0x2d, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, + 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x22, 0x3e, 0x6e, 0x65, 0x76, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x73, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, 0x61, 0x75, + 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x22, 0x3e, 0x61, 0x75, 0x74, - 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, + 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, + 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x73, 0x2d, 0x74, 0x72, 0x65, 0x65, + 0x76, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, - 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x73, 0x2d, 0x74, 0x72, 0x65, 0x65, 0x76, - 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, + 0x32, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x32, - 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x2d, 0x74, + 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x73, 0x2d, 0x74, 0x6f, - 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, + 0x6c, 0x62, 0x61, 0x72, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x22, 0x3e, 0x69, 0x63, 0x6f, 0x6e, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, + 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x2d, 0x61, 0x64, 0x64, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, - 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, - 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, - 0x62, 0x61, 0x72, 0x2d, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x22, 0x3e, 0x69, 0x63, 0x6f, 0x6e, 0x73, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, 0x6f, - 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x2d, 0x61, 0x64, 0x64, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x61, 0x64, + 0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, - 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, + 0x64, 0x64, 0x20, 0x50, 0x72, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, + 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x72, 0x65, + 0x6d, 0x6f, 0x76, 0x65, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, - 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x61, 0x64, 0x64, - 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, - 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, + 0x73, 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, + 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x50, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, + 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, - 0x64, 0x20, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, - 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, - 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x72, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, + 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, + 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75, + 0x70, 0x70, 0x6c, 0x79, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, + 0x20, 0x42, 0x79, 0x20, 0x73, 0x75, 0x70, 0x70, + 0x6c, 0x79, 0x20, 0x77, 0x65, 0x20, 0x6d, 0x65, + 0x61, 0x6e, 0x20, 0x69, 0x6e, 0x6b, 0x2c, 0x20, + 0x74, 0x6f, 0x6e, 0x65, 0x72, 0x2c, 0x20, 0x73, + 0x74, 0x61, 0x70, 0x6c, 0x65, 0x73, 0x2c, 0x20, + 0x77, 0x61, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x2e, + 0x2e, 0x2e, 0x22, 0x3e, 0x53, 0x75, 0x70, 0x70, + 0x6c, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, - 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, - 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x50, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, - 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, + 0x3a, 0x20, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x20, 0x28, 0x65, 0x2e, 0x67, 0x2e, 0x20, + 0x4c, 0x61, 0x62, 0x2c, 0x20, 0x31, 0x73, 0x74, + 0x20, 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x2c, 0x2e, + 0x2e, 0x2e, 0x29, 0x2e, 0x22, 0x3e, 0x4c, 0x6f, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, - 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, - 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, - 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75, 0x70, - 0x70, 0x6c, 0x79, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, + 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x72, 0x61, + 0x77, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x65, 0x61, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75, + 0x70, 0x70, 0x6c, 0x79, 0x2d, 0x64, 0x72, 0x61, + 0x77, 0x69, 0x6e, 0x67, 0x2d, 0x61, 0x72, 0x65, + 0x61, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, - 0x42, 0x79, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6c, - 0x79, 0x20, 0x77, 0x65, 0x20, 0x6d, 0x65, 0x61, - 0x6e, 0x20, 0x69, 0x6e, 0x6b, 0x2c, 0x20, 0x74, - 0x6f, 0x6e, 0x65, 0x72, 0x2c, 0x20, 0x73, 0x74, - 0x61, 0x70, 0x6c, 0x65, 0x73, 0x2c, 0x20, 0x77, - 0x61, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x2e, 0x2e, - 0x2e, 0x22, 0x3e, 0x53, 0x75, 0x70, 0x70, 0x6c, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6c, 0x6f, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x66, 0x69, + 0x6c, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, + 0x74, 0x22, 0x3e, 0x2d, 0x2d, 0x2d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x22, 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x50, 0x41, 0x4e, 0x47, + 0x4f, 0x5f, 0x45, 0x4c, 0x4c, 0x49, 0x50, 0x53, + 0x49, 0x5a, 0x45, 0x5f, 0x4d, 0x49, 0x44, 0x44, + 0x4c, 0x45, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, + 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x30, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, + 0x22, 0x3e, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x69, + 0x6e, 0x67, 0x26, 0x23, 0x78, 0x32, 0x30, 0x32, + 0x36, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, - 0x20, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x20, 0x28, 0x65, 0x2e, 0x67, 0x2e, 0x20, 0x4c, - 0x61, 0x62, 0x2c, 0x20, 0x31, 0x73, 0x74, 0x20, - 0x66, 0x6c, 0x6f, 0x6f, 0x72, 0x2c, 0x2e, 0x2e, - 0x2e, 0x29, 0x2e, 0x22, 0x3e, 0x4c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, - 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x44, 0x72, 0x61, 0x77, - 0x69, 0x6e, 0x67, 0x41, 0x72, 0x65, 0x61, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x75, 0x70, - 0x70, 0x6c, 0x79, 0x2d, 0x64, 0x72, 0x61, 0x77, - 0x69, 0x6e, 0x67, 0x2d, 0x61, 0x72, 0x65, 0x61, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2d, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x66, 0x69, 0x6c, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, - 0x22, 0x3e, 0x2d, 0x2d, 0x2d, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, + 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, + 0x73, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, + 0x6f, 0x78, 0x20, 0x69, 0x73, 0x20, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x65, 0x64, 0x20, 0x77, 0x68, + 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x69, + 0x73, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, + 0x65, 0x64, 0x2e, 0x22, 0x3e, 0x5f, 0x44, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x6c, 0x6c, 0x69, 0x70, 0x73, 0x69, 0x7a, - 0x65, 0x22, 0x3e, 0x50, 0x41, 0x4e, 0x47, 0x4f, - 0x5f, 0x45, 0x4c, 0x4c, 0x49, 0x50, 0x53, 0x49, - 0x5a, 0x45, 0x5f, 0x4d, 0x49, 0x44, 0x44, 0x4c, - 0x45, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, 0x20, - 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x30, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, - 0x3e, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x26, 0x23, 0x78, 0x32, 0x30, 0x32, 0x36, - 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2d, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, + 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -2122,68 +2226,92 @@ 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, - 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, 0x73, - 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x6f, - 0x78, 0x20, 0x69, 0x73, 0x20, 0x63, 0x68, 0x65, - 0x63, 0x6b, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x69, 0x73, - 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, - 0x64, 0x2e, 0x22, 0x3e, 0x5f, 0x44, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x20, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x4a, 0x6f, 0x62, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x32, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6a, 0x6f, + 0x62, 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -2191,230 +2319,301 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, + 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x6e, 0x6f, + 0x22, 0x3e, 0x30, 0x20, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, + 0x6a, 0x6f, 0x62, 0x73, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, + 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x4f, 0x70, + 0x65, 0x6e, 0x73, 0x20, 0x61, 0x20, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x20, 0x63, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, + 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x27, + 0x73, 0x20, 0x6a, 0x6f, 0x62, 0x73, 0x22, 0x3e, + 0x53, 0x68, 0x6f, 0x77, 0x20, 0x5f, 0x4a, 0x6f, + 0x62, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, + 0x45, 0x4e, 0x44, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, + 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x3e, + 0x3c, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x6c, 0x65, 0x64, + 0x2d, 0x62, 0x79, 0x22, 0x20, 0x74, 0x61, 0x72, + 0x67, 0x65, 0x74, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x72, + 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, + 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, + 0x79, 0x22, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, + 0x74, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x2d, 0x6a, 0x6f, 0x62, 0x73, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, + 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x43, 0x63, 0x45, 0x64, + 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x66, 0x69, 0x6c, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, + 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x37, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x4a, 0x6f, 0x62, 0x73, 0x3c, 0x2f, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x31, + 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6c, 0x6c, + 0x69, 0x70, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, + 0x50, 0x41, 0x4e, 0x47, 0x4f, 0x5f, 0x45, 0x4c, + 0x4c, 0x49, 0x50, 0x53, 0x49, 0x5a, 0x45, 0x5f, + 0x4d, 0x49, 0x44, 0x44, 0x4c, 0x45, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6a, 0x6f, 0x62, - 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x2d, 0x69, 0x63, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, + 0x78, 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x3e, 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x6e, 0x6f, 0x22, - 0x3e, 0x30, 0x20, 0x61, 0x63, 0x74, 0x69, 0x76, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6a, - 0x6f, 0x62, 0x73, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, - 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x4f, 0x70, 0x65, - 0x6e, 0x73, 0x20, 0x61, 0x20, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x27, 0x73, - 0x20, 0x6a, 0x6f, 0x62, 0x73, 0x22, 0x3e, 0x53, - 0x68, 0x6f, 0x77, 0x20, 0x5f, 0x4a, 0x6f, 0x62, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, + 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x31, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, 0x45, - 0x4e, 0x44, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, 0x43, - 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x3e, 0x3c, - 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x2d, - 0x62, 0x79, 0x22, 0x20, 0x74, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x72, 0x65, - 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, - 0x22, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, - 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x2d, 0x6a, 0x6f, 0x62, 0x73, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, @@ -2432,176 +2631,225 @@ 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, - 0x6e, 0x61, 0x6d, 0x65, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x66, 0x69, 0x6c, 0x6c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x50, - 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x49, 0x50, 0x20, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x37, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x31, 0x2e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6c, 0x6c, 0x69, - 0x70, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x50, - 0x41, 0x4e, 0x47, 0x4f, 0x5f, 0x45, 0x4c, 0x4c, - 0x49, 0x50, 0x53, 0x49, 0x5a, 0x45, 0x5f, 0x4d, - 0x49, 0x44, 0x44, 0x4c, 0x45, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x2d, 0x69, 0x63, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, + 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x2d, 0x6e, 0x6f, 0x74, + 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, - 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, + 0x62, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, + 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, + 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, 0x78, - 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, - 0x3e, 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, - 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x3e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, + 0x6e, 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, - 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x6c, + 0x69, 0x65, 0x66, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x66, 0x69, 0x6c, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, + 0x6f, 0x64, 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x2d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x6e, 0x6f, 0x22, 0x3e, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, + 0x22, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, + 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, - 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, + 0x3e, 0x70, 0x61, 0x67, 0x65, 0x20, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, 0x22, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, 0x64, 0x65, + 0x6c, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -2609,844 +2857,655 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x49, - 0x50, 0x20, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x2d, 0x6e, 0x6f, 0x74, 0x65, - 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x74, 0x61, 0x62, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, - 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x31, 0x33, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x70, 0x61, 0x67, 0x65, + 0x20, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, - 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x2d, 0x73, 0x65, 0x74, 0x74, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x6c, 0x69, - 0x65, 0x66, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x66, 0x69, 0x6c, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, + 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x38, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x6e, 0x6f, 0x22, 0x3e, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, - 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x34, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x70, 0x61, 0x67, 0x65, 0x20, 0x31, 0x3c, 0x2f, + 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, + 0x6e, 0x65, 0x77, 0x20, 0x64, 0x72, 0x69, 0x76, + 0x65, 0x72, 0x26, 0x23, 0x78, 0x32, 0x30, 0x32, + 0x36, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x31, 0x36, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x65, 0x73, 0x22, 0x3e, 0x70, 0x61, 0x67, 0x65, + 0x20, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x70, 0x61, 0x67, 0x65, 0x20, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x69, 0x70, + 0x2d, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x2d, 0x2d, + 0x2d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, 0x20, + 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, + 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x2d, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x2d, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x64, 0x69, 0x73, + 0x61, 0x62, 0x6c, 0x65, 0x2d, 0x73, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, + 0x4e, 0x5f, 0x45, 0x4e, 0x44, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, + 0x4e, 0x5f, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, - 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, - 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x6e, - 0x65, 0x77, 0x20, 0x64, 0x72, 0x69, 0x76, 0x65, - 0x72, 0x26, 0x23, 0x78, 0x32, 0x30, 0x32, 0x36, - 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, + 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, + 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x36, 0x22, 0x3e, 0x3c, 0x70, + 0x65, 0x6c, 0x31, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x70, 0x61, 0x67, 0x65, 0x20, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x69, 0x70, 0x2d, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x65, 0x78, 0x74, 0x22, 0x3e, 0x2d, 0x2d, 0x2d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x6c, - 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, 0x20, 0x74, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, - 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, - 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x2d, 0x64, 0x69, 0x73, 0x61, - 0x62, 0x6c, 0x65, 0x2d, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, - 0x5f, 0x45, 0x4e, 0x44, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, - 0x5f, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, - 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, + 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x46, - 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x31, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x30, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, 0x30, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x74, 0x65, + 0x73, 0x74, 0x2d, 0x70, 0x61, 0x67, 0x65, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, + 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x65, 0x73, 0x20, 0x63, 0x6f, + 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x77, 0x68, + 0x69, 0x63, 0x68, 0x20, 0x70, 0x72, 0x69, 0x6e, + 0x74, 0x73, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, + 0x70, 0x61, 0x67, 0x65, 0x2e, 0x22, 0x3e, 0x50, + 0x72, 0x69, 0x6e, 0x74, 0x20, 0x5f, 0x54, 0x65, + 0x73, 0x74, 0x20, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x62, 0x6f, 0x78, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, + 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x6f, 0x70, 0x65, + 0x6e, 0x73, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x27, 0x73, 0x20, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x5f, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, - 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x74, 0x65, 0x73, - 0x74, 0x2d, 0x70, 0x61, 0x67, 0x65, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, - 0x54, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x20, 0x65, 0x78, 0x65, 0x63, - 0x75, 0x74, 0x65, 0x73, 0x20, 0x63, 0x6f, 0x6d, - 0x6d, 0x61, 0x6e, 0x64, 0x20, 0x77, 0x68, 0x69, - 0x63, 0x68, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, - 0x73, 0x20, 0x74, 0x65, 0x73, 0x74, 0x20, 0x70, - 0x61, 0x67, 0x65, 0x2e, 0x22, 0x3e, 0x50, 0x72, - 0x69, 0x6e, 0x74, 0x20, 0x5f, 0x54, 0x65, 0x73, - 0x74, 0x20, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, - 0x54, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x20, 0x6f, 0x70, 0x65, 0x6e, - 0x73, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x27, 0x73, 0x20, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x61, 0x62, 0x22, - 0x3e, 0x5f, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x49, 0x6e, + 0x66, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x73, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x49, 0x6e, 0x66, - 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, - 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x62, 0x6f, 0x78, 0x32, 0x22, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -3477,207 +3536,190 @@ 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, - 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, - 0x6f, 0x2d, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, 0x78, 0x65, - 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, - 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, - 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, + 0x78, 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x3e, 0x37, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, - 0x6f, 0x2d, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, - 0x61, 0x64, 0x64, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, - 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, - 0x69, 0x73, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x20, 0x61, 0x64, 0x64, 0x73, 0x20, 0x6e, - 0x65, 0x77, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x2e, 0x22, 0x3e, 0x41, 0x64, 0x64, - 0x20, 0x61, 0x20, 0x50, 0x72, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x6c, 0x69, 0x65, 0x66, 0x22, - 0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x75, - 0x67, 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x2d, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x4e, 0x6f, 0x20, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, 0x32, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x61, 0x64, + 0x64, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, + 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, 0x73, + 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, + 0x61, 0x64, 0x64, 0x73, 0x20, 0x6e, 0x65, 0x77, + 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x2e, 0x22, 0x3e, 0x41, 0x64, 0x64, 0x20, 0x61, + 0x20, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x4e, 0x6f, 0x20, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x6c, 0x69, 0x65, 0x66, 0x22, 0x3e, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x67, 0x67, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x2d, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, + 0x6d, 0x70, 0x74, 0x79, 0x2d, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -3691,60 +3733,71 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6e, 0x6f, 0x2d, 0x63, 0x75, 0x70, - 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, - 0x20, 0x54, 0x68, 0x65, 0x20, 0x43, 0x55, 0x50, - 0x53, 0x20, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, - 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, - 0x28, 0x77, 0x65, 0x20, 0x63, 0x61, 0x6e, 0x20, - 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x6e, - 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x69, - 0x74, 0x29, 0x2e, 0x22, 0x3e, 0x53, 0x6f, 0x72, - 0x72, 0x79, 0x21, 0x20, 0x54, 0x68, 0x65, 0x20, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x20, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x20, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x0a, - 0x64, 0x6f, 0x65, 0x73, 0x6e, 0x27, 0x74, 0x20, - 0x73, 0x65, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, - 0x62, 0x65, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, - 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x6f, 0x72, + 0x73, 0x3a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x43, + 0x55, 0x50, 0x53, 0x20, 0x73, 0x65, 0x72, 0x76, + 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, + 0x74, 0x20, 0x72, 0x75, 0x6e, 0x6e, 0x69, 0x6e, + 0x67, 0x20, 0x28, 0x77, 0x65, 0x20, 0x63, 0x61, + 0x6e, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x63, 0x6f, + 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, + 0x20, 0x69, 0x74, 0x29, 0x2e, 0x22, 0x3e, 0x53, + 0x6f, 0x72, 0x72, 0x79, 0x21, 0x20, 0x54, 0x68, + 0x65, 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x0a, 0x64, 0x6f, 0x65, 0x73, 0x6e, 0x27, + 0x74, 0x20, 0x73, 0x65, 0x65, 0x6d, 0x20, 0x74, + 0x6f, 0x20, 0x62, 0x65, 0x20, 0x61, 0x76, 0x61, + 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, 0x32, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, @@ -3760,181 +3813,117 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x31, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, 0x78, - 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, - 0x3e, 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, - 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x3e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, - 0x72, 0x2d, 0x66, 0x61, 0x69, 0x6c, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, - 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x39, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x22, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x5f, 0x73, + 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x37, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x63, 0x6f, 0x6d, + 0x70, 0x75, 0x74, 0x65, 0x72, 0x2d, 0x66, 0x61, + 0x69, 0x6c, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x4e, - 0x6f, 0x20, 0x63, 0x75, 0x70, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x2d, 0x63, + 0x75, 0x70, 0x73, 0x2d, 0x70, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x69, 0x7a, 0x65, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x31, 0x22, 0x3e, 0x3c, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x31, 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x61, 0x63, 0x6b, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x31, 0x22, + 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x61, 0x63, 0x6b, 0x2d, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x72, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x2d, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x61, - 0x63, 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x2d, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x61, 0x63, 0x6b, - 0x2d, 0x73, 0x70, 0x61, 0x63, 0x65, 0x72, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x31, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, - 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x69, - 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x32, - 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x61, 0x63, 0x6b, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x32, 0x22, 0x2f, - 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x61, 0x63, 0x6b, 0x2d, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x72, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x2d, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x32, 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x6e, 0x65, 0x77, - 0x2d, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, - 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x61, 0x63, + 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2d, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x61, 0x63, 0x6b, 0x2d, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x72, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x32, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, + 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, + 0x29, 0x6e, 0x65, 0x77, 0x2d, 0x70, 0x72, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0xb4, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, diff -Nru gnome-control-center-3.20.2/panels/printers/gnome-printers-panel.desktop.in.in gnome-control-center-3.22.1/panels/printers/gnome-printers-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/printers/gnome-printers-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/gnome-printers-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Printers +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Prin­ters _Comment=Add printers, view printer jobs and decide how you want to print Exec=gnome-control-center printers Icon=printer @@ -8,7 +9,7 @@ NoDisplay=true StartupNotify=true # The X-GNOME-Settings-Panel is necessary to show in the main shell UI -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; # Translators: those are keywords for the printing control-center panel _Keywords=Printer;Queue;Print;Paper;Ink;Toner; diff -Nru gnome-control-center-3.20.2/panels/printers/Makefile.am gnome-control-center-3.22.1/panels/printers/Makefile.am --- gnome-control-center-3.20.2/panels/printers/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.decl + cappletname = printers AM_CPPFLAGS = \ @@ -7,6 +9,7 @@ $(SMBCLIENT_CFLAGS) \ -I$(top_srcdir)/shell/ \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ $(NULL) noinst_LTLIBRARIES = libprinters.la @@ -17,6 +20,8 @@ libprinters_la_SOURCES = \ $(BUILT_SOURCES) \ + pp-printer.c \ + pp-printer.h \ pp-new-printer.c \ pp-new-printer.h \ pp-maintenance-command.c \ @@ -68,17 +73,15 @@ CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES) EXTRA_DIST = $(resource_files) printers.gresource.xml -noinst_PROGRAMS = test-shift test-canonicalization +noinst_PROGRAMS = $(TEST_PROGS) +TEST_PROGS += test-shift test-canonicalization test_shift_SOURCES = pp-print-device.c pp-print-device.h pp-utils.c pp-utils.h test-shift.c test_shift_LDADD = $(PANEL_LIBS) $(PRINTERS_PANEL_LIBS) $(CUPS_LIBS) test_canonicalization_SOURCES = pp-print-device.c pp-print-device.h pp-utils.c pp-utils.h test-canonicalization.c test_canonicalization_LDADD = $(PANEL_LIBS) $(PRINTERS_PANEL_LIBS) $(CUPS_LIBS) -EXTRA_DIST += \ +EXTRA_DIST += \ shift-test.txt \ canonicalization-test.txt -check-local: test-shift test-canonicalization - $(builddir)/test-shift $(srcdir)/shift-test.txt > /dev/null - $(builddir)/test-canonicalization $(srcdir)/canonicalization-test.txt > /dev/null -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/printers/Makefile.in gnome-control-center-3.22.1/panels/printers/Makefile.in --- gnome-control-center-3.20.2/panels/printers/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -90,7 +90,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = test-shift$(EXEEXT) test-canonicalization$(EXEEXT) +noinst_PROGRAMS = $(am__EXEEXT_1) subdir = panels/printers ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ @@ -112,7 +112,7 @@ $(am__DEPENDENCIES_1) am__objects_1 = libprinters_la-cc-printers-resources.lo am_libprinters_la_OBJECTS = $(am__objects_1) \ - libprinters_la-pp-new-printer.lo \ + libprinters_la-pp-printer.lo libprinters_la-pp-new-printer.lo \ libprinters_la-pp-maintenance-command.lo \ libprinters_la-pp-host.lo libprinters_la-pp-cups.lo \ libprinters_la-pp-utils.lo \ @@ -130,6 +130,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am__EXEEXT_1 = test-shift$(EXEEXT) test-canonicalization$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am_test_canonicalization_OBJECTS = pp-print-device.$(OBJEXT) \ pp-utils.$(OBJEXT) test-canonicalization.$(OBJEXT) @@ -234,7 +235,7 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(srcdir)/gnome-printers-panel.desktop.in.in \ - $(top_srcdir)/depcomp + $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -343,8 +344,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -471,6 +470,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +GTESTER = gtester # in $PATH for non-GLIB packages +GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +# initialize variables for unconditional += appending +TEST_PROGS = test-shift test-canonicalization cappletname = printers AM_CPPFLAGS = \ $(PANEL_CFLAGS) \ @@ -479,6 +483,7 @@ $(SMBCLIENT_CFLAGS) \ -I$(top_srcdir)/shell/ \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ $(NULL) noinst_LTLIBRARIES = libprinters.la @@ -488,6 +493,8 @@ libprinters_la_SOURCES = \ $(BUILT_SOURCES) \ + pp-printer.c \ + pp-printer.h \ pp-new-printer.c \ pp-new-printer.h \ pp-maintenance-command.c \ @@ -539,7 +546,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -559,6 +566,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.decl $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -623,6 +631,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-ppd-option-widget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-ppd-selection-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-print-device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-printer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-samba.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libprinters_la-pp-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pp-print-device.Po@am__quote@ @@ -631,22 +640,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-shift.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -658,6 +670,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprinters_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libprinters_la-cc-printers-resources.lo `test -f 'cc-printers-resources.c' || echo '$(srcdir)/'`cc-printers-resources.c +libprinters_la-pp-printer.lo: pp-printer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprinters_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libprinters_la-pp-printer.lo -MD -MP -MF $(DEPDIR)/libprinters_la-pp-printer.Tpo -c -o libprinters_la-pp-printer.lo `test -f 'pp-printer.c' || echo '$(srcdir)/'`pp-printer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprinters_la-pp-printer.Tpo $(DEPDIR)/libprinters_la-pp-printer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pp-printer.c' object='libprinters_la-pp-printer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprinters_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libprinters_la-pp-printer.lo `test -f 'pp-printer.c' || echo '$(srcdir)/'`pp-printer.c + libprinters_la-pp-new-printer.lo: pp-new-printer.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libprinters_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libprinters_la-pp-new-printer.lo -MD -MP -MF $(DEPDIR)/libprinters_la-pp-new-printer.Tpo -c -o libprinters_la-pp-new-printer.lo `test -f 'pp-new-printer.c' || echo '$(srcdir)/'`pp-new-printer.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libprinters_la-pp-new-printer.Tpo $(DEPDIR)/libprinters_la-pp-new-printer.Plo @@ -1011,15 +1030,60 @@ .PRECIOUS: Makefile + +# test: run all tests in cwd and subdirs +test: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '' > $@.xml ; \ + echo '' >> $@.xml ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ + done ; \ + echo >> $@.xml ; \ + echo '' >> $@.xml ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ + } +.PHONY: test test-report perf-report full-report +# run make test as part of make check +check-local: test cc-printers-resources.c: printers.gresource.xml $(resource_files) $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_printers $< cc-printers-resources.h: printers.gresource.xml $(resource_files) $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_printers $< @INTLTOOL_DESKTOP_RULE@ -check-local: test-shift test-canonicalization - $(builddir)/test-shift $(srcdir)/shift-test.txt > /dev/null - $(builddir)/test-canonicalization $(srcdir)/canonicalization-test.txt > /dev/null -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/panels/printers/pp-maintenance-command.c gnome-control-center-3.22.1/panels/printers/pp-maintenance-command.c --- gnome-control-center-3.20.2/panels/printers/pp-maintenance-command.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/pp-maintenance-command.c 2016-08-12 12:43:57.000000000 +0000 @@ -177,152 +177,212 @@ NULL); } +static gboolean _pp_maintenance_command_is_supported (const gchar *printer_name, + const gchar *command); + static void -_pp_maintenance_command_execute_thread (GSimpleAsyncResult *res, - GObject *object, - GCancellable *cancellable) +_pp_maintenance_command_execute_thread (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) { - PpMaintenanceCommand *command = (PpMaintenanceCommand *) object; + PpMaintenanceCommand *command = PP_MAINTENANCE_COMMAND (source_object); PpMaintenanceCommandPrivate *priv = command->priv; - static const char *attrs[] = {"printer-commands"}; - ipp_attribute_t *attr = NULL; gboolean success = FALSE; GError *error = NULL; - ipp_t *request; - ipp_t *response = NULL; - gchar *printer_uri; - gchar *printer_commands = NULL; - gchar *printer_commands_lowercase = NULL; - gchar *command_lowercase; - gchar *file_name = NULL; - int fd = -1; - printer_uri = g_strdup_printf ("ipp://localhost/printers/%s", - priv->printer_name); + if (_pp_maintenance_command_is_supported (priv->printer_name, priv->command)) + { + ipp_t *request; + ipp_t *response = NULL; + gchar *printer_uri; + gchar *file_name = NULL; + int fd = -1; + + printer_uri = g_strdup_printf ("ipp://localhost/printers/%s", + priv->printer_name); + + request = ippNewRequest (IPP_PRINT_JOB); + + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, + "printer-uri", NULL, printer_uri); + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME, + "job-name", NULL, priv->title); + ippAddString (request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, + "document-format", NULL, "application/vnd.cups-command"); - request = ippNewRequest (IPP_GET_PRINTER_ATTRIBUTES); - ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, printer_uri); - ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, - "requested-attributes", 1, NULL, attrs); - response = cupsDoRequest (CUPS_HTTP_DEFAULT, request, "/"); + fd = g_file_open_tmp ("ccXXXXXX", &file_name, &error); - if (response) - { - if (ippGetStatusCode (response) <= IPP_OK_CONFLICT) + if (fd != -1) { - attr = ippFindAttribute (response, "printer-commands", IPP_TAG_ZERO); - if (attr && ippGetCount (attr) > 0 && ippGetValueTag (attr) != IPP_TAG_NOVALUE) + FILE *file; + + file = fdopen (fd, "w"); + fprintf (file, "#CUPS-COMMAND\n"); + fprintf (file, "%s\n", priv->command); + fclose (file); + + response = cupsDoFileRequest (CUPS_HTTP_DEFAULT, request, "/", file_name); + g_unlink (file_name); + + if (response != NULL) { - if (ippGetValueTag (attr) == IPP_TAG_KEYWORD) + if (ippGetStatusCode (response) <= IPP_OK_CONFLICT) { - printer_commands = g_strdup (ippGetString (attr, 0, NULL)); + success = TRUE; } - } - else - { - success = TRUE; + + ippDelete (response); } } - ippDelete (response); + g_free (file_name); + g_free (printer_uri); + } + else + { + success = TRUE; } - if (printer_commands) + if (!success) { - command_lowercase = g_ascii_strdown (priv->command, -1); - printer_commands_lowercase = g_ascii_strdown (printer_commands, -1); + g_task_return_new_error (task, + G_IO_ERROR, + G_IO_ERROR_FAILED, + "Execution of maintenance command failed."); + } - if (g_strrstr (printer_commands_lowercase, command_lowercase)) - { - request = ippNewRequest (IPP_PRINT_JOB); + g_task_return_boolean (task, success); +} - ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, - "printer-uri", NULL, printer_uri); - ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_NAME, - "job-name", NULL, priv->title); - ippAddString (request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, - "document-format", NULL, "application/vnd.cups-command"); +void +pp_maintenance_command_execute_async (PpMaintenanceCommand *command, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; - fd = g_file_open_tmp ("ccXXXXXX", &file_name, &error); + task = g_task_new (command, cancellable, callback, user_data); + g_task_set_check_cancellable (task, TRUE); + g_task_run_in_thread (task, _pp_maintenance_command_execute_thread); - if (fd != -1) - { - FILE *file; + g_object_unref (task); +} + +gboolean +pp_maintenance_command_execute_finish (PpMaintenanceCommand *command, + GAsyncResult *result, + GError **error) +{ + g_return_val_if_fail (g_task_is_valid (result, command), FALSE); - file = fdopen (fd, "w"); - fprintf (file, "#CUPS-COMMAND\n"); - fprintf (file, "%s\n", priv->command); - fclose (file); + return g_task_propagate_boolean (G_TASK (result), error); +} - response = cupsDoFileRequest (CUPS_HTTP_DEFAULT, request, "/", file_name); - g_unlink (file_name); +static gboolean +_pp_maintenance_command_is_supported (const gchar *printer_name, + const gchar *command) +{ + ipp_attribute_t *attr = NULL; + gboolean is_supported = FALSE; + ipp_t *request; + ipp_t *response = NULL; + gchar *printer_uri; + gchar *command_lowercase; + GPtrArray *available_commands = NULL; + int i; - if (response) - { - if (ippGetStatusCode (response) <= IPP_OK_CONFLICT) - { - success = TRUE; - } + printer_uri = g_strdup_printf ("ipp://localhost/printers/%s", + printer_name); - ippDelete (response); + request = ippNewRequest (IPP_GET_PRINTER_ATTRIBUTES); + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_URI, + "printer-uri", NULL, printer_uri); + ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, + "requested-attributes", NULL, "printer-commands"); + response = cupsDoRequest (CUPS_HTTP_DEFAULT, request, "/"); + if (response != NULL) + { + if (ippGetStatusCode (response) <= IPP_OK_CONFLICT) + { + int commands_count; + + attr = ippFindAttribute (response, "printer-commands", IPP_TAG_ZERO); + commands_count = attr != NULL ? ippGetCount (attr) : 0; + if (commands_count > 0 && + ippGetValueTag (attr) != IPP_TAG_NOVALUE && + (ippGetValueTag (attr) == IPP_TAG_KEYWORD)) + { + available_commands = g_ptr_array_new_full (commands_count, g_free); + for (i = 0; i < commands_count; ++i) + { + /* Array gains ownership of the lower-cased string */ + g_ptr_array_add (available_commands, g_ascii_strdown (ippGetString (attr, i, NULL), -1)); } } - - g_free (file_name); } - else + + ippDelete (response); + } + + if (available_commands != NULL) + { + command_lowercase = g_ascii_strdown (command, -1); + for (i = 0; i < available_commands->len; ++i) { - success = TRUE; + const gchar *available_command = g_ptr_array_index (available_commands, i); + if (g_strcmp0 (available_command, command_lowercase) == 0) + { + is_supported = TRUE; + break; + } } g_free (command_lowercase); - g_free (printer_commands_lowercase); - g_free (printer_commands); + g_ptr_array_free (available_commands, TRUE); } g_free (printer_uri); - if (!success) - { - g_simple_async_result_set_error (res, - G_IO_ERROR, - G_IO_ERROR_FAILED, - "Execution of maintenance command failed."); - } + return is_supported; +} + +static void +_pp_maintenance_command_is_supported_thread (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + PpMaintenanceCommand *command = PP_MAINTENANCE_COMMAND (source_object); + PpMaintenanceCommandPrivate *priv = command->priv; + gboolean success = FALSE; - g_simple_async_result_set_op_res_gboolean (res, success); + success = _pp_maintenance_command_is_supported (priv->printer_name, priv->command); + g_task_return_boolean (task, success); } void -pp_maintenance_command_execute_async (PpMaintenanceCommand *command, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +pp_maintenance_command_is_supported_async (PpMaintenanceCommand *command, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { - GSimpleAsyncResult *res; - - res = g_simple_async_result_new (G_OBJECT (command), callback, user_data, pp_maintenance_command_execute_async); + GTask *task; - g_simple_async_result_set_check_cancellable (res, cancellable); - g_simple_async_result_run_in_thread (res, _pp_maintenance_command_execute_thread, 0, cancellable); + task = g_task_new (command, cancellable, callback, user_data); + g_task_set_check_cancellable (task, TRUE); + g_task_run_in_thread (task, _pp_maintenance_command_is_supported_thread); - g_object_unref (res); + g_object_unref (task); } gboolean -pp_maintenance_command_execute_finish (PpMaintenanceCommand *command, - GAsyncResult *res, - GError **error) +pp_maintenance_command_is_supported_finish (PpMaintenanceCommand *command, + GAsyncResult *result, + GError **error) { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); - - g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == pp_maintenance_command_execute_async); - - if (g_simple_async_result_propagate_error (simple, error)) - { - return FALSE; - } + g_return_val_if_fail (g_task_is_valid (result, command), FALSE); - return g_simple_async_result_get_op_res_gboolean (simple); + return g_task_propagate_boolean (G_TASK (result), error); } diff -Nru gnome-control-center-3.20.2/panels/printers/pp-maintenance-command.h gnome-control-center-3.22.1/panels/printers/pp-maintenance-command.h --- gnome-control-center-3.20.2/panels/printers/pp-maintenance-command.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/pp-maintenance-command.h 2016-08-12 12:43:57.000000000 +0000 @@ -48,21 +48,28 @@ GObjectClass parent_class; }; -GType pp_maintenance_command_get_type (void) G_GNUC_CONST; - -PpMaintenanceCommand *pp_maintenance_command_new (const gchar *printer_name, - const gchar *command, - const gchar *title); - -void pp_maintenance_command_execute_async (PpMaintenanceCommand *command, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean pp_maintenance_command_execute_finish (PpMaintenanceCommand *command, - GAsyncResult *result, - GError **error); +GType pp_maintenance_command_get_type (void) G_GNUC_CONST; +PpMaintenanceCommand *pp_maintenance_command_new (const gchar *printer_name, + const gchar *command, + const gchar *title); + +void pp_maintenance_command_execute_async (PpMaintenanceCommand *command, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean pp_maintenance_command_execute_finish (PpMaintenanceCommand *command, + GAsyncResult *result, + GError **error); +void pp_maintenance_command_is_supported_async (PpMaintenanceCommand *command, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean pp_maintenance_command_is_supported_finish (PpMaintenanceCommand *command, + GAsyncResult *result, + GError **error); G_END_DECLS #endif /* __PP_MAINTENANCE_COMMAND_H__ */ diff -Nru gnome-control-center-3.20.2/panels/printers/pp-printer.c gnome-control-center-3.22.1/panels/printers/pp-printer.c --- gnome-control-center-3.20.2/panels/printers/pp-printer.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/pp-printer.c 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,288 @@ +/* + * Copyright (C) 2016 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * Authors: Martin Hatina + * Marek Kasik + */ + +#include "pp-printer.h" + +#include "pp-utils.h" + +typedef struct _PpPrinter PpPrinter; +typedef struct _PpPrinterPrivate PpPrinterPrivate; + +struct _PpPrinter +{ + GObject parent_instance; + PpPrinterPrivate *priv; +}; + +struct _PpPrinterPrivate +{ + gchar *printer_name; +}; + +G_DEFINE_TYPE_WITH_PRIVATE (PpPrinter, pp_printer, G_TYPE_OBJECT) + +enum +{ + PROP_0 = 0, + PROP_NAME +}; + +static void +pp_printer_dispose (GObject *object) +{ + PpPrinterPrivate *priv = PP_PRINTER (object)->priv; + + g_free (priv->printer_name); + + G_OBJECT_CLASS (pp_printer_parent_class)->dispose (object); +} + +static void +pp_printer_finalize (GObject *object) +{ + G_OBJECT_CLASS (pp_printer_parent_class)->finalize (object); +} + +static void +pp_printer_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + PpPrinter *self = PP_PRINTER (object); + + switch (property_id) + { + case PROP_NAME: + g_value_set_string (value, self->priv->printer_name); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +pp_printer_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + PpPrinter *self = PP_PRINTER (object); + + switch (property_id) + { + case PROP_NAME: + g_free (self->priv->printer_name); + self->priv->printer_name = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } + +} + +static void +pp_printer_class_init (PpPrinterClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + gobject_class->set_property = pp_printer_set_property; + gobject_class->get_property = pp_printer_get_property; + gobject_class->dispose = pp_printer_dispose; + gobject_class->finalize = pp_printer_finalize; + + g_object_class_install_property (gobject_class, PROP_NAME, + g_param_spec_string ("printer-name", + "Printer name", + "Name of this printer", + NULL, + G_PARAM_READWRITE)); +} + +static void +pp_printer_init (PpPrinter *printer) +{ + printer->priv = G_TYPE_INSTANCE_GET_PRIVATE (printer, + PP_TYPE_PRINTER, + PpPrinterPrivate); +} + +PpPrinter * +pp_printer_new (const gchar *name) +{ + PpPrinter *self = g_object_new (PP_TYPE_PRINTER, "printer-name", name, NULL); + + return self; +} + +static void +printer_rename_thread (GTask *task, + gpointer source_object, + gpointer task_data, + GCancellable *cancellable) +{ + PpPrinter *printer = PP_PRINTER (source_object); + gboolean result; + gchar *new_printer_name = task_data; + gchar *old_printer_name; + + g_object_get (printer, "printer-name", &old_printer_name, NULL); + + result = printer_rename (old_printer_name, new_printer_name); + + if (result) + { + g_object_set (printer, "printer-name", new_printer_name, NULL); + } + + g_free (old_printer_name); + + g_task_return_boolean (task, result); +} + +static void +printer_rename_dbus_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + PpPrinter *printer; + GVariant *output; + gboolean result = FALSE; + GError *error = NULL; + GTask *task = user_data; + gchar *old_printer_name; + + output = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object), + res, + &error); + g_object_unref (source_object); + + if (output != NULL) + { + const gchar *ret_error; + + printer = g_task_get_source_object (task); + g_object_get (printer, "printer-name", &old_printer_name, NULL); + + g_variant_get (output, "(&s)", &ret_error); + if (ret_error[0] != '\0') + { + g_warning ("cups-pk-helper: renaming of printer %s failed: %s", old_printer_name, ret_error); + } + else + { + result = TRUE; + g_object_set (printer, "printer-name", g_task_get_task_data (task), NULL); + } + + g_task_return_boolean (task, result); + + g_free (old_printer_name); + g_variant_unref (output); + } + else + { + if (error->domain == G_DBUS_ERROR && + (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN || + error->code == G_DBUS_ERROR_UNKNOWN_METHOD)) + { + g_warning ("Update cups-pk-helper to at least 0.2.6 please to be able to use PrinterRename method."); + g_error_free (error); + + g_task_run_in_thread (task, printer_rename_thread); + } + else + { + g_task_return_boolean (task, FALSE); + } + } +} + +static void +get_bus_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + GDBusConnection *bus; + GError *error = NULL; + GTask *task = user_data; + gchar *printer_name; + + bus = g_bus_get_finish (res, &error); + if (bus != NULL) + { + g_object_get (g_task_get_source_object (task), + "printer-name", &printer_name, + NULL); + g_dbus_connection_call (bus, + MECHANISM_BUS, + "/", + MECHANISM_BUS, + "PrinterRename", + g_variant_new ("(ss)", + printer_name, + g_task_get_task_data (task)), + G_VARIANT_TYPE ("(s)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + g_task_get_cancellable (task), + printer_rename_dbus_cb, + task); + + g_free (printer_name); + } + else + { + g_warning ("Failed to get system bus: %s", error->message); + g_error_free (error); + g_task_return_boolean (task, FALSE); + } +} + +void +pp_printer_rename_async (PpPrinter *printer, + const gchar *new_printer_name, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GTask *task; + + task = g_task_new (G_OBJECT (printer), cancellable, callback, user_data); + g_task_set_task_data (task, g_strdup (new_printer_name), g_free); + + g_bus_get (G_BUS_TYPE_SYSTEM, + cancellable, + get_bus_cb, + task); +} + +gboolean +pp_printer_rename_finish (PpPrinter *printer, + GAsyncResult *res, + GError **error) +{ + g_return_val_if_fail (g_task_is_valid (res, printer), FALSE); + g_object_unref (res); + + return g_task_propagate_boolean (G_TASK (res), error); +} diff -Nru gnome-control-center-3.20.2/panels/printers/pp-printer.h gnome-control-center-3.22.1/panels/printers/pp-printer.h --- gnome-control-center-3.20.2/panels/printers/pp-printer.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/pp-printer.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2016 Red Hat, Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * Authors: Martin Hatina + * Marek Kasik + */ + +#ifndef __PP_PRINTER_H__ +#define __PP_PRINTER_H__ + +#include +#include + +G_BEGIN_DECLS + +#define PP_TYPE_PRINTER (pp_printer_get_type ()) + +G_DECLARE_FINAL_TYPE (PpPrinter, pp_printer, PP, PRINTER, GObject) + +GType pp_printer_get_type (void) G_GNUC_CONST; + +PpPrinter *pp_printer_new (const gchar *name); + +void pp_printer_rename_async (PpPrinter *printer, + const gchar *new_printer_name, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean pp_printer_rename_finish (PpPrinter *printer, + GAsyncResult *res, + GError **error); + +G_END_DECLS + +#endif /* __PP_PRINTER_H__ */ diff -Nru gnome-control-center-3.20.2/panels/printers/printers.ui gnome-control-center-3.22.1/panels/printers/printers.ui --- gnome-control-center-3.20.2/panels/printers/printers.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/printers.ui 2016-10-10 16:16:39.000000000 +0000 @@ -2,18 +2,31 @@ - - 10 - vertical - 10 + 6 6 6 6 + + True + + + True + True + True + + + + + loading-page + + + True - 10 + 20 + 10 True @@ -536,123 +549,100 @@ False - - - True - False - 10 - vertical - center - - - True - False - start - 64 - printer-symbolic - - - - False - False - 0 - - - - - True - - - - 1 - - - - - Add a Printer - True - True - True - center - normal - - - - False - False - 2 - - - - - 1 - - - - - True - No printers - - - 1 - False - - - - - True - False - 20 - vertical - - - True - False - 1 - Sorry! The system printing service + + + True + True + 1 + + + + + printers-list + + + + + True + False + 10 + vertical + center + + + True + False + start + 72 + printer-symbolic + + + + False + False + 0 + + + + + True + 15 + No printers + + + + + + + 1 + + + + + Add a Printer + True + True + True + center + normal + + + + False + False + 2 + + + + + empty-state + + + + + True + False + 10 + vertical + center + + + True + False + Sorry! The system printing service doesn't seem to be available. - - - True - True - 0 - - - - - True - False - start - 64 - computer-fail - - - True - True - 1 - - - - - 2 - - - - - True - No cups - - - 2 - False - - + + + + True @@ -660,11 +650,26 @@ 1 + + + True + False + start + 72 + computer-fail-symbolic + + + + True + True + 0 + + - True - True - 0 + no-cups-page diff -Nru gnome-control-center-3.20.2/panels/printers/test-canonicalization.c gnome-control-center-3.22.1/panels/printers/test-canonicalization.c --- gnome-control-center-3.20.2/panels/printers/test-canonicalization.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/test-canonicalization.c 2016-08-12 12:43:57.000000000 +0000 @@ -6,42 +6,19 @@ #include "pp-utils.h" -int -main (int argc, char **argv) +static void +test_canonicalization (gconstpointer data) { + const char *contents = data; guint i, j; - char *contents; char **lines; - char *locale; - - /* Running in some locales will - * break the tests as "ü" will be transliterated to - * "ue" in de_DE, and 'u"' in the C locale. - * - * Work around that by forcing en_US with UTF-8 in - * our tests - * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ - - locale = setlocale (LC_ALL, "en_US.UTF-8"); - if (locale == NULL) - { - g_debug("Missing en_US.UTF-8 locale, ignoring test."); - return 0; - } - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - if (g_file_get_contents (argv[1], &contents, NULL, NULL) == FALSE) - { - g_warning ("Failed to load '%s'", argv[1]); - return 1; - } lines = g_strsplit (contents, "\n", -1); if (lines == NULL) { g_warning ("Test file is empty"); - return 1; + g_test_fail (); + return; } for (i = 0; lines[i] != NULL; i++) @@ -81,6 +58,7 @@ { g_error ("Result for ('%s', '%s', '%s', '%s') doesn't match '%s' (got: '%s')", items[1], items[2], items[3], items[4], items[5], canonicalized_name); + g_test_fail (); } else { @@ -96,13 +74,46 @@ else { g_warning ("Line number %u has not correct number of items!", i); + g_test_fail (); } g_strfreev (items); } g_strfreev (lines); - g_free (contents); +} + +int +main (int argc, char **argv) +{ + char *locale; + char *contents; + + /* Running in some locales will + * break the tests as "ü" will be transliterated to + * "ue" in de_DE, and 'u"' in the C locale. + * + * Work around that by forcing en_US with UTF-8 in + * our tests + * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ + + locale = setlocale (LC_ALL, "en_US.UTF-8"); + if (locale == NULL) + { + g_debug("Missing en_US.UTF-8 locale, ignoring test."); + return 0; + } + + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + g_test_init (&argc, &argv, NULL); + + if (g_file_get_contents (TEST_SRCDIR "/canonicalization-test.txt", &contents, NULL, NULL) == FALSE) + { + g_warning ("Failed to load '%s'", TEST_SRCDIR "/canonicalization-test.txt"); + return 1; + } + + g_test_add_data_func ("/printers/canonicalization", contents, test_canonicalization); - return 0; + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/panels/printers/test-shift.c gnome-control-center-3.22.1/panels/printers/test-shift.c --- gnome-control-center-3.20.2/panels/printers/test-shift.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/printers/test-shift.c 2016-08-12 12:43:57.000000000 +0000 @@ -6,43 +6,20 @@ #include "pp-utils.h" -int -main (int argc, char **argv) +static void +test_shift (gconstpointer data) { + const char *contents = data; guint i; char *str; - char *contents; char **lines; - char *locale; - - /* Running in some locales will - * break the tests as "ü" will be transliterated to - * "ue" in de_DE, and 'u"' in the C locale. - * - * Work around that by forcing en_US with UTF-8 in - * our tests - * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ - - locale = setlocale (LC_ALL, "en_US.UTF-8"); - if (locale == NULL) - { - g_debug("Missing en_US.UTF-8 locale, ignoring test."); - return 0; - } - - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - if (g_file_get_contents (argv[1], &contents, NULL, NULL) == FALSE) - { - g_warning ("Failed to load '%s'", argv[1]); - return 1; - } lines = g_strsplit (contents, "\n", -1); if (lines == NULL) { g_warning ("Test file is empty"); - return 1; + g_test_fail (); + return; } for (i = 0; lines[i] != NULL; i++) @@ -64,6 +41,7 @@ { g_error ("Result for '%s' doesn't match '%s' (got: '%s')", utf8, items[1], str); + g_test_fail (); } else { @@ -78,7 +56,40 @@ } g_strfreev (lines); - g_free (contents); - return 0; +} + +int +main (int argc, char **argv) +{ + char *locale; + char *contents; + + /* Running in some locales will + * break the tests as "ü" will be transliterated to + * "ue" in de_DE, and 'u"' in the C locale. + * + * Work around that by forcing en_US with UTF-8 in + * our tests + * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ + + locale = setlocale (LC_ALL, "en_US.UTF-8"); + if (locale == NULL) + { + g_debug("Missing en_US.UTF-8 locale, ignoring test."); + return 0; + } + + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + g_test_init (&argc, &argv, NULL); + + if (g_file_get_contents (TEST_SRCDIR "/shift-test.txt", &contents, NULL, NULL) == FALSE) + { + g_warning ("Failed to load '%s'", TEST_SRCDIR "/shift-test.txt"); + return 1; + } + + g_test_add_data_func ("/printers/shift", contents, test_shift); + + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/panels/privacy/cc-privacy-panel.c gnome-control-center-3.22.1/panels/privacy/cc-privacy-panel.c --- gnome-control-center-3.20.2/panels/privacy/cc-privacy-panel.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/privacy/cc-privacy-panel.c 2016-08-31 11:24:09.000000000 +0000 @@ -122,9 +122,9 @@ get_privacy_policy_url (void) { char *buffer; - char *name; + char *url; - name = NULL; + url = NULL; if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL)) { @@ -139,24 +139,24 @@ if (start != NULL && end != NULL) { - name = g_strndup (start, end - start); + url = g_strndup (start, end - start); } g_free (buffer); } - if (name && *name != '\0') + if (url && *url != '\0') { char *tmp; - tmp = g_shell_unquote (name, NULL); - g_free (name); - name = tmp; + tmp = g_shell_unquote (url, NULL); + g_free (url); + url = tmp; } - if (name == NULL) - name = g_strdup ("http://www.gnome.org/privacy-policy"); + if (url == NULL) + url = g_strdup ("http://www.gnome.org/privacy-policy"); - return name; + return url; } static void diff -Nru gnome-control-center-3.20.2/panels/privacy/cc-privacy-resources.c gnome-control-center-3.22.1/panels/privacy/cc-privacy-resources.c --- gnome-control-center-3.20.2/panels/privacy/cc-privacy-resources.c 2016-10-11 14:27:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/privacy/cc-privacy-resources.c 2016-10-11 12:15:00.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[31172]; const double alignment; void * const ptr;} cc_privacy_resource_data = { { +static const SECTION union { const guint8 data[31928]; const double alignment; void * const ptr;} cc_privacy_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, @@ -22,22 +22,22 @@ 0xe0, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x25, 0xad, 0x45, 0xa3, 0x05, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x76, 0x00, - 0xf0, 0x00, 0x00, 0x00, 0xa4, 0x79, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x98, 0x7c, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 0x01, 0x00, 0x00, 0x00, - 0xa4, 0x79, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0xac, 0x79, 0x00, 0x00, 0xb0, 0x79, 0x00, 0x00, + 0x98, 0x7c, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0xa0, 0x7c, 0x00, 0x00, 0xa4, 0x7c, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0xb0, 0x79, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0xb4, 0x79, 0x00, 0x00, 0xb8, 0x79, 0x00, 0x00, + 0xa4, 0x7c, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0xa8, 0x7c, 0x00, 0x00, 0xac, 0x7c, 0x00, 0x00, 0x5b, 0xd1, 0xee, 0xd9, 0x00, 0x00, 0x00, 0x00, - 0xb8, 0x79, 0x00, 0x00, 0x08, 0x00, 0x4c, 0x00, - 0xc0, 0x79, 0x00, 0x00, 0xc4, 0x79, 0x00, 0x00, + 0xac, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x4c, 0x00, + 0xb4, 0x7c, 0x00, 0x00, 0xb8, 0x7c, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x05, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x03, 0x00, 0x00, 0x00, 0x70, 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0xa4, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x98, 0x7b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -399,125 +399,19 @@ 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x36, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, 0x6e, - 0x67, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x68, - 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x20, 0x6d, - 0x61, 0x6b, 0x65, 0x73, 0x20, 0x74, 0x68, 0x69, - 0x6e, 0x67, 0x73, 0x20, 0x65, 0x61, 0x73, 0x69, - 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x66, 0x69, - 0x6e, 0x64, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6e, - 0x2e, 0x20, 0x54, 0x68, 0x65, 0x73, 0x65, 0x20, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x20, 0x61, 0x72, - 0x65, 0x20, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x20, - 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x6f, - 0x76, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, - 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x33, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, @@ -526,92 +420,107 @@ 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x36, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x6e, 0x74, 0x6c, 0x79, 0x5f, 0x75, 0x73, 0x65, - 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, + 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x69, + 0x6e, 0x67, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, + 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x20, + 0x6d, 0x61, 0x6b, 0x65, 0x73, 0x20, 0x74, 0x68, + 0x69, 0x6e, 0x67, 0x73, 0x20, 0x65, 0x61, 0x73, + 0x69, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x66, + 0x69, 0x6e, 0x64, 0x20, 0x61, 0x67, 0x61, 0x69, + 0x6e, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x73, 0x65, + 0x20, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x6e, 0x65, 0x76, 0x65, 0x72, + 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, + 0x6f, 0x76, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x63, 0x65, 0x6e, - 0x74, 0x6c, 0x79, 0x20, 0x55, 0x73, 0x65, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, - 0x6c, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x6e, 0x74, - 0x6c, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x72, 0x69, 0x64, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -620,17 +529,207 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x5f, 0x75, 0x73, + 0x65, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x63, 0x65, + 0x6e, 0x74, 0x6c, 0x79, 0x20, 0x55, 0x73, 0x65, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x72, 0x65, 0x63, 0x65, 0x6e, + 0x74, 0x6c, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x64, + 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x6e, + 0x74, 0x6c, 0x79, 0x5f, 0x75, 0x73, 0x65, 0x64, + 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, + 0x5f, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x52, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x20, + 0x5f, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, + 0x5f, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, @@ -638,12 +737,12 @@ 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, @@ -658,131 +757,350 @@ 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, - 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, + 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x54, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, + 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x63, + 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x52, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x5f, - 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x74, + 0x65, 0x78, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x72, 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, - 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x5f, - 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x72, + 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, 0x69, + 0x73, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x61, 0x72, 0x65, 0x61, 0x35, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, - 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x54, 0x65, 0x78, - 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, 0x69, - 0x73, 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x63, 0x6f, - 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, + 0x6c, 0x65, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x63, + 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x6c, + 0x5f, 0x65, 0x61, 0x72, 0x20, 0x52, 0x65, 0x63, + 0x65, 0x6e, 0x74, 0x20, 0x48, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x74, 0x65, - 0x78, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x63, + 0x6c, 0x65, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x63, + 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, + 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x63, 0x72, + 0x65, 0x65, 0x6e, 0x20, 0x4c, 0x6f, 0x63, 0x6b, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, + 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x72, 0x65, - 0x74, 0x61, 0x69, 0x6e, 0x5f, 0x68, 0x69, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x5f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, + 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, + 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x68, + 0x65, 0x20, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, + 0x20, 0x4c, 0x6f, 0x63, 0x6b, 0x20, 0x70, 0x72, + 0x6f, 0x74, 0x65, 0x63, 0x74, 0x73, 0x20, 0x79, + 0x6f, 0x75, 0x72, 0x20, 0x70, 0x72, 0x69, 0x76, + 0x61, 0x63, 0x79, 0x20, 0x77, 0x68, 0x65, 0x6e, + 0x20, 0x79, 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65, + 0x20, 0x61, 0x77, 0x61, 0x79, 0x2e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, @@ -798,212 +1116,272 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x61, 0x72, 0x65, 0x61, 0x35, 0x22, 0x3e, 0x3c, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x72, + 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6c, - 0x65, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x63, 0x65, - 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x6c, 0x5f, - 0x65, 0x61, 0x72, 0x20, 0x52, 0x65, 0x63, 0x65, - 0x6e, 0x74, 0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, - 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, + 0x69, 0x63, 0x20, 0x53, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x20, 0x5f, 0x4c, 0x6f, 0x63, 0x6b, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, + 0x69, 0x63, 0x5f, 0x73, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, + 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, + 0x74, 0x69, 0x63, 0x5f, 0x73, 0x63, 0x72, 0x65, + 0x65, 0x6e, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x63, 0x6c, - 0x65, 0x61, 0x72, 0x5f, 0x72, 0x65, 0x63, 0x65, - 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, - 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x53, 0x63, 0x72, 0x65, - 0x65, 0x6e, 0x20, 0x4c, 0x6f, 0x63, 0x6b, 0x3c, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x61, + 0x66, 0x74, 0x65, 0x72, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x63, + 0x6b, 0x20, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, + 0x20, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, + 0x62, 0x6c, 0x61, 0x6e, 0x6b, 0x20, 0x66, 0x6f, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, + 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, + 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x31, 0x22, 0x3e, 0x3c, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, + 0x42, 0x6f, 0x78, 0x54, 0x65, 0x78, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x6b, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, + 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -1016,113 +1394,283 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, + 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x61, 0x66, 0x74, + 0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x54, 0x68, 0x65, 0x20, - 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x4c, - 0x6f, 0x63, 0x6b, 0x20, 0x70, 0x72, 0x6f, 0x74, - 0x65, 0x63, 0x74, 0x73, 0x20, 0x79, 0x6f, 0x75, - 0x72, 0x20, 0x70, 0x72, 0x69, 0x76, 0x61, 0x63, - 0x79, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x79, - 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65, 0x20, 0x61, - 0x77, 0x61, 0x79, 0x2e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, - 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, - 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x5f, 0x67, 0x72, 0x69, 0x64, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, + 0x20, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, - 0x6e, 0x64, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x6e, 0x6f, + 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x6e, 0x6f, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x72, 0x61, 0x73, 0x68, 0x5f, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x50, 0x75, 0x72, 0x67, + 0x65, 0x20, 0x54, 0x72, 0x61, 0x73, 0x68, 0x20, + 0x26, 0x61, 0x6d, 0x70, 0x3b, 0x20, 0x54, 0x65, + 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, + 0x46, 0x69, 0x6c, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, + 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x34, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, + 0x62, 0x65, 0x6c, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -1135,13 +1683,29 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, @@ -1149,187 +1713,110 @@ 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x20, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, - 0x5f, 0x4c, 0x6f, 0x63, 0x6b, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x70, 0x75, 0x72, + 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x54, + 0x72, 0x61, 0x73, 0x68, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, + 0x72, 0x79, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x20, 0x74, 0x6f, 0x20, 0x68, 0x65, 0x6c, 0x70, + 0x20, 0x6b, 0x65, 0x65, 0x70, 0x20, 0x79, 0x6f, + 0x75, 0x72, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, + 0x74, 0x65, 0x72, 0x20, 0x66, 0x72, 0x65, 0x65, + 0x20, 0x6f, 0x66, 0x20, 0x75, 0x6e, 0x6e, 0x65, + 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x20, + 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, + 0x65, 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, - 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, - 0x5f, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x5f, - 0x6c, 0x6f, 0x63, 0x6b, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, + 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x5f, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, - 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, + 0x69, 0x64, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x61, 0x66, 0x74, - 0x65, 0x72, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x63, 0x6b, 0x20, - 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x5f, - 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x62, 0x6c, - 0x61, 0x6e, 0x6b, 0x20, 0x66, 0x6f, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x61, 0x66, - 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x62, - 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, - 0x78, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, - 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, - 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, + 0x74, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -1342,91 +1829,43 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x6c, 0x6f, - 0x63, 0x6b, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, - 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, + 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x6c, 0x79, 0x20, 0x65, 0x6d, 0x70, 0x74, + 0x79, 0x20, 0x5f, 0x54, 0x72, 0x61, 0x73, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, + 0x74, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x76, 0x69, 0x73, + 0x69, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x69, 0x6e, + 0x6b, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, 0x20, 0x5f, - 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x73, - 0x68, 0x6f, 0x77, 0x5f, 0x6e, 0x6f, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, @@ -1438,7 +1877,7 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, @@ -1455,9 +1894,9 @@ 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, - 0x77, 0x5f, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x75, 0x72, + 0x67, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x73, 0x68, + 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -1489,7 +1928,7 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, @@ -1501,103 +1940,89 @@ 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x61, - 0x73, 0x68, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x50, 0x75, 0x72, 0x67, 0x65, 0x20, - 0x54, 0x72, 0x61, 0x73, 0x68, 0x20, 0x26, 0x61, - 0x6d, 0x70, 0x3b, 0x20, 0x54, 0x65, 0x6d, 0x70, - 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, 0x46, 0x69, - 0x6c, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, + 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, + 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x6c, 0x79, 0x20, 0x70, 0x75, 0x72, 0x67, 0x65, + 0x20, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, + 0x72, 0x79, 0x20, 0x5f, 0x46, 0x69, 0x6c, 0x65, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x70, 0x75, 0x72, 0x67, 0x65, + 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, - 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, - 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, - 0x76, 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, + 0x6d, 0x70, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -1605,81 +2030,38 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, - 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, - 0x79, 0x20, 0x70, 0x75, 0x72, 0x67, 0x65, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x54, 0x72, 0x61, 0x73, - 0x68, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x65, - 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, - 0x66, 0x69, 0x6c, 0x65, 0x73, 0x20, 0x74, 0x6f, - 0x20, 0x68, 0x65, 0x6c, 0x70, 0x20, 0x6b, 0x65, - 0x65, 0x70, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, - 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, - 0x20, 0x66, 0x72, 0x65, 0x65, 0x20, 0x6f, 0x66, - 0x20, 0x75, 0x6e, 0x6e, 0x65, 0x63, 0x65, 0x73, - 0x73, 0x61, 0x72, 0x79, 0x20, 0x73, 0x65, 0x6e, - 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x20, 0x69, - 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, - 0x72, 0x73, 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, @@ -1687,193 +2069,153 @@ 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x32, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, - 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x75, 0x72, 0x67, + 0x65, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x72, 0x61, - 0x73, 0x68, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, - 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, - 0x20, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x20, 0x5f, - 0x54, 0x72, 0x61, 0x73, 0x68, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, - 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x72, 0x61, - 0x73, 0x68, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x63, - 0x6b, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x74, 0x65, - 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x50, 0x75, 0x72, 0x67, 0x65, 0x20, 0x5f, 0x41, + 0x66, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x75, + 0x72, 0x67, 0x65, 0x5f, 0x61, 0x66, 0x74, 0x65, + 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x54, + 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x61, + 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6d, + 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x75, 0x72, 0x67, + 0x65, 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, - 0x74, 0x72, 0x61, 0x73, 0x68, 0x5f, 0x73, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, - 0x70, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, @@ -1881,197 +2223,223 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, + 0x74, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x74, + 0x72, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x20, 0x54, 0x72, + 0x61, 0x73, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x41, 0x75, 0x74, 0x6f, 0x6d, 0x61, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, - 0x70, 0x75, 0x72, 0x67, 0x65, 0x20, 0x54, 0x65, - 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, - 0x5f, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x3c, 0x2f, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, - 0x6d, 0x70, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x50, 0x75, 0x72, 0x67, 0x65, + 0x20, 0x54, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, + 0x72, 0x79, 0x20, 0x46, 0x69, 0x6c, 0x65, 0x73, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x61, - 0x66, 0x74, 0x65, 0x72, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x75, 0x72, - 0x67, 0x65, 0x20, 0x5f, 0x41, 0x66, 0x74, 0x65, - 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x70, 0x75, 0x72, 0x67, 0x65, - 0x5f, 0x61, 0x66, 0x74, 0x65, 0x72, 0x5f, 0x63, - 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, + 0x3e, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x74, + 0x72, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x70, + 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, 0x6d, + 0x70, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, + 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, - 0x6f, 0x42, 0x6f, 0x78, 0x54, 0x65, 0x78, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x75, - 0x72, 0x67, 0x65, 0x5f, 0x61, 0x66, 0x74, 0x65, - 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, + 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, @@ -2079,65 +2447,70 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, - 0x3e, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x61, - 0x66, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x6f, 0x64, - 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, + 0x20, 0x55, 0x73, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, + 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x39, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, @@ -2145,767 +2518,112 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x68, 0x6f, - 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 0x70, 0x74, - 0x79, 0x5f, 0x74, 0x72, 0x61, 0x73, 0x68, 0x5f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x20, 0x54, 0x72, 0x61, 0x73, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, 0x74, 0x65, - 0x6d, 0x70, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x75, - 0x72, 0x67, 0x65, 0x20, 0x54, 0x65, 0x6d, 0x70, - 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, 0x46, 0x69, - 0x6c, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, - 0x22, 0x30, 0x22, 0x3e, 0x65, 0x6d, 0x70, 0x74, - 0x79, 0x5f, 0x74, 0x72, 0x61, 0x73, 0x68, 0x5f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x30, - 0x22, 0x3e, 0x70, 0x75, 0x72, 0x67, 0x65, 0x5f, - 0x74, 0x65, 0x6d, 0x70, 0x5f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x66, 0x74, 0x77, - 0x61, 0x72, 0x65, 0x5f, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x53, 0x6f, 0x66, 0x74, 0x77, - 0x61, 0x72, 0x65, 0x20, 0x55, 0x73, 0x61, 0x67, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, - 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, - 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, - 0x6f, 0x78, 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x33, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x53, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, - 0x20, 0x75, 0x73, 0x20, 0x69, 0x6e, 0x66, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x61, 0x62, 0x6f, 0x75, 0x74, 0x20, 0x77, 0x68, - 0x69, 0x63, 0x68, 0x20, 0x73, 0x6f, 0x66, 0x74, - 0x77, 0x61, 0x72, 0x65, 0x20, 0x79, 0x6f, 0x75, - 0x20, 0x75, 0x73, 0x65, 0x20, 0x68, 0x65, 0x6c, - 0x70, 0x73, 0x20, 0x75, 0x73, 0x20, 0x70, 0x72, - 0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x79, 0x6f, - 0x75, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6d, - 0x6f, 0x72, 0x65, 0x20, 0x61, 0x63, 0x63, 0x75, - 0x72, 0x61, 0x74, 0x65, 0x20, 0x72, 0x65, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x20, 0x49, 0x74, - 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x68, 0x65, - 0x6c, 0x70, 0x73, 0x20, 0x75, 0x73, 0x20, 0x74, - 0x6f, 0x20, 0x69, 0x6d, 0x70, 0x72, 0x6f, 0x76, - 0x65, 0x20, 0x6f, 0x75, 0x72, 0x20, 0x73, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x2e, 0x0a, - 0x0a, 0x41, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x77, 0x65, 0x20, - 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x20, - 0x69, 0x73, 0x20, 0x6d, 0x61, 0x64, 0x65, 0x20, - 0x61, 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, - 0x73, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x77, - 0x65, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x6e, - 0x65, 0x76, 0x65, 0x72, 0x20, 0x73, 0x68, 0x61, - 0x72, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, - 0x64, 0x61, 0x74, 0x61, 0x20, 0x77, 0x69, 0x74, - 0x68, 0x20, 0x74, 0x68, 0x69, 0x72, 0x64, 0x20, - 0x70, 0x61, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, - 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x66, 0x74, - 0x77, 0x61, 0x72, 0x65, 0x5f, 0x75, 0x73, 0x61, - 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x53, 0x65, 0x6e, 0x64, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, + 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x75, 0x73, + 0x20, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, + 0x75, 0x74, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, - 0x65, 0x20, 0x75, 0x73, 0x61, 0x67, 0x65, 0x20, - 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, - 0x63, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x73, 0x6f, 0x66, 0x74, - 0x77, 0x61, 0x72, 0x65, 0x5f, 0x75, 0x73, 0x61, - 0x67, 0x65, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x66, - 0x74, 0x77, 0x61, 0x72, 0x65, 0x5f, 0x75, 0x73, - 0x61, 0x67, 0x65, 0x5f, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x61, 0x72, 0x65, 0x61, 0x39, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x6e, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x66, 0x74, 0x77, - 0x61, 0x72, 0x65, 0x5f, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, - 0x20, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x6c, - 0x69, 0x65, 0x66, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x72, 0x69, 0x22, - 0x3e, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, - 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x67, 0x6e, 0x6f, - 0x6d, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x62, - 0x72, 0x6f, 0x77, 0x73, 0x65, 0x2f, 0x67, 0x6e, - 0x6f, 0x6d, 0x65, 0x2d, 0x73, 0x6f, 0x66, 0x74, - 0x77, 0x61, 0x72, 0x65, 0x2f, 0x70, 0x6c, 0x61, - 0x69, 0x6e, 0x2f, 0x64, 0x6f, 0x63, 0x2f, 0x70, - 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, 0x2d, 0x70, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x68, 0x74, - 0x6d, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, - 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x76, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x75, 0x73, + 0x65, 0x20, 0x68, 0x65, 0x6c, 0x70, 0x73, 0x20, + 0x75, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, + 0x64, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x77, + 0x69, 0x74, 0x68, 0x20, 0x6d, 0x6f, 0x72, 0x65, + 0x20, 0x61, 0x63, 0x63, 0x75, 0x72, 0x61, 0x74, + 0x65, 0x20, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x2e, 0x20, 0x49, 0x74, 0x20, 0x61, 0x6c, + 0x73, 0x6f, 0x20, 0x68, 0x65, 0x6c, 0x70, 0x73, + 0x20, 0x75, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x69, + 0x6d, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x20, 0x6f, + 0x75, 0x72, 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, + 0x61, 0x72, 0x65, 0x2e, 0x0a, 0x0a, 0x41, 0x6c, + 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x69, 0x6e, + 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x77, 0x65, 0x20, 0x63, 0x6f, 0x6c, + 0x6c, 0x65, 0x63, 0x74, 0x20, 0x69, 0x73, 0x20, + 0x6d, 0x61, 0x64, 0x65, 0x20, 0x61, 0x6e, 0x6f, + 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, 0x2c, 0x20, + 0x61, 0x6e, 0x64, 0x20, 0x77, 0x65, 0x20, 0x77, + 0x69, 0x6c, 0x6c, 0x20, 0x6e, 0x65, 0x76, 0x65, + 0x72, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x20, + 0x79, 0x6f, 0x75, 0x72, 0x20, 0x64, 0x61, 0x74, + 0x61, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, + 0x68, 0x69, 0x72, 0x64, 0x20, 0x70, 0x61, 0x72, + 0x74, 0x69, 0x65, 0x73, 0x2e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, + 0x64, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -2919,185 +2637,321 @@ 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, - 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, - 0x20, 0x6b, 0x6e, 0x6f, 0x77, 0x20, 0x79, 0x6f, - 0x75, 0x72, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x20, 0x55, 0x73, 0x69, - 0x6e, 0x67, 0x20, 0x57, 0x69, 0x2d, 0x46, 0x69, - 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, 0x6f, 0x62, - 0x69, 0x6c, 0x65, 0x20, 0x62, 0x72, 0x6f, 0x61, - 0x64, 0x62, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x6e, - 0x63, 0x72, 0x65, 0x61, 0x73, 0x65, 0x73, 0x20, - 0x61, 0x63, 0x63, 0x75, 0x72, 0x61, 0x63, 0x79, - 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, - 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x66, - 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x53, 0x65, 0x6e, 0x64, 0x20, 0x73, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x20, 0x75, + 0x73, 0x61, 0x67, 0x65, 0x20, 0x73, 0x74, 0x61, + 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, 0x5f, + 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, + 0x72, 0x65, 0x5f, 0x75, 0x73, 0x61, 0x67, 0x65, + 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, - 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x72, - 0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, + 0x61, 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x6e, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, + 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, + 0x6c, 0x69, 0x6e, 0x6b, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, - 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x73, 0x5f, 0x67, 0x72, 0x69, 0x64, 0x22, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, + 0x69, 0x76, 0x61, 0x63, 0x79, 0x20, 0x50, 0x6f, + 0x6c, 0x69, 0x63, 0x79, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x6c, 0x69, 0x65, 0x66, + 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x22, 0x75, 0x72, 0x69, 0x22, 0x3e, 0x68, 0x74, + 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, + 0x74, 0x2e, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2e, + 0x6f, 0x72, 0x67, 0x2f, 0x62, 0x72, 0x6f, 0x77, + 0x73, 0x65, 0x2f, 0x67, 0x6e, 0x6f, 0x6d, 0x65, + 0x2d, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x2f, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x2f, + 0x64, 0x6f, 0x63, 0x2f, 0x70, 0x72, 0x69, 0x76, + 0x61, 0x63, 0x79, 0x2d, 0x70, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x33, 0x32, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, + 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, + 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, @@ -3105,65 +2959,132 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x5f, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x20, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x20, 0x74, 0x6f, 0x20, 0x6b, 0x6e, 0x6f, + 0x77, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x6c, + 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x20, 0x55, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x57, + 0x69, 0x2d, 0x46, 0x69, 0x20, 0x61, 0x6e, 0x64, + 0x20, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x20, + 0x62, 0x72, 0x6f, 0x61, 0x64, 0x62, 0x61, 0x6e, + 0x64, 0x20, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, + 0x73, 0x65, 0x73, 0x20, 0x61, 0x63, 0x63, 0x75, + 0x72, 0x61, 0x63, 0x79, 0x2e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, + 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x69, + 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -3176,20 +3097,126 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, + 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x5f, 0x72, 0x6f, 0x77, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x67, + 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x33, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x6f, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -3203,145 +3230,280 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x32, 0x3c, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, + 0x70, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x73, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x32, - 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x73, + 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x61, 0x70, 0x70, 0x73, 0x5f, 0x6c, 0x69, + 0x73, 0x74, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, + 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x69, 0x76, 0x61, 0x63, 0x79, 0x5f, 0x76, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, - 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x61, 0x70, 0x70, 0x73, 0x5f, 0x66, 0x72, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x33, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, - 0x70, 0x73, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x5f, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, + 0x33, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x32, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x32, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x72, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -3350,172 +3512,133 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x6e, - 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x76, 0x61, - 0x63, 0x79, 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x33, 0x34, 0x3c, 0x2f, 0x70, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x62, 0x72, 0x74, 0x5f, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, - 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x33, 0x34, 0x3c, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x32, 0x32, + 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, 0x6f, 0x62, + 0x6c, 0x65, 0x6d, 0x20, 0x52, 0x65, 0x70, 0x6f, + 0x72, 0x74, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x22, 0x3e, 0x32, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, + 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x66, 0x72, 0x61, 0x6d, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, - 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x62, 0x72, - 0x74, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x50, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, - 0x20, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x69, - 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, - 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, - 0x62, 0x6f, 0x78, 0x31, 0x30, 0x22, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, + 0x62, 0x72, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x6c, + 0x61, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, @@ -3523,96 +3646,141 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x61, 0x62, 0x72, 0x74, 0x5f, - 0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x3e, 0x53, + 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x72, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x20, 0x6f, + 0x66, 0x20, 0x74, 0x65, 0x63, 0x68, 0x6e, 0x69, + 0x63, 0x61, 0x6c, 0x20, 0x70, 0x72, 0x6f, 0x62, + 0x6c, 0x65, 0x6d, 0x73, 0x20, 0x68, 0x65, 0x6c, + 0x70, 0x73, 0x20, 0x75, 0x73, 0x20, 0x69, 0x6d, + 0x70, 0x72, 0x6f, 0x76, 0x65, 0x20, 0x46, 0x65, + 0x64, 0x6f, 0x72, 0x61, 0x2e, 0x20, 0x52, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x73, 0x20, 0x61, 0x72, + 0x65, 0x20, 0x73, 0x65, 0x6e, 0x74, 0x20, 0x61, + 0x6e, 0x6f, 0x6e, 0x79, 0x6d, 0x6f, 0x75, 0x73, + 0x6c, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x73, 0x63, 0x72, 0x75, 0x62, + 0x62, 0x65, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x70, + 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x20, + 0x64, 0x61, 0x74, 0x61, 0x2e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x6e, - 0x6f, 0x22, 0x3e, 0x53, 0x65, 0x6e, 0x64, 0x69, - 0x6e, 0x67, 0x20, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x65, - 0x63, 0x68, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x20, - 0x70, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x73, - 0x20, 0x68, 0x65, 0x6c, 0x70, 0x73, 0x20, 0x75, - 0x73, 0x20, 0x69, 0x6d, 0x70, 0x72, 0x6f, 0x76, - 0x65, 0x20, 0x46, 0x65, 0x64, 0x6f, 0x72, 0x61, - 0x2e, 0x20, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, 0x65, - 0x6e, 0x74, 0x20, 0x61, 0x6e, 0x6f, 0x6e, 0x79, - 0x6d, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x20, 0x61, - 0x6e, 0x64, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, - 0x63, 0x72, 0x75, 0x62, 0x62, 0x65, 0x64, 0x20, - 0x6f, 0x66, 0x20, 0x70, 0x65, 0x72, 0x73, 0x6f, - 0x6e, 0x61, 0x6c, 0x20, 0x64, 0x61, 0x74, 0x61, - 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x62, + 0x72, 0x74, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x3e, 0x26, 0x6c, + 0x74, 0x3b, 0x61, 0x20, 0x68, 0x72, 0x65, 0x66, + 0x3d, 0x22, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, + 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67, 0x6e, 0x6f, + 0x6d, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x70, + 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, 0x22, 0x26, + 0x67, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x76, 0x61, + 0x63, 0x79, 0x20, 0x50, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x26, 0x6c, 0x74, 0x3b, 0x2f, 0x61, 0x26, + 0x67, 0x74, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, + 0x75, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, - 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -3628,282 +3796,208 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x62, 0x72, 0x74, 0x5f, 0x70, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x6c, 0x69, - 0x6e, 0x6b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x72, 0x69, 0x64, 0x34, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x62, + 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x6e, 0x6f, - 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x61, 0x20, - 0x68, 0x72, 0x65, 0x66, 0x3d, 0x22, 0x68, 0x74, - 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, - 0x2e, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2e, 0x6f, - 0x72, 0x67, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x61, - 0x63, 0x79, 0x22, 0x26, 0x67, 0x74, 0x3b, 0x50, - 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, 0x20, 0x50, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x26, 0x6c, 0x74, - 0x3b, 0x2f, 0x61, 0x26, 0x67, 0x74, 0x3b, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x75, 0x74, 0x6f, + 0x6d, 0x61, 0x74, 0x69, 0x63, 0x20, 0x50, 0x72, + 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x20, 0x52, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x6d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x61, 0x62, 0x72, 0x74, 0x5f, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, - 0x64, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x62, 0x72, 0x74, 0x5f, 0x73, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x62, 0x72, 0x74, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x41, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x20, 0x50, 0x72, 0x6f, 0x62, 0x6c, 0x65, - 0x6d, 0x20, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, 0x62, 0x72, - 0x74, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x61, 0x62, 0x72, 0x74, - 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x2f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x70, 0x72, 0x69, 0x76, 0x61, 0x63, 0x79, 0x2f, - 0x02, 0x00, 0x00, 0x00 + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x70, 0x72, 0x69, 0x76, + 0x61, 0x63, 0x79, 0x2f, 0x02, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { cc_privacy_resource_data.data, sizeof (cc_privacy_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/privacy/gnome-privacy-panel.desktop.in.in gnome-control-center-3.22.1/panels/privacy/gnome-privacy-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/privacy/gnome-privacy-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/privacy/gnome-privacy-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Privacy +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Pri­va­cy _Comment=Protect your personal information and control what others might see Exec=gnome-control-center privacy # FIXME @@ -8,7 +9,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-AccountSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/privacy/Makefile.in gnome-control-center-3.22.1/panels/privacy/Makefile.in --- gnome-control-center-3.20.2/panels/privacy/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/privacy/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -314,8 +314,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -528,22 +526,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-privacy-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/privacy/privacy.ui gnome-control-center-3.22.1/panels/privacy/privacy.ui --- gnome-control-center-3.20.2/panels/privacy/privacy.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/privacy/privacy.ui 2016-08-23 16:17:04.000000000 +0000 @@ -132,6 +132,10 @@ False vertical 2 + 12 + 12 + 12 + 12 True @@ -144,6 +148,9 @@ Remembering your history makes things easier to find again. These items are never shared over the network. True 50 + False @@ -159,7 +166,7 @@ 6 12 12 - 12 + 18 6 @@ -275,7 +282,11 @@ False vertical - 2 + 6 + 12 + 12 + 12 + 12 True @@ -285,6 +296,9 @@ 6 12 The Screen Lock protects your privacy when you are away. + False @@ -300,7 +314,7 @@ 2 6 12 - 12 + 18 6 @@ -421,6 +435,10 @@ False vertical 2 + 12 + 12 + 12 + 12 True @@ -433,6 +451,9 @@ Automatically purge the Trash and temporary files to help keep your computer free of unnecessary sensitive information. True 50 + False @@ -448,7 +469,7 @@ 6 12 12 - 12 + 18 6 @@ -556,9 +577,10 @@ False horizontal True - 6 + 12 12 6 + 12 12 @@ -731,12 +753,14 @@ True False - 12 12 Location services allow applications to know your location. Using Wi-Fi and mobile broadband increases accuracy. True 50 0 + False @@ -768,7 +792,7 @@ 0 32 12 - 6 + 12 12 12 @@ -777,7 +801,6 @@ False True 0 - center _Location Services True @@ -794,13 +817,12 @@ True True end - center 1 0 1 - 2 + 1 @@ -898,6 +920,10 @@ False vertical 2 + 12 + 12 + 12 + 12 True diff -Nru gnome-control-center-3.20.2/panels/region/cc-input-chooser.c gnome-control-center-3.22.1/panels/region/cc-input-chooser.c --- gnome-control-center-3.20.2/panels/region/cc-input-chooser.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/cc-input-chooser.c 2016-05-13 16:39:31.000000000 +0000 @@ -1024,6 +1024,17 @@ g_free (priv); } +static gboolean +reset_on_escape (GtkWidget *widget, + GdkEventKey *event, + GtkWidget *chooser) +{ + if (event->keyval == GDK_KEY_Escape) + cc_input_chooser_reset (chooser); + + return FALSE; +} + GtkWidget * cc_input_chooser_new (GtkWindow *main_window, gboolean is_login, @@ -1069,6 +1080,7 @@ g_signal_connect (priv->list, "selected-rows-changed", G_CALLBACK (selected_rows_changed), chooser); g_signal_connect_swapped (priv->filter_entry, "search-changed", G_CALLBACK (filter_changed), chooser); + g_signal_connect (priv->filter_entry, "key-release-event", G_CALLBACK (reset_on_escape), chooser); if (priv->is_login) gtk_widget_show (WID ("login-label")); @@ -1139,5 +1151,10 @@ void cc_input_chooser_reset (GtkWidget *chooser) { + CcInputChooserPrivate *priv = GET_PRIVATE (chooser); + priv->showing_extra = FALSE; + gtk_entry_set_text (GTK_ENTRY (priv->filter_entry), ""); + gtk_widget_hide (priv->filter_entry); + g_clear_pointer (&priv->filter_words, g_strfreev); show_locale_rows (chooser); } diff -Nru gnome-control-center-3.20.2/panels/region/cc-region-panel.c gnome-control-center-3.22.1/panels/region/cc-region-panel.c --- gnome-control-center-3.20.2/panels/region/cc-region-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/cc-region-panel.c 2016-08-29 17:35:25.000000000 +0000 @@ -50,7 +50,6 @@ #include #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" -#define KEY_CURRENT_INPUT_SOURCE "current" #define KEY_INPUT_SOURCES "sources" #define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale" @@ -854,8 +853,8 @@ gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_margin_start (label, 20); gtk_widget_set_margin_end (label, 20); - gtk_widget_set_margin_top (label, 6); - gtk_widget_set_margin_bottom (label, 6); + gtk_widget_set_margin_top (label, 12); + gtk_widget_set_margin_bottom (label, 12); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); if (strcmp (type, INPUT_SOURCE_TYPE_IBUS) == 0) { @@ -1049,46 +1048,19 @@ const gchar *type; const gchar *id; GVariantBuilder builder; - GVariant *old_sources; - const gchar *old_current_type; - const gchar *old_current_id; - guint old_current; - guint old_n_sources; - guint index; GList *list, *l; - old_sources = g_settings_get_value (priv->input_settings, KEY_INPUT_SOURCES); - old_current = g_settings_get_uint (priv->input_settings, KEY_CURRENT_INPUT_SOURCE); - old_n_sources = g_variant_n_children (old_sources); - - if (old_n_sources > 0 && old_current < old_n_sources) { - g_variant_get_child (old_sources, old_current, - "(&s&s)", &old_current_type, &old_current_id); - } else { - old_current_type = ""; - old_current_id = ""; - } - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)")); - index = 0; list = gtk_container_get_children (GTK_CONTAINER (priv->input_list)); for (l = list; l; l = l->next) { type = (const gchar *)g_object_get_data (G_OBJECT (l->data), "type"); id = (const gchar *)g_object_get_data (G_OBJECT (l->data), "id"); - if (index != old_current && - g_str_equal (type, old_current_type) && - g_str_equal (id, old_current_id)) { - g_settings_set_uint (priv->input_settings, KEY_CURRENT_INPUT_SOURCE, index); - } g_variant_builder_add (&builder, "(ss)", type, id); - index += 1; } g_list_free (list); g_settings_set_value (priv->input_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder)); g_settings_apply (priv->input_settings); - - g_variant_unref (old_sources); } static void set_localed_input (CcRegionPanel *self); @@ -1510,8 +1482,8 @@ gtk_list_box_set_header_func (GTK_LIST_BOX (priv->input_list), cc_list_box_update_header_func, NULL, NULL); - g_signal_connect_swapped (priv->input_list, "row-selected", - G_CALLBACK (update_buttons), self); + g_signal_connect_object (priv->input_list, "row-selected", + G_CALLBACK (update_buttons), self, G_CONNECT_SWAPPED); g_signal_connect (priv->input_settings, "changed::" KEY_INPUT_SOURCES, G_CALLBACK (input_sources_changed), self); diff -Nru gnome-control-center-3.20.2/panels/region/cc-region-resources.c gnome-control-center-3.22.1/panels/region/cc-region-resources.c --- gnome-control-center-3.20.2/panels/region/cc-region-resources.c 2016-10-11 14:27:07.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/cc-region-resources.c 2016-10-11 12:14:37.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[32892]; const double alignment; void * const ptr;} cc_region_resource_data = { { +static const SECTION union { const guint8 data[32904]; const double alignment; void * const ptr;} cc_region_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, @@ -39,10 +39,10 @@ 0xa5, 0x4c, 0x00, 0x00, 0x91, 0x28, 0x5b, 0x1d, 0x08, 0x00, 0x00, 0x00, 0xa5, 0x4c, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, 0xb0, 0x4c, 0x00, 0x00, - 0x65, 0x80, 0x00, 0x00, 0xc1, 0xaf, 0xf9, 0x24, - 0x04, 0x00, 0x00, 0x00, 0x65, 0x80, 0x00, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0x6c, 0x80, 0x00, 0x00, - 0x7c, 0x80, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, + 0x6e, 0x80, 0x00, 0x00, 0xc1, 0xaf, 0xf9, 0x24, + 0x04, 0x00, 0x00, 0x00, 0x6e, 0x80, 0x00, 0x00, + 0x07, 0x00, 0x4c, 0x00, 0x78, 0x80, 0x00, 0x00, + 0x88, 0x80, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x03, 0x00, 0x00, 0x00, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x2d, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x72, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, @@ -2461,7 +2461,7 @@ 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0xa5, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xae, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -2541,8 +2541,8 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x32, - 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x33, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, @@ -2625,159 +2625,234 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x4c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x6e, 0x67, 0x75, + 0x61, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x61, - 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, 0x67, + 0x6c, 0x69, 0x73, 0x68, 0x20, 0x28, 0x55, 0x6e, + 0x69, 0x74, 0x65, 0x64, 0x20, 0x4b, 0x69, 0x6e, + 0x67, 0x64, 0x6f, 0x6d, 0x29, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, - 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x73, 0x5f, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, + 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x73, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x32, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x32, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, - 0x20, 0x28, 0x55, 0x6e, 0x69, 0x74, 0x65, 0x64, - 0x20, 0x4b, 0x69, 0x6e, 0x67, 0x64, 0x6f, 0x6d, - 0x29, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, - 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x73, 0x5f, 0x72, 0x6f, - 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x72, - 0x6d, 0x61, 0x74, 0x73, 0x5f, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, - 0x5f, 0x68, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x72, 0x6d, 0x61, + 0x74, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -2790,103 +2865,29 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, - 0x6e, 0x64, 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x32, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x46, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x72, - 0x6d, 0x61, 0x74, 0x73, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, - 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x32, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, - 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -3006,99 +3007,15 @@ 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x49, 0x6e, 0x70, 0x75, - 0x74, 0x20, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x3d, 0x22, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x22, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x66, 0x6f, 0x72, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, - 0x70, 0x75, 0x74, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, + 0x5f, 0x68, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, @@ -3106,27 +3023,56 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x49, 0x6e, 0x70, + 0x75, 0x74, 0x20, 0x53, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, + 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x66, 0x6f, + 0x72, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, @@ -3135,63 +3081,91 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, + 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x6f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x5f, 0x66, 0x72, 0x61, 0x6d, 0x65, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x5f, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, - 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x6c, 0x69, 0x73, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x66, 0x72, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -3199,86 +3173,26 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x61, - 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, 0x69, 0x6e, - 0x70, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, - 0x69, 0x6e, 0x67, 0x22, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, - 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, - 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x6f, 0x6f, - 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, - 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x22, 0x3e, - 0x69, 0x63, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x5f, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, 0x72, 0x72, - 0x6f, 0x77, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, - 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, 0x6f, - 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 0x74, 0x65, - 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, - 0x5f, 0x73, 0x5f, 0x61, 0x72, 0x5f, 0x69, 0x74, - 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x6c, 0x69, + 0x73, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -3286,32 +3200,47 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x61, 0x72, 0x5f, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x3e, 0x3c, 0x72, 0x65, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x3d, 0x22, 0x69, + 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x69, 0x6e, 0x67, 0x22, 0x20, 0x74, 0x79, + 0x70, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x6c, 0x65, 0x64, 0x2d, 0x62, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x5f, 0x61, 0x64, 0x64, 0x22, 0x3e, 0x3c, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x62, + 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x6f, + 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -3320,40 +3249,70 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, + 0x72, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x22, + 0x3e, 0x69, 0x63, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, + 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, 0x72, + 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, + 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, + 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 0x74, + 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x5f, 0x73, 0x5f, 0x61, 0x72, 0x5f, 0x69, + 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x61, 0x72, + 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, 0x20, 0x69, - 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x61, - 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -3362,226 +3321,7 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, - 0x73, 0x74, 0x2d, 0x61, 0x64, 0x64, 0x2d, 0x73, - 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, - 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, - 0x70, 0x75, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2d, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, - 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x69, 0x6e, - 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x72, 0x5f, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, - 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, - 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, - 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x49, 0x74, - 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x73, 0x65, 0x70, 0x31, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x49, - 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x75, 0x64, 0x5f, - 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x75, - 0x64, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, - 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x5f, 0x75, 0x70, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -3603,69 +3343,69 @@ 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x4d, 0x6f, 0x76, 0x65, - 0x20, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x75, 0x70, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x69, 0x5f, 0x73, 0x5f, 0x75, 0x70, 0x5f, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, 0x20, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, + 0x61, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x75, - 0x70, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, - 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, + 0x69, 0x73, 0x74, 0x2d, 0x61, 0x64, 0x64, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, + 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x64, 0x6f, - 0x77, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, + 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x5f, 0x72, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -3696,145 +3436,111 @@ 0x61, 0x6d, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, - 0x73, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x64, - 0x6f, 0x77, 0x6e, 0x2d, 0x73, 0x79, 0x6d, 0x62, - 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x69, + 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x72, + 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, + 0x73, 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, + 0x65, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, + 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, + 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x6f, 0x6f, - 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, 0x32, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, - 0x6f, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, - 0x73, 0x63, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x54, 0x6f, 0x6f, 0x6c, 0x49, + 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x65, 0x70, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, - 0x73, 0x5f, 0x73, 0x63, 0x5f, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x3e, 0x3c, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, + 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x75, 0x64, + 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -3843,32 +3549,65 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, + 0x75, 0x64, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x5f, 0x75, 0x70, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x43, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x75, 0x72, 0x65, 0x20, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, + 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, 0x6f, 0x76, + 0x65, 0x20, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x75, + 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, @@ -3876,7 +3615,7 @@ 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x73, 0x63, 0x5f, + 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x75, 0x70, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, @@ -3891,9 +3630,8 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, 0x6d, 0x62, - 0x6c, 0x65, 0x6d, 0x2d, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, + 0x75, 0x70, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, @@ -3927,105 +3665,387 @@ 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, - 0x61, 0x79, 0x6f, 0x75, 0x74, 0x22, 0x3e, 0x3c, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x64, + 0x6f, 0x77, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2d, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, + 0x5f, 0x73, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x5f, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, + 0x64, 0x6f, 0x77, 0x6e, 0x2d, 0x73, 0x79, 0x6d, + 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, + 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x54, 0x6f, + 0x6f, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, 0x32, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, + 0x77, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x6f, 0x6f, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, + 0x5f, 0x73, 0x63, 0x5f, 0x69, 0x74, 0x65, 0x6d, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, + 0x5f, 0x73, 0x5f, 0x73, 0x63, 0x5f, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, + 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x43, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x75, 0x72, 0x65, 0x20, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, 0x75, 0x72, + 0x63, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, 0x73, 0x63, + 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, 0x6d, + 0x62, 0x6c, 0x65, 0x6d, 0x2d, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x2d, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, 0x20, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x20, 0x6b, 0x65, 0x79, - 0x62, 0x6f, 0x61, 0x72, 0x64, 0x20, 0x6c, 0x61, - 0x79, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, 0x5f, - 0x73, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, + 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, + 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, + 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x77, + 0x20, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x20, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x6b, 0x65, + 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x20, 0x6c, + 0x61, 0x79, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x5f, 0x73, + 0x5f, 0x73, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, + 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x2d, 0x6b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, + 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x2d, 0x6b, 0x65, - 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2d, 0x73, - 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, - 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, @@ -4043,82 +4063,63 @@ 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x6f, + 0x67, 0x69, 0x6e, 0x20, 0x73, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x73, 0x20, 0x61, 0x72, 0x65, + 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, 0x62, 0x79, + 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x75, 0x73, 0x65, + 0x72, 0x73, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, + 0x6c, 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x20, + 0x69, 0x6e, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x67, - 0x69, 0x6e, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69, - 0x6e, 0x67, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, - 0x75, 0x73, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, - 0x61, 0x6c, 0x6c, 0x20, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6c, - 0x6f, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x69, - 0x6e, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x72, 0x65, 0x67, - 0x69, 0x6f, 0x6e, 0x2f, 0x02, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x07, 0x00, 0x00, 0x00 + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, + 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x72, 0x65, + 0x67, 0x69, 0x6f, 0x6e, 0x2f, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { cc_region_resource_data.data, sizeof (cc_region_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/region/gnome-region-panel.desktop.in.in gnome-control-center-3.22.1/panels/region/gnome-region-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/region/gnome-region-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/gnome-region-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Region & Language +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Re­gion & Lan­guage _Comment=Select your display language, formats, keyboard layouts and input sources Exec=gnome-control-center region Icon=preferences-desktop-locale @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/region/Makefile.in gnome-control-center-3.22.1/panels/region/Makefile.in --- gnome-control-center-3.20.2/panels/region/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -317,8 +317,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -551,22 +549,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-region-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/region/region.ui gnome-control-center-3.22.1/panels/region/region.ui --- gnome-control-center-3.20.2/panels/region/region.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/region/region.ui 2016-08-23 15:11:37.000000000 +0000 @@ -15,7 +15,7 @@ 134 134 24 - 24 + 32 in @@ -34,8 +34,8 @@ False 20 20 - 6 - 6 + 12 + 12 0 _Language True @@ -53,8 +53,8 @@ 1 20 20 - 6 - 6 + 12 + 12 English (United Kingdom) @@ -80,8 +80,8 @@ False 20 20 - 6 - 6 + 12 + 12 0 _Formats True @@ -99,8 +99,8 @@ 1 20 20 - 6 - 6 + 12 + 12 United Kingdom @@ -137,13 +137,13 @@ True False - 6 + 12 True False - 6 - 6 + 2 + 2 0 Input Sources diff -Nru gnome-control-center-3.20.2/panels/search/cc-search-locations-dialog.c gnome-control-center-3.22.1/panels/search/cc-search-locations-dialog.c --- gnome-control-center-3.20.2/panels/search/cc-search-locations-dialog.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/cc-search-locations-dialog.c 2016-08-12 12:43:57.000000000 +0000 @@ -19,6 +19,7 @@ */ #include "cc-search-locations-dialog.h" +#include "shell/list-box-helper.h" #include @@ -38,11 +39,39 @@ GFile *location; gchar *display_name; PlaceType place_type; - GIcon *icon; GCancellable *cancellable; const gchar *settings_key; } Place; +struct _CcSearchLocationsDialog { + GtkDialog parent; + + GtkWidget *places_list; + GtkWidget *bookmarks_list; + GtkWidget *others_list; + GtkWidget *locations_add; +}; + +struct _CcSearchLocationsDialogClass { + GtkDialogClass parent_class; +}; + +G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, GTK_TYPE_DIALOG); + +static void +cc_search_locations_dialog_finalize (GObject *object) +{ + g_clear_object (&tracker_preferences); + + G_OBJECT_CLASS (cc_search_locations_dialog_parent_class)->finalize (object); +} + +static void +cc_search_locations_dialog_init (CcSearchLocationsDialog *self) +{ + gtk_widget_init_template (GTK_WIDGET (self)); +} + static void place_free (Place * p) { @@ -52,7 +81,6 @@ g_object_unref (p->cancellable); } - g_clear_object (&p->icon); g_object_unref (p->location); g_free (p->display_name); @@ -419,7 +447,6 @@ GtkWidget *row, *box, *w; Place *place; GFileInfo *info; - const gchar *desktop_path; gchar *path; info = g_file_query_info_finish (G_FILE (source), res, NULL); @@ -432,17 +459,7 @@ box = gtk_bin_get_child (GTK_BIN (row)); - /* FIXME: GLib is currently buggy and returns a non-existent icon name - * when asked for the desktop symbolic icon. - */ - desktop_path = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); path = g_file_get_path (G_FILE (source)); - - if (g_strcmp0 (path, desktop_path) == 0) - place->icon = g_themed_icon_new ("folder-symbolic"); - else - place->icon = g_object_ref (g_file_info_get_symbolic_icon (info)); - if (g_strcmp0 (path, g_get_home_dir ()) == 0) place->settings_key = TRACKER_KEY_SINGLE_DIRECTORIES; else @@ -450,13 +467,11 @@ g_free (path); - w = gtk_image_new_from_gicon (place->icon, GTK_ICON_SIZE_MENU); - gtk_container_add (GTK_CONTAINER (box), w); - w = gtk_label_new (place->display_name); gtk_container_add (GTK_CONTAINER (box), w); w = gtk_switch_new (); + gtk_widget_set_valign (w, GTK_ALIGN_CENTER); gtk_box_pack_end (GTK_BOX (box), w, FALSE, FALSE, 0); g_settings_bind_with_mapping (tracker_preferences, place->settings_key, w, "active", @@ -469,70 +484,19 @@ g_object_unref (info); } -static const gchar * -get_heading_name (PlaceType place) -{ - if (place == PLACE_XDG) - return C_("Search Location", "Places"); - if (place == PLACE_BOOKMARKS) - return C_("Search Location", "Bookmarks"); - if (place == PLACE_OTHER) - return C_("Search Location", "Other"); - - g_assert_not_reached (); - return NULL; -} - static void -place_header_func (GtkListBoxRow *row, - GtkListBoxRow *before, - gpointer user_data) -{ - gboolean need_separator; - GtkWidget *current; - Place *place, *place_before; - gchar *text; - GtkWidget *w; +remove_button_clicked (GtkWidget *widget, + gpointer user_data) +{ + GtkWidget *row = user_data; + GPtrArray *new_values; + Place *place; - need_separator = FALSE; place = g_object_get_data (G_OBJECT (row), "place"); + new_values = place_get_new_settings_values (place, TRUE); + g_settings_set_strv (tracker_preferences, place->settings_key, (const gchar **) new_values->pdata); - if (before != NULL) - { - place_before = g_object_get_data (G_OBJECT (before), "place"); - if (place_before->place_type < place->place_type) - /* use a separator before the first item of a new type */ - need_separator = TRUE; - } - else - { - /* always put a separator before the first item */ - need_separator = TRUE; - } - - current = gtk_list_box_row_get_header (row); - if (need_separator && current == NULL) - { - text = g_strdup_printf ("%s", get_heading_name (place->place_type)); - w = gtk_label_new (NULL); - g_object_set (w, - "margin-top", 6, - "margin-end", 10, - "margin-bottom", 6, - "margin-start", 10, - NULL); - gtk_label_set_markup (GTK_LABEL (w), text); - gtk_widget_set_halign (w, GTK_ALIGN_START); - gtk_style_context_add_class (gtk_widget_get_style_context (w), "dim-label"); - - gtk_list_box_row_set_header (row, w); - - g_free (text); - } - else if (!need_separator && current != NULL) - { - gtk_list_box_row_set_header (row, NULL); - } + g_ptr_array_unref (new_values); } static gint @@ -573,16 +537,28 @@ static GtkWidget * create_row_for_place (Place *place) { - GtkWidget *child, *row; + GtkWidget *child, *row, *remove_button; row = gtk_list_box_row_new (); + gtk_list_box_row_set_selectable (GTK_LIST_BOX_ROW (row), FALSE); + gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (row), child); - g_object_set (row, "margin-start", 16, "margin-end", 16, NULL); + g_object_set (row, "margin", 5, "margin-left", 16, NULL); g_object_set_data_full (G_OBJECT (row), "place", place, (GDestroyNotify) place_free); + if (place->place_type == PLACE_OTHER) + { + remove_button = gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_MENU); + gtk_style_context_add_class (gtk_widget_get_style_context (remove_button), "flat"); + gtk_box_pack_end (GTK_BOX (child), remove_button, FALSE, FALSE, 2); + + g_signal_connect (remove_button, "clicked", + G_CALLBACK (remove_button_clicked), row); + } + place->cancellable = g_cancellable_new (); - g_file_query_info_async (place->location, "standard::symbolic-icon", + g_file_query_info_async (place->location, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, place->cancellable, place_query_info_ready, row); @@ -590,55 +566,35 @@ } static void -populate_list_box (GtkWidget *list_box) +populate_list_boxes (CcSearchLocationsDialog *self) { GList *places, *l; + Place *place; GtkWidget *row; places = get_places_list (); for (l = places; l != NULL; l = l->next) { - /* assumes ownership of place */ - row = create_row_for_place (l->data); - gtk_container_add (GTK_CONTAINER (list_box), row); - } - - g_list_free (places); -} - -static void -list_box_row_selected (GtkListBox *list_box, - GtkListBoxRow *row, - gpointer user_data) -{ - GtkWidget *remove_button = user_data; - Place *place; - gboolean sensitive = FALSE; + place = l->data; + row = create_row_for_place (place); - if (row != NULL) - { - place = g_object_get_data (G_OBJECT (row), "place"); - sensitive = (place->place_type == PLACE_OTHER); + switch (place->place_type) + { + case PLACE_XDG: + gtk_container_add (GTK_CONTAINER (self->places_list), row); + break; + case PLACE_BOOKMARKS: + gtk_container_add (GTK_CONTAINER (self->bookmarks_list), row); + break; + case PLACE_OTHER: + gtk_container_add (GTK_CONTAINER (self->others_list), row); + break; + default: + g_assert_not_reached (); + } } - gtk_widget_set_sensitive (remove_button, sensitive); -} - -static void -remove_button_clicked (GtkWidget *widget, - gpointer user_data) -{ - GtkWidget *list_box = user_data; - GtkListBoxRow *row; - Place *place; - GPtrArray *new_values; - - row = gtk_list_box_get_selected_row (GTK_LIST_BOX (list_box)); - place = g_object_get_data (G_OBJECT (row), "place"); - new_values = place_get_new_settings_values (place, TRUE); - g_settings_set_strv (tracker_preferences, place->settings_key, (const gchar **) new_values->pdata); - - g_ptr_array_unref (new_values); + g_list_free (places); } static void @@ -688,74 +644,52 @@ } static void -locations_dialog_refresh (GtkWidget *list_box) +other_places_refresh (CcSearchLocationsDialog *self) { - gtk_container_foreach (GTK_CONTAINER (list_box), (GtkCallback) gtk_widget_destroy, NULL); - populate_list_box (list_box); -} + GList *places, *l; + Place *place; + GtkWidget *row; -static void -locations_dialog_destroy (GtkWidget *widget) -{ - g_clear_object (&tracker_preferences); + gtk_container_foreach (GTK_CONTAINER (self->others_list), (GtkCallback) gtk_widget_destroy, NULL); + + places = get_places_list (); + for (l = places; l != NULL; l = l->next) + { + place = l->data; + if (place->place_type != PLACE_OTHER) + continue; + + row = create_row_for_place (place); + gtk_container_add (GTK_CONTAINER (self->others_list), row); + } + + g_list_free (places); } -GtkWidget * -cc_search_locations_dialog_new (CcSearchPanel *self) +CcSearchLocationsDialog * +cc_search_locations_dialog_new (CcSearchPanel *panel) { - GtkWidget *locations_dialog, *widget, *list_box; - GtkBuilder *dialog_builder; - GError *error = NULL; + CcSearchLocationsDialog *self; - dialog_builder = gtk_builder_new (); - gtk_builder_add_from_resource (dialog_builder, - "/org/gnome/control-center/search/search-locations-dialog.ui", - &error); - - if (error != NULL) - { - g_warning ("Could not load interface file: %s", error->message); - g_error_free (error); - return NULL; - } + self = g_object_new (CC_SEARCH_LOCATIONS_DIALOG_TYPE, + "use-header-bar", TRUE, + NULL); tracker_preferences = g_settings_new (TRACKER_SCHEMA); + populate_list_boxes (self); - locations_dialog = GTK_WIDGET (gtk_builder_get_object (dialog_builder, "locations_dialog")); - widget = GTK_WIDGET (gtk_builder_get_object (dialog_builder, "locations_scrolledwindow")); - list_box = GTK_WIDGET (gtk_list_box_new ()); - gtk_container_add (GTK_CONTAINER (widget), list_box); - gtk_list_box_set_sort_func (GTK_LIST_BOX (list_box), + gtk_list_box_set_sort_func (GTK_LIST_BOX (self->others_list), (GtkListBoxSortFunc)place_compare_func, NULL, NULL); - gtk_list_box_set_header_func (GTK_LIST_BOX (list_box), - place_header_func, NULL, NULL); - gtk_widget_show (list_box); - - widget = GTK_WIDGET (gtk_builder_get_object (dialog_builder, "locations_remove")); - gtk_widget_set_sensitive (widget, FALSE); - g_signal_connect (list_box, "row-selected", - G_CALLBACK (list_box_row_selected), widget); - g_signal_connect (widget, "clicked", - G_CALLBACK (remove_button_clicked), list_box); - g_signal_connect_swapped (tracker_preferences, "changed::" TRACKER_KEY_RECURSIVE_DIRECTORIES, - G_CALLBACK (locations_dialog_refresh), list_box); - - widget = GTK_WIDGET (gtk_builder_get_object (dialog_builder, "locations_add")); - g_signal_connect (widget, "clicked", - G_CALLBACK (add_button_clicked), list_box); - gtk_window_set_transient_for (GTK_WINDOW (locations_dialog), - GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self)))); - g_signal_connect (locations_dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); - g_signal_connect (locations_dialog, "destroy", - G_CALLBACK (locations_dialog_destroy), NULL); + gtk_list_box_set_header_func (GTK_LIST_BOX (self->others_list), cc_list_box_update_header_func, NULL, NULL); - populate_list_box (list_box); + g_signal_connect_swapped (tracker_preferences, "changed::" TRACKER_KEY_RECURSIVE_DIRECTORIES, + G_CALLBACK (other_places_refresh), self); - g_object_unref (dialog_builder); + gtk_window_set_transient_for (GTK_WINDOW (self), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (panel)))); - return locations_dialog; + return self; } gboolean @@ -775,3 +709,22 @@ g_settings_schema_unref (schema); return TRUE; } + +static void +cc_search_locations_dialog_class_init (CcSearchLocationsDialogClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = cc_search_locations_dialog_finalize; + + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/control-center/search/search-locations-dialog.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, places_list); + gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, bookmarks_list); + gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, others_list); + gtk_widget_class_bind_template_child (widget_class, CcSearchLocationsDialog, locations_add); + + gtk_widget_class_bind_template_callback (widget_class, add_button_clicked); +} diff -Nru gnome-control-center-3.20.2/panels/search/cc-search-locations-dialog.h gnome-control-center-3.22.1/panels/search/cc-search-locations-dialog.h --- gnome-control-center-3.20.2/panels/search/cc-search-locations-dialog.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/cc-search-locations-dialog.h 2016-08-12 12:43:57.000000000 +0000 @@ -23,7 +23,15 @@ #include "cc-search-panel.h" -GtkWidget *cc_search_locations_dialog_new (CcSearchPanel *panel); +#define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ()) +#define CC_SEARCH_LOCATIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CC_SEARCH_LOCATIONS_DIALOG_TYPE, CcSearchLocationsDialog)) + +typedef struct _CcSearchLocationsDialog CcSearchLocationsDialog; +typedef struct _CcSearchLocationsDialogClass CcSearchLocationsDialogClass; + +GType cc_search_locations_dialog_get_type (void); + +CcSearchLocationsDialog *cc_search_locations_dialog_new (CcSearchPanel *panel); gboolean cc_search_locations_dialog_is_available (void); diff -Nru gnome-control-center-3.20.2/panels/search/cc-search-panel.c gnome-control-center-3.22.1/panels/search/cc-search-panel.c --- gnome-control-center-3.20.2/panels/search/cc-search-panel.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/cc-search-panel.c 2016-08-12 12:43:57.000000000 +0000 @@ -40,7 +40,7 @@ GSettings *search_settings; GHashTable *sort_order; - GtkWidget *locations_dialog; + CcSearchLocationsDialog *locations_dialog; }; #define SHELL_PROVIDER_GROUP "Shell Search Provider" @@ -701,7 +701,7 @@ g_hash_table_destroy (priv->sort_order); if (priv->locations_dialog) - gtk_widget_destroy (priv->locations_dialog); + gtk_widget_destroy (GTK_WIDGET (priv->locations_dialog)); G_OBJECT_CLASS (cc_search_panel_parent_class)->finalize (object); } diff -Nru gnome-control-center-3.20.2/panels/search/cc-search-resources.c gnome-control-center-3.22.1/panels/search/cc-search-resources.c --- gnome-control-center-3.20.2/panels/search/cc-search-resources.c 2016-10-11 14:27:29.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/cc-search-resources.c 2016-10-11 12:14:59.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[6332]; const double alignment; void * const ptr;} cc_search_resource_data = { { +static const SECTION union { const guint8 data[7076]; const double alignment; void * const ptr;} cc_search_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, @@ -29,13 +29,13 @@ 0x53, 0x0e, 0x00, 0x00, 0x4b, 0x93, 0x4c, 0xc6, 0x06, 0x00, 0x00, 0x00, 0x53, 0x0e, 0x00, 0x00, 0x1a, 0x00, 0x76, 0x00, 0x70, 0x0e, 0x00, 0x00, - 0xa2, 0x18, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, - 0x01, 0x00, 0x00, 0x00, 0xa2, 0x18, 0x00, 0x00, - 0x06, 0x00, 0x4c, 0x00, 0xa8, 0x18, 0x00, 0x00, - 0xac, 0x18, 0x00, 0x00, 0x13, 0x15, 0x8c, 0x71, - 0x00, 0x00, 0x00, 0x00, 0xac, 0x18, 0x00, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0xb4, 0x18, 0x00, 0x00, - 0xbc, 0x18, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, + 0x88, 0x1b, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x01, 0x00, 0x00, 0x00, 0x88, 0x1b, 0x00, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0x90, 0x1b, 0x00, 0x00, + 0x94, 0x1b, 0x00, 0x00, 0x13, 0x15, 0x8c, 0x71, + 0x00, 0x00, 0x00, 0x00, 0x94, 0x1b, 0x00, 0x00, + 0x07, 0x00, 0x4c, 0x00, 0x9c, 0x1b, 0x00, 0x00, + 0xa4, 0x1b, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x06, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x05, 0x00, 0x00, 0x00, @@ -469,7 +469,7 @@ 0x68, 0x2d, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0x22, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -480,166 +480,175 @@ 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, - 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x43, + 0x63, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, + 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x34, 0x30, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x5f, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x34, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x34, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x34, 0x30, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x20, + 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, + 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, 0x61, 0x72, - 0x63, 0x68, 0x20, 0x4c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, - 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, - 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x5f, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x73, 0x5f, + 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x2d, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, + 0x61, 0x62, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, + 0x6c, 0x61, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, - 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x73, - 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x74, - 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -647,155 +656,239 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, - 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, - 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, 0x6f, 0x6f, - 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x5f, 0x61, 0x64, 0x64, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, 0x74, 0x2d, - 0x61, 0x64, 0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, - 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x33, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, + 0x6b, 0x73, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, + 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x74, 0x61, 0x62, 0x2d, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, - 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x42, 0x6f, 0x6f, 0x6b, 0x6d, + 0x61, 0x72, 0x6b, 0x73, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x74, 0x68, + 0x65, 0x72, 0x73, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, + 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x5f, 0x61, 0x64, 0x64, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, - 0x73, 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, - 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x64, + 0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, 0x74, 0x2d, + 0x61, 0x64, 0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, + 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x6c, 0x61, 0x74, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x2d, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4f, 0x74, 0x68, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2f, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 diff -Nru gnome-control-center-3.20.2/panels/search/gnome-search-panel.desktop.in.in gnome-control-center-3.22.1/panels/search/gnome-search-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/search/gnome-search-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/gnome-search-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,4 +1,5 @@ [Desktop Entry] +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details _Name=Search _Comment=Control which applications show search results in the Activities Overview Exec=gnome-control-center search @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;X-GNOME-PersonalizationSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/search/Makefile.in gnome-control-center-3.22.1/panels/search/Makefile.in --- gnome-control-center-3.20.2/panels/search/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -315,8 +315,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -533,22 +531,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-search-resources.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/search/search-locations-dialog.ui gnome-control-center-3.22.1/panels/search/search-locations-dialog.ui --- gnome-control-center-3.20.2/panels/search/search-locations-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/search/search-locations-dialog.ui 2016-08-12 12:43:57.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru gnome-control-center-3.20.2/panels/sharing/cc-sharing-panel.c gnome-control-center-3.22.1/panels/sharing/cc-sharing-panel.c --- gnome-control-center-3.20.2/panels/sharing/cc-sharing-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sharing/cc-sharing-panel.c 2016-08-12 12:43:57.000000000 +0000 @@ -679,9 +679,9 @@ if (label == WID ("personal-file-sharing-label")) text = g_strdup_printf (_("Personal File Sharing allows you to share your Public folder with others on your current network using: dav://%s"), hostname, hostname); else if (label == WID ("remote-login-label")) - text = g_strdup_printf (_("Allow remote users to connect using the Secure Shell command:\nssh %s"), hostname, hostname); + text = g_strdup_printf (_("When remote login is enabled, remote users can connect using the Secure Shell command:\nssh %s"), hostname, hostname); else if (label == WID ("screen-sharing-label")) - text = g_strdup_printf (_("Allow remote users to view or control your screen by connecting to: vnc://%s"), hostname, hostname); + text = g_strdup_printf (_("Screen sharing allows remote users to view or control your screen by connecting to vnc://%s"), hostname, hostname); else g_assert_not_reached (); @@ -1013,7 +1013,7 @@ /* settings bindings */ settings = g_settings_new (VINO_SCHEMA_ID); - g_settings_bind (settings, "view-only", WID ("remote-control-switch"), + g_settings_bind (settings, "view-only", WID ("remote-control-checkbutton"), "active", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); g_settings_bind (settings, "prompt-enabled", diff -Nru gnome-control-center-3.20.2/panels/sharing/cc-sharing-resources.c gnome-control-center-3.22.1/panels/sharing/cc-sharing-resources.c --- gnome-control-center-3.20.2/panels/sharing/cc-sharing-resources.c 2016-10-11 14:27:31.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sharing/cc-sharing-resources.c 2016-10-11 12:15:01.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[28185]; const double alignment; void * const ptr;} cc_sharing_resource_data = { { +static const SECTION union { const guint8 data[27785]; const double alignment; void * const ptr;} cc_sharing_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, @@ -32,10 +32,10 @@ 0x24, 0x01, 0x00, 0x00, 0x41, 0x21, 0xeb, 0x90, 0x03, 0x00, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x76, 0x00, 0x30, 0x01, 0x00, 0x00, - 0xff, 0x67, 0x00, 0x00, 0x52, 0xb2, 0x84, 0x21, - 0x03, 0x00, 0x00, 0x00, 0xff, 0x67, 0x00, 0x00, - 0x0b, 0x00, 0x76, 0x00, 0x10, 0x68, 0x00, 0x00, - 0x19, 0x6e, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, + 0x74, 0x66, 0x00, 0x00, 0x52, 0xb2, 0x84, 0x21, + 0x03, 0x00, 0x00, 0x00, 0x74, 0x66, 0x00, 0x00, + 0x0b, 0x00, 0x76, 0x00, 0x80, 0x66, 0x00, 0x00, + 0x89, 0x6c, 0x00, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x03, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x04, 0x00, 0x00, 0x00, @@ -45,7 +45,7 @@ 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0xbf, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x34, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -350,50 +350,196 @@ 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x5f, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, - 0x6c, 0x20, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, - 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, + 0x5f, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, + 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, + 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, + 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, + 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, + 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x4f, + 0x66, 0x66, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, - 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, + 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x63, 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x78, 0x33, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, - 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x39, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x5f, 0x53, 0x63, + 0x72, 0x65, 0x65, 0x6e, 0x20, 0x53, 0x68, 0x61, + 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x73, 0x63, + 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x73, 0x68, 0x61, + 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, @@ -440,40 +586,40 @@ 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x73, - 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x78, 0x33, 0x22, 0x3e, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x39, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -499,212 +645,23 @@ 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x5f, 0x53, - 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x53, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x73, - 0x63, 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x73, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, - 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, - 0x2d, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x4f, 0x66, 0x66, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, - 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, - 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x5f, 0x4d, + 0x65, 0x64, 0x69, 0x61, 0x20, 0x53, 0x68, 0x61, + 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x30, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x5f, - 0x4d, 0x65, 0x64, 0x69, 0x61, 0x20, 0x53, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6d, - 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, 0x68, 0x61, - 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, - 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x4f, - 0x66, 0x66, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6d, 0x65, + 0x64, 0x69, 0x61, 0x2d, 0x73, 0x68, 0x61, 0x72, + 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, @@ -720,466 +677,396 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, - 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, - 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x4f, 0x66, + 0x66, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x31, 0x31, 0x22, 0x3e, 0x3c, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, + 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x6c, 0x6f, 0x67, + 0x69, 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, + 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x31, 0x31, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x20, 0x4c, 0x6f, 0x67, 0x69, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x4f, 0x66, 0x66, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, + 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x31, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x6f, - 0x6d, 0x65, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, - 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x20, 0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, - 0x20, 0x6f, 0x66, 0x20, 0x6e, 0x6f, 0x20, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x2e, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, - 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, - 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x4f, 0x66, 0x66, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x50, 0x65, 0x72, 0x73, - 0x6f, 0x6e, 0x61, 0x6c, 0x20, 0x46, 0x69, 0x6c, - 0x65, 0x20, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x31, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, - 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, - 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, - 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x6f, 0x6d, + 0x65, 0x20, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x64, + 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x20, + 0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x20, + 0x6f, 0x66, 0x20, 0x6e, 0x6f, 0x20, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x32, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x65, + 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, + 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, 0x72, + 0x69, 0x6e, 0x67, 0x2d, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x46, 0x69, 0x6c, 0x65, 0x20, + 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, - 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, - 0x65, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, - 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, + 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x50, - 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x20, - 0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, 0x68, 0x61, - 0x72, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6c, 0x6c, - 0x6f, 0x77, 0x73, 0x20, 0x79, 0x6f, 0x75, 0x20, - 0x74, 0x6f, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, - 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x50, 0x75, - 0x62, 0x6c, 0x69, 0x63, 0x20, 0x66, 0x6f, 0x6c, - 0x64, 0x65, 0x72, 0x20, 0x77, 0x69, 0x74, 0x68, - 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x20, - 0x6f, 0x6e, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, - 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, - 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x20, - 0x75, 0x73, 0x69, 0x6e, 0x67, 0x3a, 0x20, 0x26, - 0x6c, 0x74, 0x3b, 0x61, 0x20, 0x68, 0x72, 0x65, - 0x66, 0x3d, 0x22, 0x64, 0x61, 0x76, 0x3a, 0x2f, - 0x2f, 0x25, 0x73, 0x22, 0x26, 0x67, 0x74, 0x3b, - 0x64, 0x61, 0x76, 0x3a, 0x2f, 0x2f, 0x25, 0x73, - 0x26, 0x6c, 0x74, 0x3b, 0x2f, 0x61, 0x26, 0x67, - 0x74, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, + 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, + 0x69, 0x64, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, - 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x34, 0x30, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, - 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x31, 0x37, 0x22, 0x3e, 0x3c, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, + 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, + 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -1192,100 +1079,133 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x71, - 0x75, 0x69, 0x72, 0x65, 0x20, 0x50, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, - 0x75, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x50, 0x65, 0x72, + 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x20, 0x46, 0x69, + 0x6c, 0x65, 0x20, 0x53, 0x68, 0x61, 0x72, 0x69, + 0x6e, 0x67, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, + 0x73, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x74, 0x6f, + 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x20, 0x79, + 0x6f, 0x75, 0x72, 0x20, 0x50, 0x75, 0x62, 0x6c, + 0x69, 0x63, 0x20, 0x66, 0x6f, 0x6c, 0x64, 0x65, + 0x72, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6f, + 0x74, 0x68, 0x65, 0x72, 0x73, 0x20, 0x6f, 0x6e, + 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x63, 0x75, + 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x6e, 0x65, + 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x75, 0x73, + 0x69, 0x6e, 0x67, 0x3a, 0x20, 0x26, 0x6c, 0x74, + 0x3b, 0x61, 0x20, 0x68, 0x72, 0x65, 0x66, 0x3d, + 0x22, 0x64, 0x61, 0x76, 0x3a, 0x2f, 0x2f, 0x25, + 0x73, 0x22, 0x26, 0x67, 0x74, 0x3b, 0x64, 0x61, + 0x76, 0x3a, 0x2f, 0x2f, 0x25, 0x73, 0x26, 0x6c, + 0x74, 0x3b, 0x2f, 0x61, 0x26, 0x67, 0x74, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x6d, + 0x61, 0x72, 0x6b, 0x75, 0x70, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, + 0x72, 0x73, 0x22, 0x3e, 0x34, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, - 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, - 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, + 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, + 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, - 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, - 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x75, 0x70, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -1299,92 +1219,122 @@ 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x65, + 0x71, 0x75, 0x69, 0x72, 0x65, 0x2d, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x65, - 0x71, 0x75, 0x69, 0x72, 0x65, 0x2d, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x65, + 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, + 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, 0x72, + 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, - 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, - 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x65, + 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, + 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, 0x72, + 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x73, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -1396,239 +1346,264 @@ 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, - 0x72, 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, - 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, - 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, - 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x65, 0x72, + 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x2d, 0x66, 0x69, + 0x6c, 0x65, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, + 0x6e, 0x67, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, + 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, + 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, + 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, + 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, + 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, + 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, 0x73, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x46, 0x69, + 0x6c, 0x65, 0x20, 0x53, 0x68, 0x61, 0x72, 0x69, + 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, + 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, - 0x61, 0x6c, 0x2d, 0x66, 0x69, 0x6c, 0x65, 0x2d, - 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, + 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, + 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, - 0x20, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x53, 0x68, - 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, - 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x2d, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x20, 0x4c, + 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x52, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, + 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, - 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, - 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x67, 0x72, 0x69, 0x64, 0x35, 0x22, 0x3e, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -1641,160 +1616,189 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, + 0x69, 0x64, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, + 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x41, - 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6e, - 0x6e, 0x65, 0x63, 0x74, 0x20, 0x75, 0x73, 0x69, - 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x53, - 0x65, 0x63, 0x75, 0x72, 0x65, 0x20, 0x53, 0x68, - 0x65, 0x6c, 0x6c, 0x20, 0x63, 0x6f, 0x6d, 0x6d, - 0x61, 0x6e, 0x64, 0x3a, 0x0a, 0x26, 0x6c, 0x74, - 0x3b, 0x61, 0x20, 0x68, 0x72, 0x65, 0x66, 0x3d, - 0x22, 0x73, 0x73, 0x68, 0x20, 0x25, 0x73, 0x22, - 0x26, 0x67, 0x74, 0x3b, 0x73, 0x73, 0x68, 0x20, - 0x25, 0x73, 0x26, 0x6c, 0x74, 0x3b, 0x2f, 0x61, - 0x26, 0x67, 0x74, 0x3b, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x75, - 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x6c, - 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x73, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x57, 0x68, 0x65, 0x6e, + 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x20, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x69, 0x73, + 0x20, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x2c, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x20, 0x75, 0x73, 0x65, 0x72, 0x73, 0x20, 0x63, + 0x61, 0x6e, 0x20, 0x63, 0x6f, 0x6e, 0x6e, 0x65, + 0x63, 0x74, 0x20, 0x75, 0x73, 0x69, 0x6e, 0x67, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x53, 0x65, 0x63, + 0x75, 0x72, 0x65, 0x20, 0x53, 0x68, 0x65, 0x6c, + 0x6c, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, + 0x64, 0x3a, 0x0a, 0x26, 0x6c, 0x74, 0x3b, 0x61, + 0x20, 0x68, 0x72, 0x65, 0x66, 0x3d, 0x22, 0x73, + 0x73, 0x68, 0x20, 0x25, 0x73, 0x22, 0x26, 0x67, + 0x74, 0x3b, 0x73, 0x73, 0x68, 0x20, 0x25, 0x73, + 0x26, 0x6c, 0x74, 0x3b, 0x2f, 0x61, 0x26, 0x67, + 0x74, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x6d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, - 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x39, 0x22, 0x3e, 0x3c, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, + 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x6c, 0x6f, 0x67, + 0x69, 0x6e, 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, @@ -1807,17 +1811,7 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x6d, 0x6f, 0x74, @@ -1825,81 +1819,35 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, - 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, + 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, @@ -2059,7 +2007,9 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x72, 0x65, + 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x73, + 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x76, 0x69, 0x65, 0x77, 0x20, 0x6f, 0x72, 0x20, 0x63, 0x6f, @@ -2162,42 +2112,49 @@ 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, - 0x6f, 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, + 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x52, - 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x20, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x6c, + 0x6c, 0x6f, 0x77, 0x20, 0x63, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, + 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, + 0x63, 0x72, 0x65, 0x65, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -2210,51 +2167,67 @@ 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2d, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x73, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, + 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, @@ -2269,87 +2242,17 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, - 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, - 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, - 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, - 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, + 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -2362,114 +2265,95 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x72, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, + 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, - 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x74, + 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, - 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x6c, 0x65, 0x66, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, - 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, - 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x72, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -2490,52 +2374,49 @@ 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x2d, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x6d, + 0x6f, 0x74, 0x65, 0x2d, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x53, 0x68, 0x6f, 0x77, 0x20, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, - 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, + 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, + 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, + 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, @@ -2547,7 +2428,7 @@ 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -2561,20 +2442,66 @@ 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, + 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x2d, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x53, 0x68, 0x6f, 0x77, 0x20, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -2588,194 +2515,147 @@ 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x4f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, - 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, - 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, - 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x2d, 0x63, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x4e, 0x65, 0x77, 0x20, 0x63, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x20, 0x6d, 0x75, 0x73, 0x74, 0x20, - 0x61, 0x73, 0x6b, 0x20, 0x66, 0x6f, 0x72, 0x20, - 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, - 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x72, - 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x2d, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, - 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x71, 0x75, 0x69, - 0x72, 0x65, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, + 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, + 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x2d, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2d, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x4e, 0x65, 0x77, 0x20, + 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x20, 0x6d, 0x75, 0x73, 0x74, + 0x20, 0x61, 0x73, 0x6b, 0x20, 0x66, 0x6f, 0x72, + 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x2d, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, @@ -2793,7 +2673,7 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -2806,45 +2686,138 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x20, 0x61, 0x20, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, @@ -2862,48 +2835,101 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x65, 0x65, - 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, - 0x67, 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, + 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x65, + 0x65, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, + 0x6e, 0x67, 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x53, 0x63, 0x72, 0x65, 0x65, + 0x6e, 0x20, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, + 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, + 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, + 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6d, 0x65, 0x64, 0x69, 0x61, + 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, + 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x4d, 0x65, 0x64, 0x69, 0x61, 0x20, 0x53, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, + 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, + 0x6f, 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, @@ -2911,306 +2937,254 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, - 0x20, 0x53, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, - 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, - 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, - 0x65, 0x64, 0x69, 0x61, 0x20, 0x53, 0x68, 0x61, - 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x61, 0x72, 0x65, 0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, - 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, - 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, + 0x64, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, - 0x72, 0x65, 0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x33, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x33, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x20, - 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x20, - 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x79, - 0x6f, 0x75, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x68, - 0x61, 0x72, 0x65, 0x20, 0x6d, 0x75, 0x73, 0x69, - 0x63, 0x2c, 0x20, 0x70, 0x68, 0x6f, 0x74, 0x6f, - 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x76, 0x69, - 0x64, 0x65, 0x6f, 0x73, 0x20, 0x6f, 0x76, 0x65, - 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, - 0x22, 0x3e, 0x34, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x53, 0x68, 0x61, 0x72, 0x65, + 0x20, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x2c, 0x20, + 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x20, 0x61, + 0x6e, 0x64, 0x20, 0x76, 0x69, 0x64, 0x65, 0x6f, + 0x73, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, + 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x34, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x73, 0x68, 0x61, - 0x72, 0x65, 0x64, 0x2d, 0x66, 0x6f, 0x6c, 0x64, - 0x65, 0x72, 0x73, 0x2d, 0x6c, 0x69, 0x73, 0x74, - 0x62, 0x6f, 0x78, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x31, 0x35, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x46, + 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, - 0x72, 0x61, 0x6d, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2d, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x73, - 0x2d, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x46, 0x72, 0x61, 0x6d, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x68, 0x61, 0x72, 0x65, 0x64, 0x2d, 0x66, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x73, 0x2d, 0x66, 0x72, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2d, 0x66, + 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x73, 0x2d, 0x6c, + 0x69, 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -3219,124 +3193,100 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, - 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, - 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x72, 0x65, - 0x64, 0x2d, 0x66, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x73, 0x2d, 0x6c, 0x69, 0x73, 0x74, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, - 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6d, 0x65, 0x64, 0x69, 0x61, - 0x2d, 0x73, 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, - 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x20, 0x53, - 0x68, 0x61, 0x72, 0x69, 0x6e, 0x67, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, + 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6d, 0x65, 0x64, 0x69, 0x61, 0x2d, 0x73, 0x68, + 0x61, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, - 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, - 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4d, 0x65, + 0x64, 0x69, 0x61, 0x20, 0x53, 0x68, 0x61, 0x72, + 0x69, 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, + 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x6e, 0x65, 0x74, 0x77, + 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x75, 0x69, 0x00, 0xf9, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, diff -Nru gnome-control-center-3.20.2/panels/sharing/gnome-sharing-panel.desktop.in.in gnome-control-center-3.22.1/panels/sharing/gnome-sharing-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/sharing/gnome-sharing-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sharing/gnome-sharing-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Sharing +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Sha­ring _Comment=Control what you want to share with others Exec=gnome-control-center sharing Icon=preferences-system-sharing @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings; +Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-GNOME-AccountSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Settings-Panel=sharing # Translators: those are keywords for the sharing control-center panel diff -Nru gnome-control-center-3.20.2/panels/sharing/Makefile.in gnome-control-center-3.22.1/panels/sharing/Makefile.in --- gnome-control-center-3.20.2/panels/sharing/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sharing/Makefile.in 2016-10-11 12:14:07.000000000 +0000 @@ -334,8 +334,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -636,22 +634,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vino-preferences.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/sharing/sharing.ui gnome-control-center-3.22.1/panels/sharing/sharing.ui --- gnome-control-center-3.20.2/panels/sharing/sharing.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sharing/sharing.ui 2016-08-12 12:43:57.000000000 +0000 @@ -71,7 +71,7 @@ False start True - _Personal File Sharing + _File Sharing True personal-file-sharing-button @@ -242,7 +242,7 @@ False 5 - Personal File Sharing + File Sharing False dialog 1 @@ -369,7 +369,7 @@ True False - Personal File Sharing + File Sharing True @@ -409,10 +409,11 @@ True False 0 - Allow remote users to connect using the Secure Shell command: + When remote login is enabled, remote users can connect using the Secure Shell command: <a href="ssh %s">ssh %s</a> True True + 52 0 @@ -421,38 +422,6 @@ 1 - - - True - True - end - - - 1 - 1 - 1 - 1 - - - - - True - False - start - True - Remote Login - remote-login-switch - - - - - - 0 - 1 - 1 - 1 - - False @@ -469,6 +438,22 @@ + + + True + False + Remote Login + True + + + True + False + center + + + + + False @@ -501,7 +486,7 @@ True False 0 - Allow remote users to view or control your screen by connecting to: <a href="vnc://%s">vnc://%s</a> + Screen sharing allows remote users to view or control your screen by connecting to: <a href="vnc://%s">vnc://%s</a> True True 40 @@ -524,32 +509,32 @@ True False + 6 True False start True - _Allow Remote Control + _Allow connections to control the screen True - remote-control-switch + remote-control-checkbutton False True - 0 + 1 - + True True - end False True - 1 + 0 @@ -763,7 +748,7 @@ True False 0 - Media sharing allows you to share music, photos and videos over the network. + Share music, photos and videos over the network. 40 True diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/16x16/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/16x16/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/16x16/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/16x16/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/16x16/devices/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/16x16/devices/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/16x16/devices/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/16x16/devices/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/16x16/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/16x16/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/16x16/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/16x16/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/16x16/status/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/16x16/status/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/16x16/status/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/16x16/status/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/22x22/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/22x22/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/22x22/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/22x22/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/22x22/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/22x22/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/22x22/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/22x22/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/22x22/status/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/22x22/status/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/22x22/status/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/22x22/status/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/24x24/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/24x24/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/24x24/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/24x24/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/24x24/devices/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/24x24/devices/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/24x24/devices/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/24x24/devices/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/24x24/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/24x24/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/24x24/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/24x24/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/24x24/status/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/24x24/status/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/24x24/status/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/24x24/status/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/32x32/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/32x32/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/32x32/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/32x32/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/32x32/devices/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/32x32/devices/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/32x32/devices/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/32x32/devices/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/32x32/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/32x32/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/32x32/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/32x32/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/32x32/status/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/32x32/status/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/32x32/status/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/32x32/status/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/48x48/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/48x48/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/48x48/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/48x48/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/48x48/devices/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/48x48/devices/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/48x48/devices/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/48x48/devices/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/48x48/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/48x48/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/48x48/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/48x48/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/scalable/apps/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/scalable/apps/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/scalable/apps/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/scalable/apps/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/scalable/devices/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/scalable/devices/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/scalable/devices/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/scalable/devices/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/icons/scalable/Makefile.in gnome-control-center-3.22.1/panels/sound/data/icons/scalable/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/icons/scalable/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/icons/scalable/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/Makefile.in gnome-control-center-3.22.1/panels/sound/data/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -321,8 +321,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/sounds/Makefile.in gnome-control-center-3.22.1/panels/sound/data/sounds/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/sounds/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/sounds/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/Makefile.in gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/scalable/Makefile.in gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/scalable/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/scalable/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/scalable/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -290,8 +290,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/scalable/status/Makefile.in gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/scalable/status/Makefile.in --- gnome-control-center-3.20.2/panels/sound/data/symbolic-icons/scalable/status/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/data/symbolic-icons/scalable/status/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/sound/gvc/Makefile.in gnome-control-center-3.22.1/panels/sound/gvc/Makefile.in --- gnome-control-center-3.20.2/panels/sound/gvc/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/gvc/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -318,8 +318,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -565,22 +563,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgvc_la-gvc-mixer-ui-device.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/sound/Makefile.in gnome-control-center-3.22.1/panels/sound/Makefile.in --- gnome-control-center-3.20.2/panels/sound/Makefile.in 2016-10-11 14:26:40.000000000 +0000 +++ gnome-control-center-3.22.1/panels/sound/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -334,8 +334,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -600,22 +598,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound-theme-file-utils.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/universal-access/cc-ua-resources.c gnome-control-center-3.22.1/panels/universal-access/cc-ua-resources.c --- gnome-control-center-3.20.2/panels/universal-access/cc-ua-resources.c 2016-10-11 14:27:17.000000000 +0000 +++ gnome-control-center-3.22.1/panels/universal-access/cc-ua-resources.c 2016-10-11 12:14:47.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[125832]; const double alignment; void * const ptr;} cc_universal_access_resource_data = { { +static const SECTION union { const guint8 data[125840]; const double alignment; void * const ptr;} cc_universal_access_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, @@ -32,10 +32,10 @@ 0x1f, 0x92, 0x00, 0x00, 0x67, 0xed, 0x56, 0x99, 0x01, 0x00, 0x00, 0x00, 0x1f, 0x92, 0x00, 0x00, 0x06, 0x00, 0x76, 0x00, 0x28, 0x92, 0x00, 0x00, - 0x7e, 0xeb, 0x01, 0x00, 0xb0, 0xb7, 0x24, 0x30, - 0x02, 0x00, 0x00, 0x00, 0x7e, 0xeb, 0x01, 0x00, - 0x06, 0x00, 0x4c, 0x00, 0x84, 0xeb, 0x01, 0x00, - 0x88, 0xeb, 0x01, 0x00, 0x63, 0x6f, 0x6e, 0x74, + 0x85, 0xeb, 0x01, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x02, 0x00, 0x00, 0x00, 0x85, 0xeb, 0x01, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0x8c, 0xeb, 0x01, 0x00, + 0x90, 0xeb, 0x01, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x75, 0x6e, 0x69, 0x76, 0x65, 0x72, 0x73, 0x61, @@ -4684,7 +4684,7 @@ 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x75, 0x61, 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, - 0x46, 0x59, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4d, 0x59, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -8836,85 +8836,37 @@ 0x72, 0x20, 0x43, 0x61, 0x70, 0x73, 0x20, 0x4c, 0x6f, 0x63, 0x6b, 0x20, 0x61, 0x72, 0x65, 0x20, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x6f, - 0x6e, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, - 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6e, 0x20, 0x6f, 0x72, 0x20, 0x6f, 0x66, 0x66, + 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -8927,294 +8879,115 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, + 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, + 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6b, 0x65, 0x79, + 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x53, 0x6f, 0x75, 0x6e, - 0x64, 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x75, - 0x6e, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x53, 0x6f, 0x75, 0x6e, 0x64, + 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x73, + 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x6b, 0x65, 0x79, + 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, - 0x6c, 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, - 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, - 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, - 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x20, - 0x41, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, - 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, - 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x74, 0x65, - 0x73, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x54, 0x65, - 0x73, 0x74, 0x20, 0x66, 0x6c, 0x61, 0x73, 0x68, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, - 0x62, 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, - 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, - 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x6f, 0x75, 0x6e, + 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -9223,134 +8996,251 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x55, 0x73, 0x65, 0x20, 0x61, - 0x20, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x20, - 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, - 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x65, 0x72, 0x74, - 0x20, 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x6f, - 0x63, 0x63, 0x75, 0x72, 0x73, 0x2e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, + 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, + 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x35, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, + 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x20, 0x41, + 0x6c, 0x65, 0x72, 0x74, 0x73, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, + 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, + 0x65, 0x72, 0x74, 0x73, 0x5f, 0x74, 0x65, 0x73, + 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x54, 0x65, 0x73, + 0x74, 0x20, 0x66, 0x6c, 0x61, 0x73, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, - 0x61, 0x6c, 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, - 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, + 0x6f, 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, + 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x62, + 0x6c, 0x75, 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, @@ -9361,54 +9251,92 @@ 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x56, 0x69, 0x73, 0x75, 0x61, - 0x6c, 0x20, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x73, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x3e, 0x55, 0x73, 0x65, 0x20, 0x61, 0x20, + 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x20, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x61, + 0x6e, 0x20, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x20, + 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x6f, 0x63, + 0x63, 0x75, 0x72, 0x73, 0x2e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, + 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x72, 0x69, 0x64, 0x35, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, - 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, - 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, + 0x6c, 0x5f, 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -9417,25 +9345,52 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, + 0x20, 0x41, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, + 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, @@ -9450,139 +9405,98 @@ 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, - 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, 0x65, - 0x72, 0x74, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, + 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x46, 0x6c, 0x61, 0x73, - 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x5f, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, - 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, - 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, + 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, 0x65, 0x72, + 0x74, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x46, 0x6c, 0x61, 0x73, 0x68, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x5f, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, - 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, - 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x73, 0x63, - 0x72, 0x65, 0x65, 0x6e, 0x5f, 0x72, 0x61, 0x64, - 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x46, 0x6c, - 0x61, 0x73, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, - 0x65, 0x6e, 0x74, 0x69, 0x72, 0x65, 0x20, 0x5f, - 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x76, 0x69, - 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, 0x65, - 0x72, 0x74, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -9601,7 +9515,7 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, @@ -9613,54 +9527,171 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, + 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, + 0x65, 0x72, 0x74, 0x73, 0x5f, 0x73, 0x63, 0x72, + 0x65, 0x65, 0x6e, 0x5f, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x46, 0x6c, 0x61, + 0x73, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, + 0x6e, 0x74, 0x69, 0x72, 0x65, 0x20, 0x5f, 0x73, + 0x63, 0x72, 0x65, 0x65, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, - 0x3e, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, - 0x61, 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x74, - 0x65, 0x73, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, - 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, - 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x76, 0x69, 0x73, + 0x75, 0x61, 0x6c, 0x5f, 0x61, 0x6c, 0x65, 0x72, + 0x74, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x3e, + 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x5f, 0x61, + 0x6c, 0x65, 0x72, 0x74, 0x73, 0x5f, 0x74, 0x65, + 0x73, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, + 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, + 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x61, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, + 0x39, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x30, 0x2e, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, + 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, + 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, + 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, + 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, 0x22, - 0x3e, 0x39, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x35, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, @@ -9681,298 +9712,608 @@ 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, - 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x61, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x20, 0x4b, + 0x65, 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, + 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, - 0x22, 0x3e, 0x35, 0x30, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x30, - 0x2e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, - 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, - 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x20, - 0x4b, 0x65, 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x76, + 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, + 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4b, 0x65, 0x79, + 0x20, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, + 0x20, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x20, + 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6b, 0x65, 0x79, + 0x20, 0x69, 0x73, 0x20, 0x68, 0x65, 0x6c, 0x64, + 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x2e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, + 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, + 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x34, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, - 0x76, 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, + 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, + 0x65, 0x79, 0x73, 0x2d, 0x62, 0x6f, 0x78, 0x37, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, + 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, - 0x73, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, + 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4b, 0x65, - 0x79, 0x20, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, - 0x73, 0x20, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x6b, 0x65, - 0x79, 0x20, 0x69, 0x73, 0x20, 0x68, 0x65, 0x6c, - 0x64, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x2e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x61, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x34, + 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, + 0x74, 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, + 0x70, 0x65, 0x61, 0x74, 0x5f, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, + 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, + 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x67, 0x72, + 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x2d, 0x67, 0x72, 0x69, 0x64, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, - 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x34, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, - 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, - 0x2d, 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, + 0x79, 0x73, 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, + 0x2d, 0x62, 0x6f, 0x78, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -10004,40 +10345,11 @@ 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, - 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x62, 0x6f, 0x78, - 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x38, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -10047,212 +10359,309 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, + 0x65, 0x79, 0x73, 0x2d, 0x73, 0x70, 0x65, 0x65, + 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x70, 0x65, 0x65, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x5f, + 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, - 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, - 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x53, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x70, + 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x5f, + 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x61, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x32, 0x30, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, + 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x65, + 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, + 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x20, + 0x6b, 0x65, 0x79, 0x73, 0x20, 0x73, 0x70, 0x65, + 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, - 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, - 0x34, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x5f, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, - 0x65, 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, - 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, - 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x52, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, + 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x5f, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, + 0x75, 0x72, 0x73, 0x6f, 0x72, 0x20, 0x42, 0x6c, + 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, + 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, + 0x22, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, + 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, + 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, - 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, - 0x2d, 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x67, - 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, + 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, + 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -10261,12 +10670,84 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, + 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, + 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x2d, 0x76, 0x62, + 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, + 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, + 0x69, 0x6e, 0x67, 0x2d, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x20, 0x62, + 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x20, 0x69, 0x6e, + 0x20, 0x74, 0x65, 0x78, 0x74, 0x20, 0x66, 0x69, + 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -10289,132 +10770,212 @@ 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, + 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, + 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x2d, + 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, - 0x65, 0x79, 0x73, 0x2d, 0x73, 0x70, 0x65, 0x65, - 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x37, 0x22, 0x3e, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x73, 0x70, - 0x65, 0x65, 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x38, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, + 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, + 0x2d, 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, - 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x73, 0x70, 0x65, - 0x65, 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, + 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, + 0x2d, 0x62, 0x6f, 0x78, 0x37, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, + 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, + 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x53, 0x70, 0x65, 0x65, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x63, 0x75, 0x72, + 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, + 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x53, 0x70, 0x65, 0x65, 0x64, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x70, - 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, @@ -10437,28 +10998,102 @@ 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, + 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, + 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, + 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x3e, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, + 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x22, 0x3e, 0x34, 0x30, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, + 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, + 0x67, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, + 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x20, + 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, + 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, @@ -10475,306 +11110,382 @@ 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, - 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, - 0x70, 0x65, 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x61, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, 0x65, + 0x79, 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, + 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x73, + 0x70, 0x65, 0x65, 0x64, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, + 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2d, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x73, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x2f, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x20, 0x41, 0x73, 0x73, + 0x69, 0x73, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, + 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, + 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x32, - 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, - 0x74, 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x5f, 0x73, 0x70, 0x65, - 0x65, 0x64, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, - 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x73, 0x70, - 0x65, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x36, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, + 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, + 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, - 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, - 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x20, 0x42, - 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, - 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, + 0x36, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, - 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, - 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, - 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, - 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, - 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, + 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, - 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, - 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x2d, 0x76, - 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x79, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, - 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, - 0x6b, 0x69, 0x6e, 0x67, 0x2d, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x20, - 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x20, 0x69, - 0x6e, 0x20, 0x74, 0x65, 0x78, 0x74, 0x20, 0x66, - 0x69, 0x65, 0x6c, 0x64, 0x73, 0x2e, 0x3c, 0x2f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x53, 0x74, 0x69, 0x63, 0x6b, + 0x79, 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x79, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x74, 0x69, 0x63, 0x6b, 0x79, 0x5f, 0x62, 0x6c, + 0x75, 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x65, 0x61, 0x74, 0x73, 0x20, 0x61, 0x20, 0x73, + 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x20, + 0x6f, 0x66, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, + 0x69, 0x65, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x73, + 0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x6b, 0x65, + 0x79, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -10790,172 +11501,101 @@ 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, - 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, - 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, - 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x78, 0x38, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, - 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, - 0x67, 0x2d, 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, - 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, - 0x67, 0x2d, 0x62, 0x6f, 0x78, 0x37, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x69, + 0x63, 0x6b, 0x79, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, + 0x74, 0x77, 0x6f, 0x5f, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, - 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, - 0x75, 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, - 0x69, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x44, 0x69, 0x73, 0x61, 0x62, + 0x6c, 0x65, 0x20, 0x69, 0x66, 0x20, 0x74, 0x77, + 0x6f, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x61, + 0x72, 0x65, 0x20, 0x70, 0x72, 0x65, 0x73, 0x73, + 0x65, 0x64, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, + 0x68, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x70, 0x65, - 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x63, 0x75, - 0x72, 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, - 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, @@ -10974,148 +11614,96 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, + 0x69, 0x63, 0x6b, 0x79, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x6d, 0x6f, + 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x42, 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, + 0x6e, 0x20, 0x61, 0x20, 0x5f, 0x6d, 0x6f, 0x64, + 0x69, 0x66, 0x69, 0x65, 0x72, 0x20, 0x6b, 0x65, + 0x79, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, + 0x73, 0x73, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, - 0x73, 0x6f, 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, - 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, - 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, - 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, - 0x69, 0x6d, 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, - 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3e, 0x34, 0x30, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x63, 0x75, 0x72, 0x73, 0x6f, - 0x72, 0x5f, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, - 0x6e, 0x67, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, - 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, - 0x20, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x69, 0x6e, - 0x67, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -11129,246 +11717,63 @@ 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x2d, 0x6b, - 0x65, 0x79, 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x73, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, - 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, - 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, - 0x64, 0x65, 0x6c, 0x61, 0x79, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, - 0x61, 0x74, 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, - 0x73, 0x70, 0x65, 0x65, 0x64, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x2d, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x73, 0x63, 0x61, - 0x6c, 0x65, 0x73, 0x2d, 0x73, 0x69, 0x7a, 0x65, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x2f, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x70, 0x65, 0x61, 0x74, 0x5f, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x73, 0x70, 0x65, 0x65, 0x64, 0x5f, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, - 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x41, 0x73, - 0x73, 0x69, 0x73, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, - 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, - 0x36, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x39, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, - 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, - 0x78, 0x36, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, - 0x78, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x79, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x30, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, @@ -11378,23 +11783,52 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x53, 0x74, 0x69, 0x63, - 0x6b, 0x79, 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x79, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, + 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, + 0x5f, 0x6c, 0x6f, 0x77, 0x20, 0x4b, 0x65, 0x79, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, + 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, @@ -11430,260 +11864,437 @@ 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x74, 0x69, 0x63, 0x6b, 0x79, 0x5f, 0x62, - 0x6c, 0x75, 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x50, 0x75, 0x74, 0x73, 0x20, 0x61, 0x20, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x20, 0x62, 0x65, + 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x77, 0x68, + 0x65, 0x6e, 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, + 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, 0x73, + 0x73, 0x65, 0x64, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x77, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x74, 0x20, + 0x69, 0x73, 0x20, 0x61, 0x63, 0x63, 0x65, 0x70, + 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x65, 0x61, 0x74, 0x73, 0x20, 0x61, 0x20, - 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, - 0x20, 0x6f, 0x66, 0x20, 0x6d, 0x6f, 0x64, 0x69, - 0x66, 0x69, 0x65, 0x72, 0x20, 0x6b, 0x65, 0x79, - 0x73, 0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x6b, - 0x65, 0x79, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, + 0x78, 0x31, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, + 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x5f, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, + 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x78, 0x38, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x5f, + 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, + 0x65, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3a, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, + 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, + 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, + 0x78, 0x34, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, - 0x69, 0x63, 0x6b, 0x79, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, - 0x5f, 0x74, 0x77, 0x6f, 0x5f, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x44, 0x69, 0x73, 0x61, - 0x62, 0x6c, 0x65, 0x20, 0x69, 0x66, 0x20, 0x74, - 0x77, 0x6f, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, - 0x61, 0x72, 0x65, 0x20, 0x70, 0x72, 0x65, 0x73, - 0x73, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x67, 0x65, - 0x74, 0x68, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, + 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x6b, 0x65, 0x79, + 0x73, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x70, 0x61, + 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, + 0x74, 0x3d, 0x22, 0x73, 0x6c, 0x6f, 0x77, 0x20, + 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x22, 0x3e, 0x53, 0x68, 0x6f, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, + 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x48, 0x53, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, + 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, + 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, + 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, + 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, - 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, - 0x74, 0x69, 0x63, 0x6b, 0x79, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, + 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, + 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, + 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, 0x61, + 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2d, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x6c, 0x6f, 0x77, 0x20, 0x6b, 0x65, 0x79, + 0x73, 0x20, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x42, 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, - 0x65, 0x6e, 0x20, 0x61, 0x20, 0x5f, 0x6d, 0x6f, - 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x20, 0x6b, - 0x65, 0x79, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, - 0x65, 0x73, 0x73, 0x65, 0x64, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, + 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x6f, 0x6e, 0x67, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x3d, 0x22, 0x73, 0x6c, 0x6f, 0x77, 0x20, 0x6b, + 0x65, 0x79, 0x73, 0x20, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x22, 0x3e, 0x4c, 0x6f, 0x6e, 0x67, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, - 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -11712,303 +12323,126 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x39, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, - 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x53, 0x5f, 0x6c, 0x6f, 0x77, 0x20, 0x4b, 0x65, - 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, 0x79, - 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, - 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x62, 0x65, 0x65, 0x70, 0x5f, 0x70, 0x72, 0x65, + 0x73, 0x73, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, + 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x42, 0x65, + 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, + 0x61, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x73, + 0x20, 0x70, 0x72, 0x5f, 0x65, 0x73, 0x73, 0x65, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x50, 0x75, 0x74, 0x73, 0x20, 0x61, - 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x20, 0x62, - 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x77, - 0x68, 0x65, 0x6e, 0x20, 0x61, 0x20, 0x6b, 0x65, - 0x79, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x65, 0x64, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x74, - 0x20, 0x69, 0x73, 0x20, 0x61, 0x63, 0x63, 0x65, - 0x70, 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, - 0x6f, 0x78, 0x31, 0x31, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, - 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x62, 0x6f, 0x78, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, + 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, - 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x61, 0x63, + 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x5f, 0x63, + 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x42, 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, + 0x6e, 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, 0x20, + 0x69, 0x73, 0x20, 0x5f, 0x61, 0x63, 0x63, 0x65, + 0x70, 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -12017,32 +12451,14 @@ 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, - 0x5f, 0x63, 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, - 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, - 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, - 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, @@ -12054,191 +12470,193 @@ 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, - 0x6f, 0x78, 0x34, 0x32, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x70, - 0x61, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, + 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x62, 0x65, 0x65, 0x70, + 0x5f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x65, + 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x3d, 0x22, 0x73, 0x6c, 0x6f, 0x77, - 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x53, 0x68, 0x6f, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x73, 0x22, 0x3e, 0x42, 0x65, 0x65, 0x70, 0x20, + 0x77, 0x68, 0x65, 0x6e, 0x20, 0x61, 0x20, 0x6b, + 0x65, 0x79, 0x20, 0x69, 0x73, 0x20, 0x5f, 0x72, + 0x65, 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x53, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, - 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, - 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, - 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, - 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, - 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, - 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x53, 0x6c, 0x6f, 0x77, 0x20, 0x6b, 0x65, - 0x79, 0x73, 0x20, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x6f, 0x6e, - 0x67, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x32, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, + 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -12256,280 +12674,227 @@ 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x3d, 0x22, 0x73, 0x6c, 0x6f, 0x77, 0x20, - 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x22, 0x3e, 0x4c, 0x6f, 0x6e, 0x67, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, - 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x22, 0x3e, 0x5f, 0x42, 0x6f, 0x75, 0x6e, 0x63, + 0x65, 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x70, 0x72, - 0x65, 0x73, 0x73, 0x65, 0x64, 0x5f, 0x63, 0x68, - 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x42, - 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, 0x6e, - 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, - 0x73, 0x20, 0x70, 0x72, 0x5f, 0x65, 0x73, 0x73, - 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, + 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, + 0x73, 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, - 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, - 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x49, 0x67, 0x6e, 0x6f, 0x72, 0x65, + 0x73, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, 0x64, + 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, + 0x20, 0x6b, 0x65, 0x79, 0x70, 0x72, 0x65, 0x73, + 0x73, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x61, - 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x5f, - 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x42, 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, - 0x65, 0x6e, 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, - 0x20, 0x69, 0x73, 0x20, 0x5f, 0x61, 0x63, 0x63, - 0x65, 0x70, 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, - 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, - 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, + 0x78, 0x31, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, - 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x6c, 0x6f, 0x77, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x62, 0x65, 0x65, - 0x70, 0x5f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, - 0x65, 0x64, 0x5f, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x42, 0x65, 0x65, 0x70, - 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x61, 0x20, - 0x6b, 0x65, 0x79, 0x20, 0x69, 0x73, 0x20, 0x5f, - 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, + 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, + 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x41, 0x5f, 0x63, 0x63, 0x65, 0x70, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x3a, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, + 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, - 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, + 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, + 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, @@ -12541,63 +12906,21 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, - 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x34, + 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -12609,101 +12932,67 @@ 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, - 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, + 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, + 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x42, 0x6f, 0x75, 0x6e, - 0x63, 0x65, 0x20, 0x4b, 0x65, 0x79, 0x73, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x70, 0x61, + 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, + 0x74, 0x3d, 0x22, 0x62, 0x6f, 0x75, 0x6e, 0x63, + 0x65, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x53, 0x68, + 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, @@ -12714,37 +13003,126 @@ 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x53, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, + 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, + 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, + 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x74, + 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, + 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, + 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x61, + 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, + 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, + 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, 0x61, + 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2d, + 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x42, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x20, 0x6b, + 0x65, 0x79, 0x73, 0x20, 0x74, 0x79, 0x70, 0x69, + 0x6e, 0x67, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x49, 0x67, 0x6e, 0x6f, 0x72, - 0x65, 0x73, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, - 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x20, 0x6b, 0x65, 0x79, 0x70, 0x72, 0x65, - 0x73, 0x73, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, + 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x78, 0x74, 0x3d, 0x22, 0x62, 0x6f, + 0x75, 0x6e, 0x63, 0x65, 0x20, 0x6b, 0x65, 0x79, + 0x73, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x22, + 0x3e, 0x4c, 0x6f, 0x6e, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, @@ -12754,22 +13132,22 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -12778,171 +13156,157 @@ 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, - 0x6f, 0x78, 0x31, 0x34, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, - 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, - 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x75, + 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x62, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x65, 0x6a, + 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x42, + 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, 0x6e, + 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, + 0x73, 0x20, 0x5f, 0x72, 0x65, 0x6a, 0x65, 0x63, + 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x5f, 0x63, 0x63, 0x65, - 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x3a, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, 0x75, - 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, - 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, - 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, - 0x34, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, - 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x5f, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, + 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x69, 0x63, + 0x6b, 0x79, 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -12951,143 +13315,188 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x70, - 0x61, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x3d, 0x22, 0x62, 0x6f, 0x75, 0x6e, - 0x63, 0x65, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, - 0x64, 0x65, 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x53, - 0x68, 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, - 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, - 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, - 0x67, 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, - 0x6b, 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, - 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, - 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, - 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, - 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, - 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, - 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, + 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, + 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, - 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, - 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, - 0x65, 0x79, 0x73, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x2d, - 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x42, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x20, - 0x6b, 0x65, 0x79, 0x73, 0x20, 0x74, 0x79, 0x70, - 0x69, 0x6e, 0x67, 0x20, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x62, 0x6f, 0x78, 0x31, 0x35, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, - 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x6c, 0x61, + 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, + 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 0x74, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, @@ -13101,210 +13510,146 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x78, 0x74, 0x3d, 0x22, 0x62, - 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x20, 0x6b, 0x65, - 0x79, 0x73, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, - 0x22, 0x3e, 0x4c, 0x6f, 0x6e, 0x67, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x45, 0x6e, 0x61, + 0x62, 0x6c, 0x65, 0x20, 0x62, 0x79, 0x20, 0x4b, + 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, 0x6e, + 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, + 0x65, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, - 0x75, 0x6e, 0x63, 0x65, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x62, 0x65, 0x65, 0x70, 0x5f, 0x72, 0x65, - 0x6a, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x42, 0x65, 0x65, 0x70, 0x20, 0x77, 0x68, 0x65, - 0x6e, 0x20, 0x61, 0x20, 0x6b, 0x65, 0x79, 0x20, - 0x69, 0x73, 0x20, 0x5f, 0x72, 0x65, 0x6a, 0x65, - 0x63, 0x74, 0x65, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 0x74, 0x6f, + 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x62, 0x6c, 0x75, + 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x75, 0x72, + 0x6e, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x20, + 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x6f, 0x66, 0x66, 0x20, 0x75, 0x73, 0x69, 0x6e, + 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6b, 0x65, + 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x79, - 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x69, - 0x63, 0x6b, 0x79, 0x6b, 0x65, 0x79, 0x73, 0x5f, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, + 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, + 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -13341,7 +13686,7 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, @@ -13354,591 +13699,450 @@ 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x6c, 0x6f, 0x77, 0x6b, 0x65, 0x79, 0x73, - 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x6b, - 0x65, 0x79, 0x73, 0x5f, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x35, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x6b, - 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, - 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x45, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x20, 0x62, 0x79, 0x20, - 0x4b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x74, 0x79, 0x70, 0x69, - 0x6e, 0x67, 0x5f, 0x6b, 0x65, 0x79, 0x62, 0x6f, - 0x61, 0x72, 0x64, 0x5f, 0x74, 0x6f, 0x67, 0x67, - 0x6c, 0x65, 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, + 0x77, 0x65, 0x72, 0x22, 0x3e, 0x30, 0x2e, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 0x72, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x31, 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, + 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, - 0x79, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x6b, 0x65, - 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 0x74, - 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x5f, 0x62, 0x6c, - 0x75, 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, + 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x3e, 0x30, 0x2e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, + 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, + 0x64, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, + 0x70, 0x65, 0x72, 0x22, 0x3e, 0x33, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, + 0x3e, 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, + 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, + 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, + 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, + 0x69, 0x6d, 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, + 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x3e, 0x30, + 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, + 0x65, 0x72, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x75, - 0x72, 0x6e, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x20, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, - 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x6f, 0x66, 0x66, 0x20, 0x75, 0x73, 0x69, - 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6b, - 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x79, 0x70, 0x69, 0x6e, 0x67, - 0x5f, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, - 0x64, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, - 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x31, + 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, + 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, + 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, + 0x74, 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x6f, 0x77, 0x65, 0x72, 0x22, 0x3e, 0x30, 0x2e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, - 0x72, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x41, 0x73, + 0x73, 0x69, 0x73, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x31, 0x2e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, - 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, - 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, + 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, - 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, - 0x6c, 0x64, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, + 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, 0x33, 0x30, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x72, 0x69, 0x64, 0x37, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x22, 0x3e, 0x31, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, - 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, - 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x61, 0x64, 0x6a, - 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, + 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x36, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x22, 0x3e, - 0x30, 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, - 0x70, 0x65, 0x72, 0x22, 0x3e, 0x33, 0x3c, 0x2f, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, - 0x31, 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, - 0x65, 0x70, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x30, 0x2e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, - 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x3e, 0x30, 0x2e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, + 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x41, - 0x73, 0x73, 0x69, 0x73, 0x74, 0x3c, 0x2f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x53, 0x69, 0x6d, 0x75, 0x6c, + 0x61, 0x74, 0x65, 0x64, 0x20, 0x53, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x20, 0x43, + 0x6c, 0x69, 0x63, 0x6b, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, - 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, - 0x62, 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, - 0x76, 0x62, 0x6f, 0x78, 0x36, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x6f, + 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, + 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, + 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x37, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, 0x6e, 0x64, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, + 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, + 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x5f, 0x62, 0x6c, 0x75, 0x72, + 0x62, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x69, 0x67, + 0x67, 0x65, 0x72, 0x20, 0x61, 0x20, 0x73, 0x65, + 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x20, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x62, 0x79, + 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x69, 0x6e, 0x67, + 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, + 0x79, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x36, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -13956,21 +14160,124 @@ 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, + 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, + 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, - 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x41, 0x5f, 0x63, 0x63, + 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x20, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3a, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, + 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, + 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, + 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, 0x69, + 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, + 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -13982,124 +14289,253 @@ 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, + 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, + 0x79, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x68, + 0x6f, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x78, 0x74, 0x3d, 0x22, 0x73, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x20, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x22, 0x3e, 0x53, 0x68, + 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x53, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, 0x69, - 0x63, 0x6b, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, + 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, + 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, + 0x61, 0x72, 0x79, 0x20, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x53, 0x69, 0x6d, 0x75, - 0x6c, 0x61, 0x74, 0x65, 0x64, 0x20, 0x53, 0x65, - 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x20, - 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x3c, 0x2f, 0x70, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, + 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x6f, 0x6e, 0x67, + 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, - 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, - 0x79, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, - 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x3d, 0x22, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, + 0x61, 0x72, 0x79, 0x20, 0x63, 0x6c, 0x69, 0x63, + 0x6b, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x22, + 0x3e, 0x4c, 0x6f, 0x6e, 0x67, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, - 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, - 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x62, 0x6c, 0x75, - 0x72, 0x62, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x20, 0x61, 0x20, 0x73, - 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, - 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x62, - 0x79, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x69, 0x6e, - 0x67, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x70, 0x72, 0x69, 0x6d, 0x61, - 0x72, 0x79, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, @@ -14122,67 +14558,62 @@ 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, - 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, - 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x5f, 0x62, 0x6f, 0x78, 0x22, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x62, 0x6f, 0x78, 0x31, 0x39, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x32, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -14195,18 +14626,18 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, - 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, - 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x61, 0x62, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, @@ -14227,201 +14658,92 @@ 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x5f, 0x63, - 0x63, 0x65, 0x70, 0x74, 0x61, 0x6e, 0x63, 0x65, - 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x3a, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x48, 0x6f, + 0x76, 0x65, 0x72, 0x20, 0x43, 0x6c, 0x69, 0x63, + 0x6b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x6f, 0x69, 0x6e, 0x74, - 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, - 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, - 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, - 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, - 0x72, 0x79, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, - 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x6f, 0x76, 0x65, + 0x72, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, + 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, + 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x78, 0x74, 0x3d, 0x22, 0x73, 0x65, - 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x20, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x22, 0x3e, 0x53, - 0x68, 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, - 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, - 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, - 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, 0x6f, - 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6c, - 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, - 0x61, 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, - 0x6b, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, - 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, - 0x65, 0x2d, 0x61, 0x74, 0x6b, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x74, 0x6b, - 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3a, 0x3a, - 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x2d, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x53, 0x65, 0x63, 0x6f, 0x6e, - 0x64, 0x61, 0x72, 0x79, 0x20, 0x63, 0x6c, 0x69, - 0x63, 0x6b, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x6f, 0x76, + 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, + 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, + 0x20, 0x61, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, + 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x20, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, @@ -14434,154 +14756,159 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, - 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, - 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x6f, 0x6e, - 0x67, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x3d, 0x22, 0x73, 0x65, 0x63, 0x6f, 0x6e, - 0x64, 0x61, 0x72, 0x79, 0x20, 0x63, 0x6c, 0x69, - 0x63, 0x6b, 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, - 0x22, 0x3e, 0x4c, 0x6f, 0x6e, 0x67, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x32, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x65, + 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, + 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, + 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, + 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x39, 0x22, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x44, 0x5f, 0x65, 0x6c, 0x61, 0x79, 0x3a, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x70, 0x6f, 0x69, 0x6e, 0x74, + 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, + 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -14594,25 +14921,35 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, 0x5f, + 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x5f, + 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, + 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, + 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, + 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, + 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, 0x41, + 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, + 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, + 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, 0x41, + 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, + 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, + 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x32, 0x30, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x64, + 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x68, 0x6f, + 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -14625,222 +14962,115 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x5f, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x48, - 0x6f, 0x76, 0x65, 0x72, 0x20, 0x43, 0x6c, 0x69, - 0x63, 0x6b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x70, 0x6f, 0x69, 0x6e, - 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x6f, 0x76, - 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x5f, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, + 0x6c, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x53, + 0x68, 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x6f, - 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6c, 0x69, 0x63, - 0x6b, 0x5f, 0x62, 0x6c, 0x75, 0x72, 0x62, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x20, 0x61, 0x20, 0x63, 0x6c, 0x69, 0x63, - 0x6b, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x20, 0x68, 0x6f, 0x76, 0x65, 0x72, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, + 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x32, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x65, 0x6e, 0x64, 0x22, 0x3e, 0x31, 0x30, 0x3c, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, - 0x65, 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, + 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x77, + 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, 0x65, + 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, + 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, - 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, - 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, + 0x70, 0x6f, 0x73, 0x22, 0x3e, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, + 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -14862,52 +15092,89 @@ 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x44, 0x5f, 0x65, 0x6c, 0x61, 0x79, 0x3a, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, + 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x20, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x64, 0x65, + 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x4c, 0x6f, 0x6e, + 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, + 0x69, 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, + 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, + 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x70, 0x6f, 0x69, 0x6e, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, - 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, - 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x32, + 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, + 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, @@ -14920,157 +15187,86 @@ 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, - 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, - 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, - 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, - 0x44, 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, - 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, - 0x4e, 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, - 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, - 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, - 0x5f, 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, - 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, - 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, - 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, - 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, - 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x73, 0x68, - 0x6f, 0x72, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, + 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, + 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x78, 0x74, 0x3d, 0x22, 0x64, 0x77, 0x65, - 0x6c, 0x6c, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, - 0x20, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x22, 0x3e, - 0x53, 0x68, 0x6f, 0x72, 0x74, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, - 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, - 0x65, 0x6c, 0x6c, 0x5f, 0x64, 0x65, 0x6c, 0x61, - 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x4d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x5f, + 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, + 0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x64, - 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, - 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, + 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x6f, + 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, + 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, + 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x5f, 0x70, 0x6f, 0x73, 0x22, 0x3e, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x6f, 0x6e, - 0x67, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -15083,112 +15279,26 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, - 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x64, - 0x65, 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x4c, 0x6f, - 0x6e, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, - 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, 0x5f, + 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x5f, + 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4d, + 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, + 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, + 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, + 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, 0x41, + 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, + 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, + 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, 0x41, + 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, + 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, 0x5f, + 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x5f, + 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, - 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, - 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, - 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, @@ -15197,51 +15307,47 @@ 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, - 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x20, - 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, - 0x6c, 0x64, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x5f, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x5f, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, - 0x69, 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, - 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, - 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, - 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x3d, 0x22, + 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x20, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72, 0x65, + 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x22, 0x3e, 0x53, + 0x6d, 0x61, 0x6c, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, + 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, @@ -15252,53 +15358,71 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, + 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, + 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, + 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, + 0x22, 0x3e, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, + 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, + 0x64, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, + 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x67, 0x69, 0x74, 0x73, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x33, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x47, 0x44, 0x4b, - 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x45, 0x52, - 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, 0x4e, 0x5f, - 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, - 0x44, 0x4b, 0x5f, 0x50, 0x4f, 0x49, 0x4e, 0x54, - 0x45, 0x52, 0x5f, 0x4d, 0x4f, 0x54, 0x49, 0x4f, - 0x4e, 0x5f, 0x48, 0x49, 0x4e, 0x54, 0x5f, 0x4d, - 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, - 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, - 0x5f, 0x50, 0x52, 0x45, 0x53, 0x53, 0x5f, 0x4d, - 0x41, 0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, - 0x4b, 0x5f, 0x42, 0x55, 0x54, 0x54, 0x4f, 0x4e, - 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, - 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, @@ -15306,7 +15430,7 @@ 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, - 0x64, 0x5f, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x5f, + 0x64, 0x5f, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, @@ -15321,7 +15445,7 @@ 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, @@ -15332,7 +15456,7 @@ 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x20, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x22, 0x3e, - 0x53, 0x6d, 0x61, 0x6c, 0x6c, 0x3c, 0x2f, 0x70, + 0x4c, 0x61, 0x72, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -15362,47 +15486,10 @@ 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, - 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, - 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x77, 0x65, 0x6c, 0x6c, - 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, - 0x6c, 0x64, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, - 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x67, 0x69, 0x74, 0x73, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, - 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, @@ -15421,99 +15508,188 @@ 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, - 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, - 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, - 0x6c, 0x64, 0x5f, 0x6c, 0x61, 0x72, 0x67, 0x65, - 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, - 0x3d, 0x22, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x20, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, - 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x22, - 0x3e, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, + 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, - 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, + 0x68, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6c, + 0x69, 0x63, 0x6b, 0x5f, 0x73, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -15528,214 +15704,39 @@ 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x6f, - 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, - 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, - 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, - 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x5f, 0x63, - 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x73, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, - 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x73, 0x74, 0x61, - 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, - 0x6f, 0x75, 0x70, 0x31, 0x22, 0x3e, 0x3c, 0x77, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x31, 0x22, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, 0x63, + 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, 0x6c, + 0x61, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, 0x5f, + 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, + 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, + 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x65, - 0x63, 0x6f, 0x6e, 0x64, 0x61, 0x72, 0x79, 0x5f, - 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x5f, 0x64, 0x65, - 0x6c, 0x61, 0x79, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x69, - 0x6e, 0x67, 0x5f, 0x64, 0x77, 0x65, 0x6c, 0x6c, - 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x69, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x77, - 0x65, 0x6c, 0x6c, 0x5f, 0x74, 0x68, 0x72, 0x65, - 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x5f, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, - 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x6e, - 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00 + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, + 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, 0x6e, 0x6f, + 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { cc_universal_access_resource_data.data, sizeof (cc_universal_access_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/universal-access/gnome-universal-access-panel.desktop.in.in gnome-control-center-3.22.1/panels/universal-access/gnome-universal-access-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/universal-access/gnome-universal-access-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/universal-access/gnome-universal-access-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Universal Access +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Uni­ver­sal Access _Comment=Make it easier to see, hear, type, point and click Exec=gnome-control-center universal-access Icon=preferences-desktop-accessibility @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/universal-access/Makefile.in gnome-control-center-3.22.1/panels/universal-access/Makefile.in --- gnome-control-center-3.20.2/panels/universal-access/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/universal-access/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -315,8 +315,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -532,22 +530,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zoom-options.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/universal-access/uap.ui gnome-control-center-3.22.1/panels/universal-access/uap.ui --- gnome-control-center-3.20.2/panels/universal-access/uap.ui 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/universal-access/uap.ui 2016-05-13 16:39:23.000000000 +0000 @@ -1062,7 +1062,7 @@ 6 6 0 - Beep when Num Lock or Caps Lock are turned on. + Beep when Num Lock or Caps Lock are turned on or off. True diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/account-dialog.ui gnome-control-center-3.22.1/panels/user-accounts/data/account-dialog.ui --- gnome-control-center-3.20.2/panels/user-accounts/data/account-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/account-dialog.ui 2016-08-12 12:43:57.000000000 +0000 @@ -8,25 +8,73 @@ - - - - - - - - - - Standard - 0 - - - Administrator - 1 - - - - + @@ -936,14 +782,28 @@ - - + + - - - - - + + + + + + + + + horizontal + + + + + + + horizontal + + + diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/faces/Makefile.in gnome-control-center-3.22.1/panels/user-accounts/data/faces/Makefile.in --- gnome-control-center-3.20.2/panels/user-accounts/data/faces/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/faces/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in gnome-control-center-3.22.1/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -7,7 +7,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings; +Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-GNOME-DetailsSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/history-dialog.ui gnome-control-center-3.22.1/panels/user-accounts/data/history-dialog.ui --- gnome-control-center-3.20.2/panels/user-accounts/data/history-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/history-dialog.ui 2016-09-08 11:48:12.000000000 +0000 @@ -3,7 +3,6 @@ False - Login History False True center-on-parent @@ -14,48 +13,55 @@ True False - Login History - Login History True - + True True - True - center - + True - False + True + True + center + + + + True + False + + + + start + - - - start - - - - - True - True - True - - + True - False + True + True center + + + + True + False + + + + end + - - end - diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/join-dialog.ui gnome-control-center-3.22.1/panels/user-accounts/data/join-dialog.ui --- gnome-control-center-3.20.2/panels/user-accounts/data/join-dialog.ui 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/join-dialog.ui 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,238 @@ + + + + + False + 10 + False + True + True + dialog + Add User + 1 + + + True + False + False + + + _Cancel + True + True + True + True + True + False + True + center + + + + start + + + + + _Enroll + True + True + True + True + True + False + True + center + + + + end + + + + + + + False + vertical + 2 + + + True + False + 5 + vertical + 10 + + + True + False + Domain Administrator Login + + + + + + + False + True + 0 + + + + + True + False + 0 + 0 + In order to use enterprise logins, this computer needs to be +enrolled in the domain. Please have your network administrator +type their domain password here. + + + False + True + 1 + + + + + True + False + 12 + True + 6 + 12 + + + True + False + 1 + _Domain + True + join-domain + + + + 0 + 0 + 1 + 1 + + + + + True + False + 5 + 5 + 0 + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + Administrator _Name + True + join-name + + + + 0 + 1 + 1 + 1 + + + + + True + True + True + ● + True + True + + + 1 + 1 + 1 + 1 + + + + + True + False + 1 + Administrator Password + True + join-password + + + + 0 + 2 + 1 + 1 + + + + + True + True + True + False + ● + True + True + password + + + 1 + 2 + 1 + 1 + + + + + False + True + 2 + + + + + False + True + 1 + + + + + + button1 + button2 + + + diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/Makefile.in gnome-control-center-3.22.1/panels/user-accounts/data/Makefile.in --- gnome-control-center-3.20.2/panels/user-accounts/data/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -321,8 +321,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/password-dialog.ui gnome-control-center-3.22.1/panels/user-accounts/data/password-dialog.ui --- gnome-control-center-3.20.2/panels/user-accounts/data/password-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/password-dialog.ui 2016-08-12 12:43:57.000000000 +0000 @@ -237,7 +237,7 @@ vertical - Allow user to set a password when they next login + Allow user to change their password on next login True True False diff -Nru gnome-control-center-3.20.2/panels/user-accounts/data/user-accounts-dialog.ui gnome-control-center-3.22.1/panels/user-accounts/data/user-accounts-dialog.ui --- gnome-control-center-3.20.2/panels/user-accounts/data/user-accounts-dialog.ui 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/data/user-accounts-dialog.ui 2016-08-12 12:43:57.000000000 +0000 @@ -1,29 +1,38 @@ - - - - - + + True + False + + + True + True + + + _lock + + + + + True + True + _Add User… + True + + + + _adduser + + - + - - - - - Standard - 0 - - - Administrator - 1 - - @@ -70,46 +79,6 @@ 0 - - - True - 1 - True - icons - - - - True - False - list-add-symbolic - Add User Account - - - False - True - - - - - True - False - list-remove-symbolic - Remove User Account - - - False - True - - - - - False - False - 1 - - True @@ -128,24 +97,46 @@ True False 10 + 10 - + True True 1 - 6 + 5 1 1 - + True - account-type-model - 0 - True + False + False + + + + True + True + Standard + False + True + + + + + True + True + Administrator + False + account-type-standard + True + + 1 @@ -160,7 +151,7 @@ 1 Account _Type True - account-type-combo + account-type-box @@ -177,13 +168,11 @@ True vertical - + True - 1.2 - 700 30 30 - PANGO_ELLIPSIZE_END + GTK_ALIGN_CENTER True @@ -199,24 +188,6 @@ - - True - 1 - 5 - 5 - Login Options - - - - - - 0 - 3 - 1 - 1 - - - True 1 @@ -229,19 +200,28 @@ 0 - 4 + 3 1 1 - + True True + + + + True + GTK_ALIGN_START + + 1 - 4 + 3 1 1 @@ -259,7 +239,7 @@ 0 - 5 + 4 1 1 @@ -285,7 +265,7 @@ 1 - 5 + 4 1 1 @@ -303,7 +283,7 @@ 0 - 6 + 5 1 1 @@ -392,9 +372,18 @@ - + True True + + + + True + GTK_ALIGN_START + + 1 @@ -409,55 +398,36 @@ 1 Last Login True - last-login-value-label + last-login-button 0 - 7 + 6 1 1 - + True - False + True + True + - + True - False - True - 0 + GTK_ALIGN_START - - 0 - 0 - 1 - 1 - - - - - _History - True - True - True - True - - - 1 - 0 - 1 - 1 - 1 - 7 + 6 1 1 @@ -476,6 +446,21 @@ 1 + + + True + False + GTK_ALIGN_END + GTK_ALIGN_END + Remove Account + + + + 2 + + @@ -494,7 +479,6 @@ - @@ -506,9 +490,16 @@ - + - + + + + + both + + + diff -Nru gnome-control-center-3.20.2/panels/user-accounts/Makefile.am gnome-control-center-3.22.1/panels/user-accounts/Makefile.am --- gnome-control-center-3.20.2/panels/user-accounts/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -46,10 +46,6 @@ fingerprint-strings.h \ run-passwd.h \ run-passwd.c \ - um-editable-button.h \ - um-editable-button.c \ - um-editable-combo.h \ - um-editable-combo.c \ um-user-panel.h \ um-user-panel.c \ um-realm-manager.c \ diff -Nru gnome-control-center-3.20.2/panels/user-accounts/Makefile.in gnome-control-center-3.22.1/panels/user-accounts/Makefile.in --- gnome-control-center-3.20.2/panels/user-accounts/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -117,8 +117,7 @@ am_libuser_accounts_la_OBJECTS = um-account-type.lo \ um-account-dialog.lo um-password-dialog.lo pw-utils.lo \ um-photo-dialog.lo cc-crop-area.lo um-fingerprint-dialog.lo \ - um-utils.lo run-passwd.lo um-editable-button.lo \ - um-editable-combo.lo um-user-panel.lo um-realm-manager.lo \ + um-utils.lo run-passwd.lo um-user-panel.lo um-realm-manager.lo \ um-history-dialog.lo um-user-image.lo \ um-cell-renderer-user-image.lo $(am__objects_1) libuser_accounts_la_OBJECTS = $(am_libuser_accounts_la_OBJECTS) @@ -386,8 +385,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -551,10 +548,6 @@ fingerprint-strings.h \ run-passwd.h \ run-passwd.c \ - um-editable-button.h \ - um-editable-button.c \ - um-editable-combo.h \ - um-editable-combo.c \ um-user-panel.h \ um-user-panel.c \ um-realm-manager.c \ @@ -688,8 +681,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-account-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-account-type.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-cell-renderer-user-image.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-editable-button.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-editable-combo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-fingerprint-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-history-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-password-dialog.Plo@am__quote@ @@ -702,22 +693,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/um-utils.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/user-accounts/pw-utils.c gnome-control-center-3.22.1/panels/user-accounts/pw-utils.c --- gnome-control-center-3.20.2/panels/user-accounts/pw-utils.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/pw-utils.c 2016-08-12 12:43:57.000000000 +0000 @@ -114,7 +114,7 @@ case PWQ_ERROR_MIN_LENGTH: return C_("Password hint", "Try to add more letters, numbers and symbols."); case PWQ_ERROR_EMPTY_PASSWORD: - return C_("Password hint", "Mix uppercase and lowercase and use a number or two."); + return C_("Password hint", "Mix uppercase and lowercase and try to use a number or two."); default: return C_("Password hint", "Good password! Adding more letters, numbers and punctuation will make it stronger."); } diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-account-dialog.c gnome-control-center-3.22.1/panels/user-accounts/um-account-dialog.c --- gnome-control-center-3.20.2/panels/user-accounts/um-account-dialog.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-account-dialog.c 2016-10-10 16:16:39.000000000 +0000 @@ -31,7 +31,7 @@ #include "pw-utils.h" #define PASSWORD_CHECK_TIMEOUT 600 -#define DOMAIN_DEFAULT_HINT _("Should match the web address of your account provider.") +#define DOMAIN_DEFAULT_HINT _("Should match the web address of your login provider.") typedef enum { UM_LOCAL, @@ -70,7 +70,6 @@ struct _UmAccountDialog { GtkDialog parent; GtkWidget *stack; - GtkWidget *container_widget; GSimpleAsyncResult *async; GCancellable *cancellable; GPermission *permission; @@ -79,11 +78,12 @@ /* Local user account widgets */ GtkWidget *local_username; + GtkWidget *local_username_entry; GtkWidget *local_name; gint local_name_timeout_id; GtkWidget *local_username_hint; gint local_username_timeout_id; - GtkWidget *local_account_type; + GtkWidget *account_type_standard; ActUserPasswordMode local_password_mode; GtkWidget *local_password_radio; GtkWidget *local_password; @@ -246,16 +246,12 @@ const gchar *username; const gchar *name; gint account_type; - GtkTreeModel *model; - GtkTreeIter iter; begin_action (self); name = gtk_entry_get_text (GTK_ENTRY (self->local_name)); username = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (self->local_username)); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->local_account_type)); - gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->local_account_type), &iter); - gtk_tree_model_get (model, &iter, 1, &account_type, -1); + account_type = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->account_type_standard)) ? ACT_USER_ACCOUNT_TYPE_STANDARD : ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR); g_debug ("Creating local user: %s", username); @@ -546,63 +542,36 @@ } static void -local_init (UmAccountDialog *self, - GtkBuilder *builder) +local_init (UmAccountDialog *self) { - GtkWidget *widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-username"); - g_signal_connect (widget, "changed", + g_signal_connect (self->local_username, "changed", G_CALLBACK (on_username_changed), self); - g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (on_username_focus_out), self); - self->local_username = widget; + g_signal_connect_after (self->local_username, "focus-out-event", G_CALLBACK (on_username_focus_out), self); - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-username-entry"); - g_signal_connect_swapped (widget, "activate", G_CALLBACK (dialog_validate), self); + g_signal_connect_swapped (self->local_username_entry, "activate", G_CALLBACK (dialog_validate), self); - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-name"); - g_signal_connect (widget, "changed", G_CALLBACK (on_name_changed), self); - g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (on_name_focus_out), self); - g_signal_connect_swapped (widget, "activate", G_CALLBACK (dialog_validate), self); - self->local_name = widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-username-hint"); - self->local_username_hint = widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-account-type"); - self->local_account_type = widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-password-now-radio"); - g_signal_connect (widget, "toggled", G_CALLBACK (on_password_radio_changed), self); - self->local_password_radio = widget; + g_signal_connect (self->local_name, "changed", G_CALLBACK (on_name_changed), self); + g_signal_connect_after (self->local_name, "focus-out-event", G_CALLBACK (on_name_focus_out), self); + g_signal_connect_swapped (self->local_name, "activate", G_CALLBACK (dialog_validate), self); + + g_signal_connect (self->local_password_radio, "toggled", G_CALLBACK (on_password_radio_changed), self); self->local_password_mode = ACT_USER_PASSWORD_MODE_SET_AT_LOGIN; - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-password"); - gtk_widget_set_sensitive (widget, FALSE); - g_signal_connect (widget, "notify::text", G_CALLBACK (on_password_changed), self); - g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (on_password_focus_out), self); - g_signal_connect_swapped (widget, "activate", G_CALLBACK (dialog_validate), self); - self->local_password = widget; - g_signal_connect (widget, "icon-press", G_CALLBACK (on_generate), self); - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-verify"); - gtk_widget_set_sensitive (widget, FALSE); - g_signal_connect (widget, "notify::text", G_CALLBACK (on_password_changed), self); - g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (on_password_focus_out), self); - g_signal_connect_swapped (widget, "activate", G_CALLBACK (dialog_validate), self); - self->local_verify = widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-strength-indicator"); - gtk_widget_set_sensitive (widget, FALSE); - self->local_strength_indicator = widget; - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-hint"); - gtk_widget_set_sensitive (widget, FALSE); - self->local_hint = widget; + gtk_widget_set_sensitive (self->local_password, FALSE); + g_signal_connect (self->local_password, "notify::text", G_CALLBACK (on_password_changed), self); + g_signal_connect_after (self->local_password, "focus-out-event", G_CALLBACK (on_password_focus_out), self); + g_signal_connect_swapped (self->local_password, "activate", G_CALLBACK (dialog_validate), self); + g_signal_connect (self->local_password, "icon-press", G_CALLBACK (on_generate), self); + + gtk_widget_set_sensitive (self->local_verify, FALSE); + g_signal_connect (self->local_verify, "notify::text", G_CALLBACK (on_password_changed), self); + g_signal_connect_after (self->local_verify, "focus-out-event", G_CALLBACK (on_password_focus_out), self); + g_signal_connect_swapped (self->local_verify, "activate", G_CALLBACK (dialog_validate), self); + + gtk_widget_set_sensitive (self->local_strength_indicator, FALSE); - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-verify-hint"); - self->local_verify_hint = widget; + gtk_widget_set_sensitive (self->local_hint, FALSE); dialog_validate (self); update_password_strength (self); @@ -617,7 +586,7 @@ gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (self->local_username))), ""); model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->local_username)); gtk_list_store_clear (GTK_LIST_STORE (model)); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->account_type_standard), TRUE); } static gboolean @@ -938,9 +907,21 @@ } static void -join_init (UmAccountDialog *self, - GtkBuilder *builder) +join_init (UmAccountDialog *self) { + GtkBuilder *builder; + GError *error = NULL; + + builder = gtk_builder_new (); + + if (!gtk_builder_add_from_resource (builder, + "/org/gnome/control-center/user-accounts/join-dialog.ui", + &error)) { + g_error ("%s", error->message); + g_error_free (error); + return; + } + self->join_dialog = GTK_DIALOG (gtk_builder_get_object (builder, "join-dialog")); self->join_domain = GTK_LABEL (gtk_builder_get_object (builder, "join-domain")); self->join_name = GTK_ENTRY (gtk_builder_get_object (builder, "join-name")); @@ -948,6 +929,8 @@ g_signal_connect (self->join_dialog, "response", G_CALLBACK (on_join_response), self); + + g_object_unref (builder); } static void @@ -1326,38 +1309,26 @@ } static void -enterprise_init (UmAccountDialog *self, - GtkBuilder *builder) +enterprise_init (UmAccountDialog *self) { - GtkWidget *widget; GNetworkMonitor *monitor; self->enterprise_realms = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT); self->enterprise_check_credentials = FALSE; - self->enterprise_hint = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-hint"); - self->enterprise_domain_hint = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-domain-hint"); - - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-domain"); - g_signal_connect (widget, "changed", G_CALLBACK (on_domain_changed), self); - g_signal_connect_after (widget, "focus-out-event", G_CALLBACK (on_enterprise_domain_focus_out), self); - self->enterprise_domain = GTK_COMBO_BOX (widget); - gtk_combo_box_set_model (self->enterprise_domain, + g_signal_connect (self->enterprise_domain, "changed", G_CALLBACK (on_domain_changed), self); + g_signal_connect_after (self->enterprise_domain, "focus-out-event", G_CALLBACK (on_enterprise_domain_focus_out), self); + gtk_combo_box_set_model (GTK_COMBO_BOX (self->enterprise_domain), GTK_TREE_MODEL (self->enterprise_realms)); - self->enterprise_domain_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))); + self->enterprise_domain_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (self->enterprise_domain))); enterprise_check_domain (self); - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-login"); - g_signal_connect (widget, "changed", G_CALLBACK (on_entry_changed), self); - self->enterprise_login = GTK_ENTRY (widget); - - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-password"); - g_signal_connect (widget, "changed", G_CALLBACK (on_entry_changed), self); - self->enterprise_password = GTK_ENTRY (widget); + g_signal_connect (self->enterprise_login, "changed", G_CALLBACK (on_entry_changed), self); + + g_signal_connect (self->enterprise_password, "changed", G_CALLBACK (on_entry_changed), self); /* Initially we hide the 'Enterprise Login' stuff */ - widget = self->enterprise_button; - gtk_widget_hide (widget); + gtk_widget_hide (self->enterprise_button); self->realmd_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM, "org.freedesktop.realmd", G_BUS_NAME_WATCHER_FLAGS_AUTO_START, @@ -1431,66 +1402,20 @@ } static void -mode_init (UmAccountDialog *self, - GtkBuilder *builder) +mode_init (UmAccountDialog *self) { - GtkWidget *widget; - - widget = self->enterprise_button; - g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self); + g_signal_connect (self->enterprise_button, "toggled", G_CALLBACK (on_enterprise_toggle), self); } static void um_account_dialog_init (UmAccountDialog *self) { - GtkBuilder *builder; - GtkWidget *widget; - GError *error = NULL; - GtkDialog *dialog; - GtkWidget *content; - - builder = gtk_builder_new (); + gtk_widget_init_template (GTK_WIDGET (self)); - if (!gtk_builder_add_from_resource (builder, - "/org/gnome/control-center/user-accounts/account-dialog.ui", - &error)) { - g_error ("%s", error->message); - g_error_free (error); - return; - } - - dialog = GTK_DIALOG (self); - content = gtk_dialog_get_content_area (dialog); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); - gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); - gtk_window_set_title (GTK_WINDOW (dialog), _("Add User")); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-users"); - - widget = GTK_WIDGET (gtk_builder_get_object (builder, "enterprise-button")); - self->enterprise_button = widget; - - widget = GTK_WIDGET (gtk_builder_get_object (builder, "spinner")); - gtk_widget_hide (widget); - self->spinner = GTK_SPINNER (widget); - - gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL); - widget = gtk_dialog_add_button (dialog, _("_Add"), GTK_RESPONSE_OK); - gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK); - gtk_widget_grab_default (widget); - - widget = (GtkWidget *) gtk_builder_get_object (builder, "account-dialog"); - gtk_container_add (GTK_CONTAINER (content), widget); - self->container_widget = widget; - - widget = GTK_WIDGET (gtk_builder_get_object (builder, "stack")); - self->stack = widget; - - local_init (self, builder); - enterprise_init (self, builder); - join_init (self, builder); - mode_init (self, builder); - - g_object_unref (builder); + local_init (self); + enterprise_init (self); + join_init (self); + mode_init (self); } static void @@ -1613,11 +1538,34 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); object_class->dispose = um_account_dialog_dispose; object_class->finalize = um_account_dialog_finalize; dialog_class->response = um_account_dialog_response; + + gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (dialog_class), + "/org/gnome/control-center/user-accounts/account-dialog.ui"); + + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, stack); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_username); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_username_entry); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_name); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_username_hint); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, account_type_standard); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_password_radio); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_password); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_verify); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_strength_indicator); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_hint); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, local_verify_hint); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, enterprise_button); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, spinner); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, enterprise_domain); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, enterprise_login); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, enterprise_password); + gtk_widget_class_bind_template_child (widget_class, UmAccountDialog, enterprise_domain_hint); } UmAccountDialog * diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-editable-button.c gnome-control-center-3.22.1/panels/user-accounts/um-editable-button.c --- gnome-control-center-3.20.2/panels/user-accounts/um-editable-button.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-editable-button.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,434 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2009-2010 Red Hat, Inc, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Written by: Matthias Clasen - */ - -#include -#include "um-editable-button.h" - -#define EMPTY_TEXT "\xe2\x80\x94" - -struct _UmEditableButtonPrivate { - GtkStack *stack; - GtkLabel *label; - GtkButton *button; - - gchar *text; - gboolean editable; - gint weight; - gboolean weight_set; - gdouble scale; - gboolean scale_set; -}; - -#define UM_EDITABLE_BUTTON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UM_TYPE_EDITABLE_BUTTON, UmEditableButtonPrivate)) - -#define PAGE_LABEL "_label" -#define PAGE_BUTTON "_button" - -enum { - PROP_0, - PROP_TEXT, - PROP_EDITABLE, - PROP_SCALE, - PROP_SCALE_SET, - PROP_WEIGHT, - PROP_WEIGHT_SET -}; - -enum { - START_EDITING, - ACTIVATE, - LAST_SIGNAL -}; - -static guint signals [LAST_SIGNAL] = { 0, }; - -G_DEFINE_TYPE (UmEditableButton, um_editable_button, GTK_TYPE_BIN); - -void -um_editable_button_set_text (UmEditableButton *button, - const gchar *text) -{ - UmEditableButtonPrivate *priv; - gchar *tmp; - GtkWidget *label; - - priv = button->priv; - - tmp = g_strdup (text); - g_free (priv->text); - priv->text = tmp; - - if (tmp == NULL || tmp[0] == '\0') - tmp = EMPTY_TEXT; - - gtk_label_set_text (priv->label, tmp); - label = gtk_bin_get_child (GTK_BIN (priv->button)); - gtk_label_set_text (GTK_LABEL (label), tmp); - - g_object_notify (G_OBJECT (button), "text"); -} - -const gchar * -um_editable_button_get_text (UmEditableButton *button) -{ - return button->priv->text; -} - -void -um_editable_button_set_editable (UmEditableButton *button, - gboolean editable) -{ - UmEditableButtonPrivate *priv; - - priv = button->priv; - - if (priv->editable != editable) { - priv->editable = editable; - - gtk_stack_set_visible_child_name (priv->stack, editable ? PAGE_BUTTON : PAGE_LABEL); - - g_object_notify (G_OBJECT (button), "editable"); - } -} - -gboolean -um_editable_button_get_editable (UmEditableButton *button) -{ - return button->priv->editable; -} - -static void -update_fonts (UmEditableButton *button) -{ - PangoAttrList *attrs; - PangoAttribute *attr; - GtkWidget *label; - - UmEditableButtonPrivate *priv = button->priv; - - attrs = pango_attr_list_new (); - if (priv->scale_set) { - attr = pango_attr_scale_new (priv->scale); - pango_attr_list_insert (attrs, attr); - } - if (priv->weight_set) { - attr = pango_attr_weight_new (priv->weight); - - pango_attr_list_insert (attrs, attr); - } - - gtk_label_set_attributes (priv->label, attrs); - - label = gtk_bin_get_child (GTK_BIN (priv->button)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); - - pango_attr_list_unref (attrs); -} - -void -um_editable_button_set_weight (UmEditableButton *button, - gint weight) -{ - UmEditableButtonPrivate *priv = button->priv; - - if (priv->weight == weight && priv->weight_set) - return; - - priv->weight = weight; - priv->weight_set = TRUE; - - update_fonts (button); - - g_object_notify (G_OBJECT (button), "weight"); - g_object_notify (G_OBJECT (button), "weight-set"); -} - -gint -um_editable_button_get_weight (UmEditableButton *button) -{ - return button->priv->weight; -} - -void -um_editable_button_set_scale (UmEditableButton *button, - gdouble scale) -{ - UmEditableButtonPrivate *priv = button->priv; - - if (priv->scale == scale && priv->scale_set) - return; - - priv->scale = scale; - priv->scale_set = TRUE; - - update_fonts (button); - - g_object_notify (G_OBJECT (button), "scale"); - g_object_notify (G_OBJECT (button), "scale-set"); -} - -gdouble -um_editable_button_get_scale (UmEditableButton *button) -{ - return button->priv->scale; -} - -static void -um_editable_button_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - UmEditableButton *button = UM_EDITABLE_BUTTON (object); - - switch (prop_id) { - case PROP_TEXT: - um_editable_button_set_text (button, g_value_get_string (value)); - break; - case PROP_EDITABLE: - um_editable_button_set_editable (button, g_value_get_boolean (value)); - break; - case PROP_WEIGHT: - um_editable_button_set_weight (button, g_value_get_int (value)); - break; - case PROP_WEIGHT_SET: - button->priv->weight_set = g_value_get_boolean (value); - break; - case PROP_SCALE: - um_editable_button_set_scale (button, g_value_get_double (value)); - break; - case PROP_SCALE_SET: - button->priv->scale_set = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -um_editable_button_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - UmEditableButton *button = UM_EDITABLE_BUTTON (object); - - switch (prop_id) { - case PROP_TEXT: - g_value_set_string (value, - um_editable_button_get_text (button)); - break; - case PROP_EDITABLE: - g_value_set_boolean (value, - um_editable_button_get_editable (button)); - break; - case PROP_WEIGHT: - g_value_set_int (value, - um_editable_button_get_weight (button)); - break; - case PROP_WEIGHT_SET: - g_value_set_boolean (value, - button->priv->weight_set); - break; - case PROP_SCALE: - g_value_set_double (value, - um_editable_button_get_scale (button)); - break; - case PROP_SCALE_SET: - g_value_set_boolean (value, - button->priv->scale_set); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -um_editable_button_finalize (GObject *object) -{ - UmEditableButton *button = (UmEditableButton*)object; - - g_free (button->priv->text); - - G_OBJECT_CLASS (um_editable_button_parent_class)->finalize (object); -} - -static void um_editable_button_activate (UmEditableButton *button); - -static void -um_editable_button_class_init (UmEditableButtonClass *class) -{ - GObjectClass *object_class; - GtkWidgetClass *widget_class; - - object_class = G_OBJECT_CLASS (class); - widget_class = GTK_WIDGET_CLASS (class); - - object_class->set_property = um_editable_button_set_property; - object_class->get_property = um_editable_button_get_property; - object_class->finalize = um_editable_button_finalize; - - signals[START_EDITING] = - g_signal_new ("start-editing", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (UmEditableButtonClass, start_editing), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[ACTIVATE] = - g_signal_new ("activate", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UmEditableButtonClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - widget_class->activate_signal = signals[ACTIVATE]; - class->activate = um_editable_button_activate; - - - g_object_class_install_property (object_class, PROP_TEXT, - g_param_spec_string ("text", - "Text", "The text of the button", - NULL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_EDITABLE, - g_param_spec_boolean ("editable", - "Editable", "Whether the text can be edited", - FALSE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_WEIGHT, - g_param_spec_int ("weight", - "Font Weight", "The font weight to use", - 0, G_MAXINT, PANGO_WEIGHT_NORMAL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_WEIGHT_SET, - g_param_spec_boolean ("weight-set", - "Font Weight Set", "Whether a font weight is set", - FALSE, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_SCALE, - g_param_spec_double ("scale", - "Font Scale", "The font scale to use", - 0.0, G_MAXDOUBLE, 1.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_SCALE_SET, - g_param_spec_boolean ("scale-set", - "Font Scale Set", "Whether a font scale is set", - FALSE, - G_PARAM_READWRITE)); - - g_type_class_add_private (class, sizeof (UmEditableButtonPrivate)); -} - -static void -start_editing (UmEditableButton *button) -{ - g_signal_emit (button, signals[START_EDITING], 0); -} - -static void -um_editable_button_activate (UmEditableButton *button) -{ - UmEditableButtonPrivate *priv = button->priv; - - if (priv->editable) { - gtk_widget_grab_focus (GTK_WIDGET (button->priv->button)); - } -} - -static void -button_clicked (GtkWidget *widget, - UmEditableButton *button) -{ - start_editing (button); -} - -static void -update_button_padding (UmEditableButton *button, gpointer user_data) -{ - UmEditableButtonPrivate *priv = button->priv; - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder padding, border; - gint offset; - - context = gtk_widget_get_style_context (GTK_WIDGET (priv->button)); - state = gtk_style_context_get_state (context); - - gtk_style_context_get_padding (context, state, &padding); - gtk_style_context_get_border (context, state, &border); - - offset = padding.left + border.left; - - gtk_widget_set_margin_start (GTK_WIDGET (priv->label), offset); - gtk_widget_set_margin_end (GTK_WIDGET (priv->label), offset); -} - -static void -um_editable_button_init (UmEditableButton *button) -{ - UmEditableButtonPrivate *priv; - - priv = button->priv = UM_EDITABLE_BUTTON_GET_PRIVATE (button); - - priv->weight = PANGO_WEIGHT_NORMAL; - priv->weight_set = FALSE; - priv->scale = 1.0; - priv->scale_set = FALSE; - - priv->stack = GTK_STACK (gtk_stack_new ()); - - priv->label = (GtkLabel*)gtk_label_new (EMPTY_TEXT); - gtk_widget_set_halign (GTK_WIDGET (priv->label), GTK_ALIGN_START); - gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->label), PAGE_LABEL); - - priv->button = (GtkButton*)gtk_button_new_with_label (EMPTY_TEXT); - gtk_widget_set_receives_default ((GtkWidget*)priv->button, TRUE); - gtk_button_set_relief (priv->button, GTK_RELIEF_NONE); - gtk_widget_set_halign (GTK_WIDGET (priv->button), GTK_ALIGN_FILL); - gtk_widget_set_halign (gtk_bin_get_child (GTK_BIN (priv->button)), GTK_ALIGN_START); - gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->button), PAGE_BUTTON); - g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked), button); - - g_signal_connect (button, "style-updated", G_CALLBACK (update_button_padding), NULL); - - gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (priv->stack)); - - gtk_widget_show ((GtkWidget*)priv->stack); - gtk_widget_show ((GtkWidget*)priv->label); - gtk_widget_show ((GtkWidget*)priv->button); - - gtk_stack_set_visible_child_name (priv->stack, PAGE_LABEL); -} - -GtkWidget * -um_editable_button_new (void) -{ - return (GtkWidget *) g_object_new (UM_TYPE_EDITABLE_BUTTON, NULL); -} diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-editable-button.h gnome-control-center-3.22.1/panels/user-accounts/um-editable-button.h --- gnome-control-center-3.20.2/panels/user-accounts/um-editable-button.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-editable-button.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2009-2010 Red Hat, Inc, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Written by: Matthias Clasen - */ - -#ifndef _UM_EDITABLE_BUTTON_H -#define _UM_EDITABLE_BUTTON_H - -#include - -G_BEGIN_DECLS - -#define UM_TYPE_EDITABLE_BUTTON um_editable_button_get_type() - -#define UM_EDITABLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UM_TYPE_EDITABLE_BUTTON, UmEditableButton)) -#define UM_EDITABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_EDITABLE_BUTTON, UmEditableButtonClass)) -#define UM_IS_EDITABLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UM_TYPE_EDITABLE_BUTTON)) -#define UM_IS_EDITABLE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_EDITABLE_BUTTON)) -#define UM_EDITABLE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UM_TYPE_EDITABLE_BUTTON, UmEditableButtonClass)) - -typedef struct _UmEditableButton UmEditableButton; -typedef struct _UmEditableButtonClass UmEditableButtonClass; -typedef struct _UmEditableButtonPrivate UmEditableButtonPrivate; - -struct _UmEditableButton -{ - GtkAlignment parent; - - UmEditableButtonPrivate *priv; -}; - -struct _UmEditableButtonClass -{ - GtkAlignmentClass parent_class; - - void (* start_editing) (UmEditableButton *button); - void (* activate) (UmEditableButton *button); -}; - -GType um_editable_button_get_type (void) G_GNUC_CONST; -GtkWidget *um_editable_button_new (void); -void um_editable_button_set_text (UmEditableButton *button, - const gchar *text); -const gchar *um_editable_button_get_text (UmEditableButton *button); -void um_editable_button_set_editable (UmEditableButton *button, - gboolean editable); -gboolean um_editable_button_get_editable (UmEditableButton *button); -void um_editable_button_set_weight (UmEditableButton *button, - gint weight); -gint um_editable_button_get_weight (UmEditableButton *button); -void um_editable_button_set_scale (UmEditableButton *button, - gdouble scale); -gdouble um_editable_button_get_scale (UmEditableButton *button); - -G_END_DECLS - -#endif /* _UM_EDITABLE_BUTTON_H_ */ diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-editable-combo.c gnome-control-center-3.22.1/panels/user-accounts/um-editable-combo.c --- gnome-control-center-3.20.2/panels/user-accounts/um-editable-combo.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-editable-combo.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,452 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2009-2010 Red Hat, Inc, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Written by: Matthias Clasen - */ - -#include -#include "um-editable-combo.h" - -#define EMPTY_TEXT "\xe2\x80\x94" - -struct _UmEditableComboPrivate { - GtkStack *stack; - GtkLabel *label; - GtkButton *button; - GtkComboBox *combo; - GtkWidget *toplevel; - - gint active; - gint editable; - gint text_column; -}; - -#define UM_EDITABLE_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), UM_TYPE_EDITABLE_COMBO, UmEditableComboPrivate)) - -enum { - PROP_0, - PROP_EDITABLE, - PROP_MODEL, - PROP_TEXT_COLUMN -}; - -enum { - EDITING_DONE, - ACTIVATE, - LAST_SIGNAL -}; - -#define PAGE_LABEL "_label" -#define PAGE_BUTTON "_button" -#define PAGE_COMBO "_combo" - -static guint signals [LAST_SIGNAL] = { 0, }; - -G_DEFINE_TYPE (UmEditableCombo, um_editable_combo, GTK_TYPE_BIN); - -void -um_editable_combo_set_editable (UmEditableCombo *combo, - gboolean editable) -{ - UmEditableComboPrivate *priv; - - priv = combo->priv; - - if (priv->editable != editable) { - priv->editable = editable; - - gtk_stack_set_visible_child_name (combo->priv->stack, editable ? PAGE_BUTTON : PAGE_LABEL); - - g_object_notify (G_OBJECT (combo), "editable"); - } -} - -gboolean -um_editable_combo_get_editable (UmEditableCombo *combo) -{ - return combo->priv->editable; -} - -void -um_editable_combo_set_model (UmEditableCombo *combo, - GtkTreeModel *model) -{ - gtk_combo_box_set_model (combo->priv->combo, model); - - g_object_notify (G_OBJECT (combo), "model"); -} - -GtkTreeModel * -um_editable_combo_get_model (UmEditableCombo *combo) -{ - return gtk_combo_box_get_model (combo->priv->combo); -} - -void -um_editable_combo_set_text_column (UmEditableCombo *combo, - gint text_column) -{ - UmEditableComboPrivate *priv = combo->priv; - GList *cells; - - if (priv->text_column == text_column) - return; - - priv->text_column = text_column; - - cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->combo)); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo), - cells->data, - "text", text_column, - NULL); - g_list_free (cells); - - g_object_notify (G_OBJECT (combo), "text-column"); -} - -gint -um_editable_combo_get_text_column (UmEditableCombo *combo) -{ - return combo->priv->text_column; -} - -void -um_editable_combo_set_active (UmEditableCombo *combo, - gint active) -{ - GtkTreeModel *model; - GtkTreePath *path; - GtkTreeIter iter; - - if (active == -1) - um_editable_combo_set_active_iter (combo, NULL); - else { - model = gtk_combo_box_get_model (combo->priv->combo); - path = gtk_tree_path_new_from_indices (active, -1); - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_path_free (path); - um_editable_combo_set_active_iter (combo, &iter); - } -} - -void -um_editable_combo_set_active_iter (UmEditableCombo *combo, - GtkTreeIter *iter) -{ - UmEditableComboPrivate *priv = combo->priv; - GtkWidget *label; - gchar *text; - GtkTreeModel *model; - - gtk_combo_box_set_active_iter (priv->combo, iter); - priv->active = gtk_combo_box_get_active (priv->combo); - - if (priv->text_column == -1) - return; - - if (iter) { - model = gtk_combo_box_get_model (priv->combo); - gtk_tree_model_get (model, iter, priv->text_column, &text, -1); - } - else { - text = g_strdup (EMPTY_TEXT); - } - - gtk_label_set_text (priv->label, text); - label = gtk_bin_get_child ((GtkBin*)priv->button); - gtk_label_set_text (GTK_LABEL (label), text); - - g_free (text); -} - -gboolean -um_editable_combo_get_active_iter (UmEditableCombo *combo, - GtkTreeIter *iter) -{ - return gtk_combo_box_get_active_iter (combo->priv->combo, iter); -} - -gint -um_editable_combo_get_active (UmEditableCombo *combo) -{ - return combo->priv->active; -} - -static void -um_editable_combo_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - UmEditableCombo *combo = UM_EDITABLE_COMBO (object); - - switch (prop_id) { - case PROP_EDITABLE: - um_editable_combo_set_editable (combo, g_value_get_boolean (value)); - break; - case PROP_MODEL: - um_editable_combo_set_model (combo, g_value_get_object (value)); - break; - case PROP_TEXT_COLUMN: - um_editable_combo_set_text_column (combo, g_value_get_int (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -um_editable_combo_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - UmEditableCombo *combo = UM_EDITABLE_COMBO (object); - - switch (prop_id) { - case PROP_EDITABLE: - g_value_set_boolean (value, - um_editable_combo_get_editable (combo)); - break; - case PROP_MODEL: - g_value_set_object (value, - um_editable_combo_get_model (combo)); - break; - case PROP_TEXT_COLUMN: - g_value_set_int (value, - um_editable_combo_get_text_column (combo)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void um_editable_combo_activate (UmEditableCombo *combo); - -static void -um_editable_combo_class_init (UmEditableComboClass *class) -{ - GObjectClass *object_class; - GtkWidgetClass *widget_class; - - object_class = G_OBJECT_CLASS (class); - widget_class = GTK_WIDGET_CLASS (class); - - object_class->set_property = um_editable_combo_set_property; - object_class->get_property = um_editable_combo_get_property; - - signals[EDITING_DONE] = - g_signal_new ("editing-done", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (UmEditableComboClass, editing_done), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - signals[ACTIVATE] = - g_signal_new ("activate", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (UmEditableComboClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - widget_class->activate_signal = signals[ACTIVATE]; - class->activate = um_editable_combo_activate; - - g_object_class_install_property (object_class, PROP_MODEL, - g_param_spec_object ("model", - "Model", "The options to present in the combobox", - GTK_TYPE_TREE_MODEL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_TEXT_COLUMN, - g_param_spec_int ("text-column", - "Text Column", "The model column that contains the displayable text", - -1, G_MAXINT, -1, - G_PARAM_READWRITE)); - - - g_object_class_install_property (object_class, PROP_EDITABLE, - g_param_spec_boolean ("editable", - "Editable", "Whether the text can be edited", - FALSE, - G_PARAM_READWRITE)); - - g_type_class_add_private (class, sizeof (UmEditableComboPrivate)); -} - -static void -start_editing (UmEditableCombo *combo) -{ - gtk_stack_set_visible_child_name (combo->priv->stack, PAGE_COMBO); - gtk_widget_grab_focus (GTK_WIDGET (combo->priv->combo)); - gtk_combo_box_popup (combo->priv->combo); -} - -static gboolean -gtk_combo_box_has_focus (GtkComboBox *combo) -{ - GtkWidget *widget; - GtkWindow *window; - - window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (combo))); - widget = gtk_window_get_focus (window); - if (widget) { - return gtk_widget_is_ancestor (widget, GTK_WIDGET (combo)); - } - - return FALSE; -} - -static void -stop_editing (UmEditableCombo *combo) -{ - gboolean has_focus; - - um_editable_combo_set_active (combo, - gtk_combo_box_get_active (combo->priv->combo)); - has_focus = gtk_combo_box_has_focus (combo->priv->combo); - gtk_stack_set_visible_child_name (combo->priv->stack, PAGE_BUTTON); - if (has_focus) - gtk_widget_grab_focus (GTK_WIDGET (combo->priv->button)); - - g_signal_emit (combo, signals[EDITING_DONE], 0); -} - -static void -cancel_editing (UmEditableCombo *combo) -{ - gboolean has_focus; - - gtk_combo_box_set_active (combo->priv->combo, - um_editable_combo_get_active (combo)); - has_focus = gtk_combo_box_has_focus (combo->priv->combo); - gtk_stack_set_visible_child_name (combo->priv->stack, PAGE_BUTTON); - if (has_focus) - gtk_widget_grab_focus (GTK_WIDGET (combo->priv->button)); -} - -static void -um_editable_combo_activate (UmEditableCombo *combo) -{ - if (combo->priv->editable) { - gtk_stack_set_visible_child_name (combo->priv->stack, PAGE_COMBO); - gtk_widget_grab_focus (GTK_WIDGET (combo->priv->combo)); - } -} - -static void -button_clicked (GtkWidget *widget, - UmEditableCombo *combo) -{ - if (combo->priv->editable) - start_editing (combo); -} - -static void -combo_changed (GtkWidget *widget, - UmEditableCombo *combo) -{ - if (combo->priv->editable) - stop_editing (combo); -} - -static void -popup_shown (GtkWidget *widget, - GParamSpec *pspec, - UmEditableCombo *combo) -{ - gboolean is_shown; - - g_object_get (G_OBJECT (combo->priv->combo), "popup-shown", &is_shown, NULL); - if (!is_shown) - cancel_editing (combo); -} - -static void -update_button_padding (UmEditableCombo *combo, gpointer user_data) -{ - UmEditableComboPrivate *priv = combo->priv; - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder padding, border; - gint offset; - - context = gtk_widget_get_style_context (GTK_WIDGET (priv->button)); - state = gtk_style_context_get_state (context); - - gtk_style_context_get_padding (context, state, &padding); - gtk_style_context_get_border (context, state, &border); - - offset = padding.left + border.left; - - gtk_widget_set_margin_start (GTK_WIDGET (priv->label), offset); - gtk_widget_set_margin_end (GTK_WIDGET (priv->label), offset); -} - -static void -um_editable_combo_init (UmEditableCombo *combo) -{ - UmEditableComboPrivate *priv; - GtkCellRenderer *cell; - - priv = combo->priv = UM_EDITABLE_COMBO_GET_PRIVATE (combo); - - priv->active = -1; - priv->text_column = -1; - priv->stack = GTK_STACK (gtk_stack_new ()); - - priv->label = (GtkLabel*)gtk_label_new (""); - gtk_widget_set_halign (GTK_WIDGET (priv->label), GTK_ALIGN_START); - gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->label), PAGE_LABEL); - - priv->button = (GtkButton*)gtk_button_new_with_label (""); - gtk_widget_set_receives_default ((GtkWidget*)priv->button, TRUE); - gtk_button_set_relief (priv->button, GTK_RELIEF_NONE); - gtk_widget_set_halign (GTK_WIDGET (priv->button), GTK_ALIGN_FILL); - gtk_widget_set_halign (gtk_bin_get_child (GTK_BIN (priv->button)), GTK_ALIGN_START); - gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->button), PAGE_BUTTON); - g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked), combo); - - priv->combo = (GtkComboBox*)gtk_combo_box_new (); - cell = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->combo), cell, TRUE); - gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->combo), PAGE_COMBO); - - g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed), combo); - g_signal_connect (priv->combo, "notify::popup-shown", G_CALLBACK (popup_shown), combo); - - g_signal_connect (combo, "style-updated", G_CALLBACK (update_button_padding), NULL); - - gtk_container_add (GTK_CONTAINER (combo), GTK_WIDGET (priv->stack)); - - gtk_widget_show ((GtkWidget*)priv->stack); - gtk_widget_show ((GtkWidget*)priv->label); - gtk_widget_show ((GtkWidget*)priv->button); - gtk_widget_show ((GtkWidget*)priv->combo); - - gtk_stack_set_visible_child_name (priv->stack, PAGE_LABEL); -} - -GtkWidget * -um_editable_combo_new (void) -{ - return (GtkWidget *) g_object_new (UM_TYPE_EDITABLE_COMBO, NULL); -} diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-editable-combo.h gnome-control-center-3.22.1/panels/user-accounts/um-editable-combo.h --- gnome-control-center-3.20.2/panels/user-accounts/um-editable-combo.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-editable-combo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright 2009-2010 Red Hat, Inc, - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - * - * Written by: Matthias Clasen - */ - -#ifndef _UM_EDITABLE_COMBO_H -#define _UM_EDITABLE_COMBO_H - -#include - -G_BEGIN_DECLS - -#define UM_TYPE_EDITABLE_COMBO um_editable_combo_get_type() - -#define UM_EDITABLE_COMBO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UM_TYPE_EDITABLE_COMBO, UmEditableCombo)) -#define UM_EDITABLE_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_EDITABLE_COMBO, UmEditableComboClass)) -#define UM_IS_EDITABLE_COMBO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UM_TYPE_EDITABLE_COMBO)) -#define UM_IS_EDITABLE_COMBO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UM_TYPE_EDITABLE_COMBO)) -#define UM_EDITABLE_COMBO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UM_TYPE_EDITABLE_COMBO, UmEditableComboClass)) - -typedef struct _UmEditableCombo UmEditableCombo; -typedef struct _UmEditableComboClass UmEditableComboClass; -typedef struct _UmEditableComboPrivate UmEditableComboPrivate; - -struct _UmEditableCombo -{ - GtkAlignment parent; - - UmEditableComboPrivate *priv; -}; - -struct _UmEditableComboClass -{ - GtkAlignmentClass parent_class; - - void (* editing_done) (UmEditableCombo *combo); - void (* activate) (UmEditableCombo *combo); -}; - -GType um_editable_combo_get_type (void) G_GNUC_CONST; -GtkWidget *um_editable_combo_new (void); -void um_editable_combo_set_editable (UmEditableCombo *combo, - gboolean editable); -gboolean um_editable_combo_get_editable (UmEditableCombo *combo); -void um_editable_combo_set_model (UmEditableCombo *combo, - GtkTreeModel *model); -GtkTreeModel *um_editable_combo_get_model (UmEditableCombo *combo); -void um_editable_combo_set_text_column (UmEditableCombo *combo, - gint column); -gint um_editable_combo_get_text_column (UmEditableCombo *combo); -gint um_editable_combo_get_active (UmEditableCombo *combo); -void um_editable_combo_set_active (UmEditableCombo *combo, - gint active); -gboolean um_editable_combo_get_active_iter (UmEditableCombo *combo, - GtkTreeIter *iter); -void um_editable_combo_set_active_iter (UmEditableCombo *combo, - GtkTreeIter *iter); - -G_END_DECLS - -#endif /* _UM_EDITABLE_COMBO_H_ */ diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-fingerprint-dialog.c gnome-control-center-3.22.1/panels/user-accounts/um-fingerprint-dialog.c --- gnome-control-center-3.20.2/panels/user-accounts/um-fingerprint-dialog.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-fingerprint-dialog.c 2016-10-10 16:16:39.000000000 +0000 @@ -22,8 +22,6 @@ #include #include -#include "um-editable-button.h" - #include "um-fingerprint-dialog.h" #include "fingerprint-strings.h" @@ -178,7 +176,7 @@ } gboolean -set_fingerprint_label (GtkWidget *editable_button) +set_fingerprint_label (GtkWidget *button) { GDBusProxy *device; GVariant *result; @@ -212,11 +210,12 @@ if (fingers == NULL || g_variant_iter_n_children (fingers) == 0) { is_disable = FALSE; - um_editable_button_set_text (UM_EDITABLE_BUTTON (editable_button), _("Disabled")); + gtk_button_set_label (GTK_BUTTON (button), _("Disabled")); } else { is_disable = TRUE; - um_editable_button_set_text (UM_EDITABLE_BUTTON (editable_button), _("Enabled")); + gtk_button_set_label (GTK_BUTTON (button), _("Enabled")); } + gtk_widget_set_halign (gtk_bin_get_child (GTK_BIN (button)), GTK_ALIGN_START); if (result != NULL) g_variant_unref (result); diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-history-dialog.c gnome-control-center-3.22.1/panels/user-accounts/um-history-dialog.c --- gnome-control-center-3.20.2/panels/user-accounts/um-history-dialog.c 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-history-dialog.c 2016-10-10 16:16:39.000000000 +0000 @@ -183,6 +183,10 @@ gtk_box_set_homogeneous (GTK_BOX (row), TRUE); gtk_container_set_border_width (GTK_CONTAINER (row), 6); + label = gtk_label_new (record_string); + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0); + label = gtk_label_new (str); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0); @@ -191,10 +195,6 @@ g_free (time); g_date_time_unref (datetime); - label = gtk_label_new (record_string); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0); - gtk_list_box_insert (GTK_LIST_BOX (box), row, line); } @@ -289,6 +289,21 @@ show_week (um); } +static void +update_dialog_title (UmHistoryDialog *um) +{ + gchar *title; + + /* Translators: This is the title of the "Account Activity" dialog. + The %s is the user real name. */ + title = g_strdup_printf (_("%s - Account Activity"), + act_user_get_real_name (um->user)); + + gtk_window_set_title (GTK_WINDOW (um->dialog), title); + + g_free (title); +} + void um_history_dialog_set_user (UmHistoryDialog *um, ActUser *user) @@ -300,6 +315,8 @@ if (user) { um->user = g_object_ref (user); } + + update_dialog_title (um); } void @@ -307,6 +324,7 @@ GtkWindow *parent) { GDateTime *temp, *local; + gint parent_width; if (um->week) g_date_time_unref (um->week); @@ -326,6 +344,8 @@ show_week (um); + gtk_window_get_size (parent, &parent_width, NULL); + gtk_window_set_default_size (GTK_WINDOW (um->dialog), parent_width * 0.6, -1); gtk_window_set_transient_for (GTK_WINDOW (um->dialog), parent); gtk_window_present (GTK_WINDOW (um->dialog)); } diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-resources.c gnome-control-center-3.22.1/panels/user-accounts/um-resources.c --- gnome-control-center-3.20.2/panels/user-accounts/um-resources.c 2016-10-11 14:27:18.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-resources.c 2016-10-11 12:14:48.000000000 +0000 @@ -6,556 +6,96 @@ # define SECTION #endif -static const SECTION union { const guint8 data[87148]; const double alignment; void * const ptr;} um_resource_data = { { +static const SECTION union { const guint8 data[90156]; const double alignment; void * const ptr;} um_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x16, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x0b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x17, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x0e, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, - 0x13, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0x62, 0xf4, 0x40, 0xf5, 0x11, 0x00, 0x00, 0x00, - 0x88, 0x02, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, - 0x98, 0x02, 0x00, 0x00, 0x05, 0x11, 0x00, 0x00, - 0xca, 0xb8, 0x7e, 0x83, 0x11, 0x00, 0x00, 0x00, - 0x05, 0x11, 0x00, 0x00, 0x16, 0x00, 0x76, 0x00, - 0x20, 0x11, 0x00, 0x00, 0x0c, 0x17, 0x00, 0x00, - 0xb0, 0xb7, 0x24, 0x30, 0x05, 0x00, 0x00, 0x00, - 0x0c, 0x17, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0x14, 0x17, 0x00, 0x00, 0x18, 0x17, 0x00, 0x00, - 0xd7, 0xe0, 0x64, 0x7d, 0x11, 0x00, 0x00, 0x00, - 0x18, 0x17, 0x00, 0x00, 0x16, 0x00, 0x76, 0x00, - 0x30, 0x17, 0x00, 0x00, 0xd3, 0x34, 0x00, 0x00, - 0xab, 0x24, 0xde, 0x2d, 0x11, 0x00, 0x00, 0x00, - 0xd3, 0x34, 0x00, 0x00, 0x16, 0x00, 0x76, 0x00, - 0xf0, 0x34, 0x00, 0x00, 0xcb, 0x3a, 0x00, 0x00, - 0x4b, 0x50, 0x90, 0x0b, 0x0e, 0x00, 0x00, 0x00, - 0xcb, 0x3a, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0xd0, 0x3a, 0x00, 0x00, 0xd4, 0x3a, 0x00, 0x00, - 0xb4, 0xb1, 0xe2, 0x6e, 0x11, 0x00, 0x00, 0x00, - 0xd4, 0x3a, 0x00, 0x00, 0x0e, 0x00, 0x76, 0x00, - 0xe8, 0x3a, 0x00, 0x00, 0xe0, 0x40, 0x00, 0x00, - 0x2c, 0x4b, 0x34, 0x62, 0x11, 0x00, 0x00, 0x00, - 0xe0, 0x40, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, - 0xf8, 0x40, 0x00, 0x00, 0xf0, 0x46, 0x00, 0x00, - 0xe7, 0x1d, 0xf2, 0xcc, 0x11, 0x00, 0x00, 0x00, - 0xf0, 0x46, 0x00, 0x00, 0x16, 0x00, 0x76, 0x00, - 0x08, 0x47, 0x00, 0x00, 0xfa, 0x4c, 0x00, 0x00, - 0xbd, 0x4d, 0xa2, 0x82, 0x11, 0x00, 0x00, 0x00, - 0xfa, 0x4c, 0x00, 0x00, 0x17, 0x00, 0x76, 0x00, - 0x18, 0x4d, 0x00, 0x00, 0xef, 0x52, 0x00, 0x00, - 0xa5, 0xdb, 0xee, 0x7c, 0x11, 0x00, 0x00, 0x00, - 0xef, 0x52, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, - 0x08, 0x53, 0x00, 0x00, 0x14, 0x75, 0x00, 0x00, - 0xa7, 0x03, 0x26, 0xe9, 0x11, 0x00, 0x00, 0x00, - 0x14, 0x75, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0x28, 0x75, 0x00, 0x00, 0x06, 0x7b, 0x00, 0x00, - 0x54, 0xdb, 0x36, 0xc5, 0x11, 0x00, 0x00, 0x00, - 0x06, 0x7b, 0x00, 0x00, 0x15, 0x00, 0x76, 0x00, - 0x20, 0x7b, 0x00, 0x00, 0x1b, 0x81, 0x00, 0x00, - 0x9e, 0xb9, 0x01, 0x2d, 0x11, 0x00, 0x00, 0x00, - 0x1b, 0x81, 0x00, 0x00, 0x17, 0x00, 0x76, 0x00, - 0x38, 0x81, 0x00, 0x00, 0x04, 0x87, 0x00, 0x00, - 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0x04, 0x87, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0x08, 0x87, 0x00, 0x00, 0x0c, 0x87, 0x00, 0x00, - 0x1e, 0xbf, 0xf2, 0x01, 0x11, 0x00, 0x00, 0x00, - 0x0c, 0x87, 0x00, 0x00, 0x17, 0x00, 0x76, 0x00, - 0x28, 0x87, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, - 0x52, 0x9f, 0x80, 0xcc, 0x11, 0x00, 0x00, 0x00, - 0xc0, 0xc0, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0xd0, 0xc0, 0x00, 0x00, 0x20, 0xd1, 0x00, 0x00, - 0xc9, 0xd6, 0xd8, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x20, 0xd1, 0x00, 0x00, 0x0e, 0x00, 0x4c, 0x00, - 0x30, 0xd1, 0x00, 0x00, 0x74, 0xd1, 0x00, 0x00, - 0x5f, 0x07, 0x78, 0x81, 0x11, 0x00, 0x00, 0x00, - 0x74, 0xd1, 0x00, 0x00, 0x15, 0x00, 0x76, 0x00, - 0x90, 0xd1, 0x00, 0x00, 0x82, 0xd7, 0x00, 0x00, - 0xce, 0xd7, 0x2c, 0x8d, 0x02, 0x00, 0x00, 0x00, - 0x82, 0xd7, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, - 0x94, 0xd7, 0x00, 0x00, 0x98, 0xd7, 0x00, 0x00, - 0xc4, 0x94, 0xef, 0xa3, 0x11, 0x00, 0x00, 0x00, - 0x98, 0xd7, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0xb0, 0xd7, 0x00, 0x00, 0x8d, 0xe4, 0x00, 0x00, - 0x7f, 0xc0, 0xa0, 0x77, 0x11, 0x00, 0x00, 0x00, - 0x8d, 0xe4, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0xa0, 0xe4, 0x00, 0x00, 0x6c, 0x54, 0x01, 0x00, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, 0x6f, 0x6b, - 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, - 0x5d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, - 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, - 0x65, 0x00, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x61, - 0x64, 0x79, 0x71, 0xc9, 0x65, 0x3c, 0x00, 0x00, - 0x0d, 0xff, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, - 0xc4, 0x5a, 0x07, 0x98, 0x14, 0xe5, 0x19, 0xfe, - 0x66, 0x66, 0xeb, 0xdd, 0xde, 0xdd, 0xee, 0x95, - 0xbd, 0x02, 0x87, 0x48, 0x47, 0x90, 0x22, 0x0a, - 0x82, 0x15, 0x11, 0xd4, 0x88, 0x8a, 0x05, 0x43, - 0x14, 0xb9, 0x28, 0x46, 0xf4, 0xd1, 0x08, 0x76, - 0xb1, 0x44, 0x44, 0x43, 0x7c, 0x54, 0x90, 0xa8, - 0xd1, 0x20, 0x51, 0x01, 0x31, 0x82, 0x1a, 0x02, - 0x22, 0xe6, 0x09, 0x22, 0x4a, 0x91, 0x62, 0x38, - 0xaa, 0xf4, 0x7a, 0x85, 0xeb, 0x65, 0xef, 0xf6, - 0xb6, 0x4f, 0xc9, 0xf7, 0xcf, 0xbd, 0x7b, 0x2e, - 0x27, 0x20, 0x1e, 0x98, 0xac, 0xcf, 0xcb, 0x78, - 0x3b, 0x33, 0xff, 0x7c, 0xe5, 0xfd, 0xda, 0x3f, - 0x2b, 0x19, 0x86, 0x41, 0x6d, 0xf9, 0xcc, 0x9b, - 0x37, 0xcf, 0xc9, 0x87, 0xb3, 0x18, 0xd9, 0x0c, - 0x2f, 0x23, 0x93, 0x51, 0xcf, 0x38, 0x1a, 0xc7, - 0xb8, 0x71, 0xe3, 0x22, 0xf4, 0x0b, 0x7f, 0xa4, - 0x9f, 0xa3, 0x00, 0x0b, 0x2d, 0x04, 0x1e, 0xc9, - 0xb8, 0x96, 0x31, 0x94, 0xe1, 0xc0, 0xa9, 0x00, - 0xc3, 0x07, 0x88, 0x05, 0xbb, 0xe0, 0xdc, 0x77, - 0x8c, 0xbf, 0x31, 0x16, 0xb0, 0x32, 0xfe, 0xff, - 0x9b, 0x02, 0x2c, 0x78, 0x07, 0x3e, 0xfc, 0x05, - 0x82, 0x4b, 0xf8, 0xba, 0x88, 0x31, 0x93, 0x51, - 0xc6, 0xe8, 0xc9, 0xe8, 0xcf, 0x90, 0x19, 0x85, - 0x8c, 0xcf, 0x19, 0xd7, 0x30, 0x5c, 0x8c, 0x2b, - 0x19, 0x3d, 0x18, 0x1f, 0x33, 0xa6, 0xb0, 0x22, - 0xc5, 0xff, 0x33, 0x05, 0x58, 0x70, 0x85, 0x0f, - 0x0f, 0xc2, 0xda, 0xff, 0x62, 0xdc, 0xc1, 0x18, - 0xcc, 0xf8, 0x90, 0xb1, 0x8c, 0x31, 0x8d, 0xd1, - 0x91, 0xb1, 0x8f, 0xf1, 0x0d, 0x43, 0x5c, 0x9f, - 0xcc, 0x28, 0x65, 0xcc, 0x60, 0xbc, 0xce, 0x68, - 0xc2, 0xbd, 0xbd, 0x19, 0xbf, 0x62, 0x3c, 0xc0, - 0x4a, 0x6c, 0x38, 0x53, 0x0a, 0xc8, 0x27, 0x11, - 0x5e, 0x50, 0xe0, 0x6b, 0x46, 0x2a, 0xe3, 0x4d, - 0xc6, 0x08, 0x08, 0xff, 0x2e, 0x04, 0xfe, 0x3b, - 0x04, 0x1d, 0x0d, 0x9a, 0x08, 0x2f, 0x5d, 0x01, - 0x85, 0x3a, 0x33, 0xee, 0x66, 0xfc, 0x01, 0x6b, - 0xcc, 0x66, 0xe4, 0xe1, 0xfe, 0x8e, 0xbc, 0x76, - 0x97, 0x5f, 0x5c, 0x01, 0xfe, 0xcc, 0x82, 0x90, - 0x7d, 0x41, 0x83, 0x51, 0x8c, 0x2f, 0xc1, 0xf3, - 0x29, 0x8c, 0xe7, 0x19, 0xff, 0x66, 0x7c, 0x04, - 0x2f, 0xd5, 0x32, 0xde, 0x02, 0x7d, 0x84, 0x5b, - 0xef, 0x64, 0xec, 0x62, 0x4c, 0x60, 0xdc, 0x06, - 0x9a, 0x2d, 0x01, 0xc5, 0xd6, 0xb2, 0x12, 0x43, - 0x7e, 0x31, 0x0a, 0xf1, 0xe2, 0x8f, 0xf0, 0x21, - 0x9f, 0x31, 0x8c, 0xf1, 0x1e, 0x84, 0x15, 0x5c, - 0x7f, 0x1b, 0xbc, 0xff, 0x33, 0xe3, 0x1c, 0xc6, - 0x70, 0x04, 0xf0, 0x26, 0x64, 0xa2, 0x1c, 0x46, - 0x39, 0x63, 0x07, 0x63, 0x23, 0xe3, 0x5b, 0xd0, - 0x48, 0xc4, 0xc7, 0xed, 0x8c, 0x71, 0xa0, 0xd9, - 0x06, 0x28, 0xd8, 0x8f, 0xe9, 0xd4, 0x78, 0x46, - 0x3d, 0xc0, 0xc2, 0x0b, 0x1a, 0xfc, 0x96, 0x11, - 0x62, 0x04, 0xa1, 0x48, 0x0a, 0xe3, 0x1d, 0xc6, - 0x9f, 0x18, 0x8b, 0xf1, 0xdd, 0x70, 0xdc, 0x72, - 0x18, 0x01, 0xfa, 0x28, 0xa8, 0xf6, 0x11, 0xe2, - 0xe3, 0x36, 0x58, 0x5c, 0xd0, 0x67, 0x85, 0x58, - 0x1a, 0x54, 0xbb, 0x94, 0x71, 0x84, 0x61, 0x67, - 0x4c, 0x3e, 0xe3, 0x1e, 0x60, 0x05, 0xd6, 0x82, - 0xe7, 0x7f, 0x65, 0xdc, 0xc2, 0x78, 0x01, 0x94, - 0xd8, 0x82, 0x60, 0x7e, 0x17, 0xdf, 0x09, 0xab, - 0x3f, 0xcb, 0x18, 0x00, 0x7a, 0x0d, 0x68, 0x95, - 0xa1, 0x84, 0x70, 0x59, 0x08, 0xe6, 0xf1, 0x8c, - 0x27, 0xa1, 0xec, 0x57, 0xa0, 0xdc, 0x7b, 0x58, - 0x7f, 0x20, 0x7b, 0x21, 0x74, 0x46, 0x3c, 0xc0, - 0xc2, 0xf7, 0xe3, 0x83, 0xce, 0xb8, 0x09, 0xc5, - 0x68, 0x15, 0xb2, 0xc7, 0x62, 0x50, 0xe0, 0x23, - 0x08, 0xdd, 0x88, 0x20, 0x7d, 0x86, 0xf1, 0x22, - 0xa3, 0x13, 0xac, 0x2e, 0xa8, 0x37, 0x91, 0x51, - 0xc7, 0x98, 0xcf, 0xa8, 0x61, 0xbc, 0x04, 0x1a, - 0xbd, 0x82, 0xd4, 0x5a, 0x88, 0x80, 0xae, 0x05, - 0x0d, 0x6f, 0xe2, 0xe7, 0x9e, 0x7b, 0xa6, 0x28, - 0x74, 0x15, 0xe3, 0x7d, 0xd0, 0xe3, 0x9f, 0x8c, - 0x5e, 0xe0, 0xac, 0xe0, 0xb9, 0x8d, 0xe1, 0xc1, - 0xf1, 0x05, 0x58, 0xf0, 0x22, 0xdc, 0x77, 0x10, - 0xd6, 0x17, 0xb1, 0x32, 0x1d, 0xc1, 0x2e, 0xe8, - 0x33, 0x17, 0x81, 0x2e, 0x2c, 0xaf, 0x32, 0x36, - 0x33, 0x0a, 0x18, 0xeb, 0x50, 0xc5, 0x3f, 0x07, - 0x55, 0x27, 0x9f, 0x29, 0x05, 0xfc, 0xb0, 0x6e, - 0x8c, 0x71, 0x00, 0xc1, 0x27, 0x3e, 0x51, 0x1c, - 0xaf, 0x85, 0x37, 0xda, 0x31, 0xce, 0x83, 0xa5, - 0xfb, 0x23, 0x95, 0x3e, 0x87, 0xf4, 0x29, 0x02, - 0xf7, 0x71, 0xc6, 0x56, 0x46, 0x15, 0xe3, 0x31, - 0xc4, 0x81, 0xa8, 0x01, 0x2b, 0x19, 0xc2, 0xda, - 0xcb, 0xa1, 0xbc, 0xf0, 0xe0, 0x6a, 0x71, 0x3f, - 0x7b, 0xa1, 0xeb, 0x69, 0x29, 0xc0, 0x0b, 0x08, - 0xcb, 0xae, 0x85, 0xf5, 0xe3, 0x42, 0xe6, 0xe0, - 0xb4, 0x1d, 0x47, 0x11, 0xbc, 0x4f, 0x23, 0xc8, - 0x05, 0xd5, 0x6e, 0x46, 0xae, 0x3f, 0x8c, 0x98, - 0xd8, 0x8c, 0xb4, 0x59, 0xc1, 0xb8, 0x87, 0xf1, - 0x1a, 0x5a, 0x8f, 0x2d, 0xc8, 0x68, 0xbb, 0x51, - 0x2f, 0x8a, 0x10, 0x33, 0xa2, 0x9e, 0x58, 0xe1, - 0xc1, 0x91, 0xa7, 0xeb, 0x81, 0x1b, 0x19, 0x7d, - 0x40, 0xa3, 0x12, 0xd0, 0xc7, 0x82, 0x73, 0x3e, - 0x1c, 0x0f, 0x31, 0x2e, 0x64, 0xb8, 0x19, 0x9f, - 0x32, 0x2e, 0xc3, 0x7d, 0x5b, 0x51, 0x9d, 0xb3, - 0x91, 0x8d, 0x66, 0xc1, 0x00, 0xe5, 0xa0, 0x96, - 0x68, 0x25, 0xf6, 0x42, 0xd1, 0x2c, 0x54, 0x67, - 0x61, 0xb0, 0x5c, 0xc6, 0x54, 0x28, 0xde, 0xf7, - 0x74, 0x15, 0x88, 0xe7, 0xe8, 0xb3, 0xe0, 0xfa, - 0x9e, 0x09, 0x0a, 0x54, 0xe1, 0x28, 0xaa, 0xea, - 0x20, 0xfc, 0xff, 0xcb, 0xa0, 0x8e, 0x0f, 0x41, - 0xbf, 0x94, 0xf1, 0x19, 0x38, 0xbe, 0x3c, 0xa1, - 0xc9, 0xab, 0x86, 0x31, 0x56, 0x42, 0xe0, 0x38, - 0x4d, 0xe3, 0xcf, 0xbf, 0x0e, 0x75, 0xa3, 0xcf, - 0xe9, 0x2a, 0x70, 0x0e, 0xb2, 0x83, 0x84, 0x07, - 0x7b, 0x12, 0xce, 0x97, 0xe3, 0xb8, 0x0a, 0x96, - 0xad, 0x83, 0x10, 0xbd, 0xd0, 0xe7, 0x5c, 0x80, - 0xc0, 0xde, 0x09, 0x4a, 0xa8, 0xb8, 0xde, 0x89, - 0x6b, 0x3b, 0x20, 0xb8, 0x85, 0x77, 0xd6, 0xa0, - 0xae, 0xc4, 0x9f, 0xef, 0x01, 0xe5, 0xce, 0x61, - 0x1a, 0x5b, 0xda, 0xa4, 0x00, 0x6e, 0xcc, 0x87, - 0x6b, 0xc5, 0x47, 0xc3, 0x39, 0x39, 0x41, 0x90, - 0xb8, 0x22, 0xed, 0x50, 0x49, 0x87, 0xe1, 0xbb, - 0x25, 0x48, 0x8f, 0x01, 0x58, 0x98, 0x40, 0x0f, - 0xf1, 0x11, 0xf3, 0x40, 0x18, 0x05, 0xb1, 0x1f, - 0x02, 0x5e, 0xd4, 0x81, 0x0c, 0x9c, 0x77, 0xe1, - 0xda, 0x3c, 0x28, 0x6e, 0x6d, 0xab, 0x07, 0xf2, - 0x41, 0x9f, 0x43, 0x27, 0x50, 0x20, 0x2d, 0x21, - 0x1b, 0xb5, 0x43, 0xd0, 0x75, 0x87, 0x80, 0x22, - 0xf0, 0x6f, 0x45, 0xb5, 0xcd, 0x43, 0xd1, 0xcb, - 0xc4, 0xf5, 0x7b, 0x50, 0x23, 0x84, 0x61, 0xee, - 0x47, 0x5d, 0x48, 0x43, 0xdb, 0x41, 0x09, 0x8a, - 0x88, 0xeb, 0x8b, 0xda, 0x52, 0xd0, 0xe2, 0x02, - 0x76, 0xc4, 0xb1, 0x09, 0x9c, 0x56, 0x61, 0x99, - 0xf8, 0x10, 0xe2, 0x8e, 0x57, 0x6e, 0x3c, 0xac, - 0x0a, 0x0a, 0xac, 0x40, 0xca, 0x4c, 0x86, 0x22, - 0x43, 0x91, 0x61, 0xba, 0x23, 0x15, 0x47, 0x40, - 0x97, 0x1d, 0xc8, 0x32, 0xa2, 0xd5, 0x18, 0x98, - 0xb0, 0x5e, 0xdc, 0x30, 0xa2, 0x59, 0xdc, 0x8e, - 0x81, 0xe9, 0x67, 0x7d, 0xe2, 0x9c, 0x3b, 0x1b, - 0x47, 0xe1, 0x62, 0x31, 0x70, 0xa4, 0xc3, 0xbd, - 0x91, 0x56, 0x0f, 0x72, 0x43, 0x09, 0x1f, 0xae, - 0xd5, 0x51, 0x1b, 0x44, 0x9e, 0x1f, 0x0b, 0xaa, - 0xcd, 0x02, 0xbd, 0x84, 0xf5, 0x7f, 0x03, 0x6f, - 0xee, 0xc7, 0x39, 0xa1, 0xe4, 0x95, 0x31, 0x23, - 0xec, 0x2d, 0x8b, 0xee, 0x28, 0xdf, 0x1f, 0xfe, - 0xfa, 0x21, 0x9b, 0x94, 0x44, 0x41, 0xdd, 0xd7, - 0x3b, 0xac, 0x37, 0x66, 0x58, 0x25, 0xfb, 0xe7, - 0x1f, 0x4c, 0x2f, 0xf8, 0x12, 0x85, 0x70, 0xe5, - 0x97, 0x8f, 0x18, 0x91, 0x53, 0x55, 0x20, 0xce, - 0xbd, 0x21, 0xa8, 0x92, 0xb1, 0x04, 0x0e, 0x0b, - 0x21, 0x93, 0x5a, 0xc5, 0xc2, 0xf0, 0x84, 0x1a, - 0x31, 0x0f, 0x0f, 0xfc, 0x18, 0x71, 0xb0, 0x11, - 0x4d, 0x9f, 0xa8, 0x0f, 0xbf, 0x47, 0xa1, 0x12, - 0x06, 0xda, 0x16, 0x33, 0x42, 0xe7, 0x6e, 0xf0, - 0xcf, 0x71, 0x95, 0x44, 0x0b, 0x0b, 0x34, 0x23, - 0x26, 0xcb, 0x92, 0x92, 0x9b, 0xe2, 0xf0, 0x50, - 0x4a, 0xb2, 0x87, 0x64, 0xcd, 0x91, 0xdb, 0x18, - 0xac, 0xcd, 0x41, 0xeb, 0xf2, 0x90, 0x58, 0x6b, - 0xf8, 0x74, 0x49, 0xd4, 0x91, 0xa9, 0xac, 0x48, - 0xec, 0xa7, 0x14, 0xf0, 0x23, 0x13, 0x0c, 0x06, - 0x9f, 0x2f, 0x44, 0xaf, 0x22, 0x86, 0x99, 0x6d, - 0x50, 0xc0, 0x80, 0x80, 0xf1, 0x8a, 0x5c, 0x85, - 0x4a, 0x2a, 0x32, 0xd1, 0x42, 0x04, 0xf8, 0x04, - 0x08, 0x1f, 0x82, 0xe5, 0xbd, 0xc8, 0x4e, 0x63, - 0x8b, 0x23, 0x9b, 0xd6, 0x14, 0x06, 0x16, 0xbc, - 0x18, 0x93, 0x9b, 0x92, 0xbb, 0xe6, 0xf6, 0x23, - 0xb7, 0x2b, 0x83, 0x5c, 0xce, 0x66, 0xc7, 0x6a, - 0x7a, 0xb3, 0x7c, 0xba, 0xa1, 0x4b, 0x31, 0x35, - 0x42, 0xac, 0x08, 0xd5, 0xf8, 0x2b, 0x93, 0x2b, - 0xeb, 0x8b, 0x9f, 0x31, 0xc8, 0x18, 0xc9, 0x8a, - 0x8c, 0x65, 0x25, 0x76, 0x9e, 0x4c, 0x81, 0x46, - 0xa4, 0xc8, 0x5f, 0xc3, 0xdd, 0x77, 0xa3, 0x87, - 0xb9, 0x02, 0x16, 0xcc, 0xc2, 0xf4, 0x15, 0x4f, - 0x7f, 0x65, 0xa8, 0xc6, 0xaf, 0x21, 0x7f, 0x8b, - 0x6b, 0x1e, 0x46, 0xef, 0xd3, 0x0b, 0x71, 0x21, - 0x2a, 0xb1, 0xa1, 0x1a, 0xd1, 0x92, 0x3d, 0xa1, - 0xe5, 0x97, 0x6d, 0x09, 0x7c, 0x7a, 0x51, 0x4e, - 0x6a, 0x07, 0x4b, 0xcf, 0xfc, 0xcb, 0xc9, 0x6a, - 0xb5, 0x90, 0xdd, 0x92, 0xc4, 0x70, 0x91, 0x2c, - 0xc9, 0x64, 0x55, 0xec, 0x6c, 0x1d, 0x9d, 0x34, - 0x4d, 0x25, 0x95, 0x8d, 0x9d, 0x64, 0x77, 0x53, - 0x6a, 0x72, 0x26, 0x79, 0x5c, 0x99, 0x74, 0xb0, - 0x7c, 0x67, 0xdf, 0xa8, 0x1a, 0xde, 0xcc, 0x4a, - 0x3c, 0x25, 0x9e, 0xc7, 0x8a, 0xe8, 0x27, 0x52, - 0xe0, 0x00, 0xb2, 0x4c, 0x1f, 0x94, 0xf9, 0x37, - 0x30, 0x03, 0xcc, 0x40, 0xfe, 0x16, 0xe7, 0xbb, - 0xc1, 0x33, 0x62, 0x36, 0x9e, 0x83, 0xe0, 0x7f, - 0x0d, 0x34, 0x5a, 0x8c, 0x22, 0x38, 0x07, 0xb1, - 0x22, 0xc6, 0xc6, 0xb9, 0x1b, 0xfc, 0xef, 0xbd, - 0x53, 0x12, 0xdb, 0x44, 0xbd, 0xdb, 0x0f, 0x51, - 0xda, 0x67, 0x76, 0xa2, 0x64, 0x47, 0x1a, 0x0b, - 0xad, 0x50, 0x73, 0x1b, 0xcf, 0x62, 0x1b, 0x1a, - 0x45, 0xd4, 0xe0, 0x0f, 0xfd, 0x3d, 0xff, 0xe7, - 0x76, 0x66, 0x51, 0x7a, 0x52, 0x2e, 0xa5, 0x39, - 0xbd, 0x64, 0xb3, 0x3a, 0xa5, 0x92, 0xaa, 0xfd, - 0xd6, 0xba, 0xa6, 0xca, 0x57, 0xf9, 0x74, 0x7b, - 0xd0, 0xeb, 0xb8, 0x14, 0x4a, 0x45, 0xd1, 0xc9, - 0x43, 0x15, 0x8e, 0xa7, 0xd2, 0x5d, 0xc8, 0x1c, - 0xb3, 0x91, 0x65, 0x66, 0x80, 0x3a, 0x59, 0x08, - 0x52, 0x27, 0x1a, 0xb8, 0xf8, 0x80, 0xa2, 0xa1, - 0x4a, 0x57, 0xec, 0x0f, 0x7f, 0xa3, 0x1c, 0x89, - 0x6c, 0xf0, 0x5e, 0xd0, 0x79, 0x04, 0x5b, 0x34, - 0x4d, 0xc8, 0x46, 0xc1, 0xe8, 0xa9, 0xef, 0xae, - 0x48, 0x92, 0x44, 0xe9, 0x2e, 0xee, 0x4e, 0x24, - 0x5d, 0x92, 0x65, 0x99, 0x6a, 0x1a, 0xcb, 0x27, - 0xb2, 0x27, 0x3e, 0x61, 0x2f, 0xac, 0x6b, 0x9d, - 0x46, 0x1b, 0x90, 0x69, 0xea, 0x90, 0x12, 0xf7, - 0xc2, 0xda, 0xfb, 0x40, 0x09, 0x71, 0xdd, 0x7a, - 0x78, 0x67, 0x1b, 0x14, 0x11, 0x2d, 0xc0, 0xd5, - 0x68, 0xab, 0x8b, 0xd1, 0x42, 0x5c, 0x09, 0xe1, - 0x2b, 0x83, 0x7a, 0xfd, 0xf3, 0xdf, 0x07, 0x97, - 0xde, 0xde, 0x21, 0xa3, 0x27, 0xa5, 0xb9, 0x3c, - 0x74, 0xb8, 0x6e, 0x3b, 0x85, 0x62, 0x7e, 0x56, - 0xa0, 0xe1, 0x94, 0x61, 0x95, 0x6d, 0xd4, 0x2d, - 0x6b, 0x20, 0xb9, 0x93, 0xb2, 0x29, 0xcb, 0x93, - 0x4b, 0x56, 0x8b, 0x5d, 0xb8, 0x6d, 0x0e, 0x2b, - 0xe1, 0x68, 0xed, 0x81, 0xa2, 0x84, 0x2e, 0x31, - 0x84, 0xae, 0xb1, 0x2f, 0x86, 0x8f, 0x6e, 0xb0, - 0x6a, 0x00, 0xc1, 0x3a, 0x01, 0xa9, 0x72, 0x3c, - 0x3c, 0x30, 0x13, 0x3b, 0x72, 0xb3, 0x13, 0x52, - 0xe5, 0x13, 0xdb, 0x02, 0x8b, 0x96, 0xea, 0x4a, - 0x44, 0xea, 0x9c, 0xdb, 0x9b, 0x8a, 0x7d, 0xbb, - 0x29, 0xaa, 0x45, 0x28, 0x10, 0x3d, 0xf5, 0xf1, - 0xb7, 0x63, 0xfa, 0xb9, 0x34, 0x6e, 0xe0, 0x0b, - 0xe4, 0xb4, 0xa6, 0xd0, 0x77, 0x45, 0x5f, 0xd0, - 0xbb, 0x1b, 0x1e, 0xa3, 0x1c, 0x4f, 0x7b, 0xb9, - 0xa4, 0xfa, 0x60, 0x57, 0xcc, 0x1d, 0x4f, 0xb4, - 0x78, 0x80, 0x2b, 0xa0, 0x86, 0x4a, 0xbc, 0x0c, - 0xc2, 0xa6, 0xa3, 0x98, 0x7d, 0x8f, 0x14, 0x58, - 0x05, 0x85, 0x56, 0xa1, 0x99, 0x2b, 0xc7, 0xcc, - 0x3b, 0x16, 0xed, 0x83, 0x58, 0xb0, 0x92, 0x31, - 0x46, 0x8c, 0xa2, 0x3e, 0xb5, 0x74, 0xe9, 0x81, - 0xf0, 0x9a, 0xf4, 0x1e, 0x79, 0xe7, 0x53, 0x58, - 0xf3, 0x53, 0xa9, 0x6f, 0x2f, 0x35, 0x84, 0xaa, - 0x4f, 0xd9, 0xf2, 0xdd, 0xbd, 0x03, 0x69, 0xfc, - 0xe0, 0x97, 0x4d, 0xe1, 0xfd, 0xe1, 0x3a, 0x7a, - 0x6b, 0xd5, 0x24, 0xaa, 0xf0, 0x15, 0x93, 0xc3, - 0xe1, 0xa4, 0xd4, 0x24, 0xb7, 0xf0, 0xc2, 0xa3, - 0xec, 0x85, 0x4e, 0xad, 0x9b, 0xb9, 0xad, 0x10, - 0x22, 0x04, 0x61, 0x4b, 0x51, 0xcc, 0x8e, 0x42, - 0x29, 0xd1, 0x4d, 0xfe, 0x0e, 0x69, 0x72, 0x22, - 0xb6, 0x56, 0x06, 0x21, 0x73, 0x6d, 0xc5, 0x6c, - 0x20, 0x62, 0x60, 0xee, 0x8e, 0xe0, 0x67, 0x85, - 0x49, 0x36, 0x17, 0xb9, 0x53, 0x32, 0xe9, 0x70, - 0xed, 0x76, 0x0e, 0x58, 0x9d, 0x54, 0x3d, 0x4a, - 0x15, 0x8d, 0x87, 0xd8, 0x0b, 0xbe, 0x93, 0x0a, - 0x7f, 0x49, 0xa7, 0xd1, 0x54, 0x30, 0x68, 0x1a, - 0x59, 0x98, 0x3e, 0xe2, 0x9e, 0xe7, 0xbf, 0x18, - 0x4d, 0x65, 0x0d, 0x87, 0x38, 0x3b, 0x45, 0xa8, - 0x29, 0x5a, 0x4f, 0x29, 0xae, 0x34, 0x09, 0x72, - 0x8f, 0x6a, 0xad, 0xc0, 0x26, 0xcc, 0xad, 0xeb, - 0x50, 0xd8, 0x44, 0x0a, 0xed, 0x0a, 0x4a, 0x08, - 0xaa, 0x3d, 0x80, 0x40, 0x57, 0x80, 0x4a, 0x28, - 0xf2, 0x1f, 0xc6, 0x24, 0x8c, 0x87, 0x82, 0x86, - 0x23, 0x6a, 0xd4, 0x43, 0xbd, 0x5c, 0x5c, 0xa0, - 0x0c, 0xd6, 0xdb, 0x1f, 0xa9, 0x6b, 0x79, 0x40, - 0x58, 0x0d, 0x50, 0x6d, 0xa0, 0x8c, 0x1a, 0xc3, - 0xb5, 0x26, 0x9d, 0x04, 0x82, 0x6a, 0x33, 0x42, - 0x5a, 0x13, 0x8d, 0x3e, 0xef, 0x49, 0xba, 0xa5, - 0xff, 0x13, 0x66, 0x26, 0x12, 0x9f, 0x19, 0x5f, - 0x4d, 0xa0, 0x1d, 0x65, 0xab, 0x49, 0x91, 0x25, - 0xb2, 0x28, 0x12, 0x45, 0xd5, 0x10, 0xc7, 0x81, - 0x85, 0xb3, 0x98, 0xa4, 0x23, 0x06, 0x8f, 0x51, - 0xa0, 0x10, 0x69, 0x71, 0x2a, 0xd2, 0xa7, 0x18, - 0x42, 0x6e, 0x80, 0x27, 0xb2, 0x20, 0xdc, 0x63, - 0x80, 0xa0, 0xd0, 0xab, 0x08, 0x6c, 0xb1, 0xdb, - 0xb0, 0x08, 0xbd, 0x93, 0xa8, 0xd0, 0x37, 0x84, - 0x74, 0x5f, 0x9e, 0x2b, 0x29, 0x95, 0x82, 0xb1, - 0x46, 0x33, 0x4d, 0xb6, 0xf4, 0xeb, 0x39, 0x17, - 0x93, 0xd3, 0xee, 0xe2, 0x32, 0x1f, 0xe4, 0x12, - 0xdf, 0x40, 0x31, 0xd9, 0x4f, 0x31, 0xc9, 0x4f, - 0x9a, 0x12, 0xa4, 0x07, 0x2e, 0x7d, 0x9b, 0x46, - 0x74, 0x1f, 0xdf, 0x72, 0xed, 0x82, 0xcd, 0x2f, - 0xd1, 0xca, 0xfd, 0xf3, 0x89, 0xcb, 0x04, 0xd9, - 0x6c, 0xcd, 0x62, 0xc6, 0xb4, 0x28, 0x69, 0xec, - 0x4d, 0xab, 0xd5, 0xfc, 0xa2, 0x5f, 0x6b, 0x05, - 0x76, 0x43, 0xb8, 0x1e, 0xa0, 0x4c, 0xbc, 0xa8, - 0x5d, 0x0f, 0xaa, 0xcc, 0x42, 0xbb, 0x90, 0x0d, - 0x65, 0x66, 0xa3, 0x70, 0x2d, 0x82, 0x37, 0x44, - 0x15, 0xbf, 0x97, 0xdb, 0x85, 0x07, 0x35, 0x51, - 0x8c, 0x6c, 0xa9, 0xd4, 0x14, 0x69, 0x68, 0x59, - 0x3c, 0x2d, 0x29, 0x8b, 0xa6, 0x5d, 0xb7, 0x82, - 0x9e, 0xbd, 0x6a, 0x31, 0xd9, 0x9d, 0x0e, 0xb2, - 0xda, 0x65, 0xb2, 0xd8, 0x25, 0x13, 0x13, 0x06, - 0xbf, 0x49, 0x17, 0x76, 0x18, 0xd5, 0x72, 0xed, - 0xda, 0xc3, 0x8b, 0x68, 0xfe, 0xa6, 0xe7, 0x48, - 0xb1, 0x48, 0x94, 0xec, 0xb2, 0x90, 0x62, 0x95, - 0x4c, 0x45, 0x04, 0xa5, 0x74, 0x43, 0xe5, 0xef, - 0xcd, 0xdc, 0xe3, 0xe6, 0x38, 0xb0, 0xb7, 0x28, - 0xc0, 0x81, 0xac, 0xa3, 0xad, 0x5e, 0x87, 0xf4, - 0x29, 0xa3, 0x0d, 0xd8, 0x87, 0xb6, 0x57, 0x28, - 0xf5, 0x47, 0x14, 0x35, 0x51, 0x15, 0x2f, 0xc1, - 0xde, 0xd1, 0x7a, 0xf4, 0x50, 0xe2, 0xfb, 0xf1, - 0xb5, 0xb1, 0xc3, 0x62, 0xc3, 0x97, 0x1c, 0xd6, - 0x24, 0x0a, 0x21, 0xeb, 0x08, 0x41, 0xda, 0x79, - 0xba, 0x99, 0xd4, 0xe8, 0xe9, 0x1d, 0x42, 0xf7, - 0x5c, 0xf0, 0x06, 0x0b, 0x2e, 0x9b, 0x4a, 0x8c, - 0xe9, 0xf7, 0x1c, 0x0d, 0x3d, 0xbb, 0xa0, 0x45, - 0xf8, 0x83, 0xb5, 0x5b, 0x68, 0xe6, 0xda, 0xf1, - 0x24, 0x33, 0x89, 0x53, 0xdc, 0x56, 0xb2, 0x39, - 0x9a, 0xaf, 0xb3, 0xb0, 0xd1, 0xc5, 0x3a, 0x31, - 0x2d, 0xc6, 0x94, 0x52, 0xe2, 0x97, 0x67, 0xb6, - 0x9e, 0x80, 0xde, 0x47, 0x20, 0xde, 0x02, 0x3a, - 0x29, 0xad, 0xce, 0x1b, 0x09, 0x13, 0xdb, 0x1a, - 0x6c, 0x50, 0x89, 0x56, 0xf9, 0x0b, 0xa4, 0xd2, - 0x8b, 0x92, 0x95, 0x4c, 0x31, 0xdc, 0x70, 0xce, - 0x0f, 0x90, 0xc5, 0x62, 0x33, 0xad, 0x27, 0xb0, - 0xb7, 0x76, 0x23, 0x1d, 0xaa, 0xdd, 0x4a, 0x9d, - 0x32, 0xfa, 0xd1, 0xd0, 0xce, 0x77, 0x50, 0x79, - 0x70, 0x0f, 0x53, 0x27, 0x44, 0xd7, 0x77, 0x7d, - 0xbc, 0x65, 0x71, 0x51, 0x27, 0xa6, 0x7f, 0x3b, - 0x8e, 0x34, 0x29, 0x6c, 0x0a, 0x6f, 0xb1, 0xca, - 0xa4, 0xab, 0x5c, 0xad, 0x35, 0x83, 0x3d, 0xc0, - 0x11, 0x25, 0xeb, 0x66, 0x3c, 0xa8, 0x4d, 0x2d, - 0xbd, 0x5d, 0xfd, 0xf1, 0x76, 0xe6, 0xae, 0x46, - 0xea, 0x94, 0xd1, 0xe0, 0xd5, 0x20, 0x2b, 0x4d, - 0x46, 0x07, 0xba, 0x03, 0x9e, 0xa8, 0xc6, 0x6c, - 0xd0, 0x1b, 0x9b, 0x00, 0x29, 0x98, 0xab, 0xfb, - 0x7e, 0x58, 0x7d, 0x17, 0xe5, 0x7b, 0xbb, 0x91, - 0xc7, 0x9d, 0x46, 0x47, 0x1a, 0xb7, 0xb1, 0x20, - 0xfc, 0x50, 0x16, 0xa2, 0xb3, 0x7b, 0x10, 0xbd, - 0x74, 0xcd, 0xd7, 0xcd, 0x96, 0x40, 0x4b, 0x23, - 0x49, 0x3f, 0xb0, 0xf8, 0xf5, 0x8d, 0x77, 0xd1, - 0x9a, 0x23, 0x0b, 0x29, 0xc9, 0xa5, 0x98, 0x96, - 0x17, 0x82, 0x0b, 0x05, 0x34, 0xc0, 0xd0, 0x24, - 0x0e, 0xb4, 0x24, 0xaa, 0xae, 0xac, 0xa7, 0x68, - 0x24, 0xd6, 0xc4, 0x15, 0x39, 0xe5, 0x78, 0x33, - 0xa8, 0x17, 0x15, 0xb6, 0x08, 0x8a, 0x04, 0xd1, - 0xe7, 0x74, 0x46, 0x11, 0xbb, 0x11, 0xc5, 0x2b, - 0xe7, 0x38, 0xf7, 0x8a, 0x4c, 0x76, 0xaf, 0x22, - 0xd9, 0x9e, 0x0a, 0x84, 0x1a, 0x3b, 0xe4, 0x7a, - 0xb3, 0xd9, 0x0b, 0x32, 0xc9, 0xfc, 0x14, 0xa7, - 0x53, 0xa6, 0xfd, 0xbe, 0x8d, 0xb4, 0xfa, 0xc8, - 0x02, 0xba, 0xb4, 0xe3, 0x98, 0x63, 0x04, 0x37, - 0x87, 0xed, 0xe2, 0x0f, 0x69, 0x7d, 0xd9, 0xc7, - 0xe4, 0x48, 0x56, 0xc8, 0xe5, 0xb1, 0x36, 0x0b, - 0xaf, 0x09, 0xab, 0xb3, 0xf5, 0x25, 0x01, 0x9d, - 0x0c, 0x5e, 0x48, 0x12, 0xdf, 0xc5, 0x34, 0x1d, - 0xdd, 0x02, 0xfd, 0x48, 0x01, 0x8e, 0x05, 0x76, - 0xc2, 0xbc, 0x1c, 0x54, 0xe0, 0x6c, 0xa4, 0xce, - 0x61, 0xb0, 0x70, 0x03, 0xda, 0x86, 0xb5, 0xa0, - 0x4c, 0x7c, 0xf6, 0x0d, 0xa1, 0x11, 0x3c, 0x5f, - 0xc4, 0x4d, 0x77, 0xe7, 0xb0, 0xac, 0x83, 0xe1, - 0x6f, 0x48, 0xd7, 0x75, 0x72, 0xd8, 0x93, 0x58, - 0x88, 0x10, 0xf3, 0x57, 0xa6, 0x14, 0x4e, 0xe1, - 0xf3, 0xb7, 0x3f, 0x4d, 0x03, 0xdb, 0x8f, 0x24, - 0x87, 0xc5, 0xd5, 0xf2, 0xcc, 0xf2, 0xc0, 0x01, - 0x9a, 0xbb, 0xf3, 0x11, 0x93, 0xe7, 0x19, 0xb9, - 0x76, 0x93, 0xa8, 0xc2, 0xe2, 0xc2, 0xfa, 0x42, - 0x70, 0xcd, 0xe4, 0xae, 0x6c, 0x2a, 0x1d, 0x0e, - 0xab, 0xdc, 0x7e, 0xeb, 0x32, 0x76, 0x41, 0xe8, - 0x44, 0xbb, 0x00, 0xbb, 0xd0, 0x51, 0xee, 0x02, - 0x85, 0xe2, 0xc3, 0x8d, 0x05, 0xbb, 0x08, 0xb9, - 0xd8, 0x89, 0xe8, 0x86, 0xc0, 0x4f, 0x4d, 0x5c, - 0x2b, 0xdf, 0x76, 0x9e, 0xb1, 0x33, 0xb8, 0x4c, - 0xf2, 0x37, 0x05, 0x28, 0x3d, 0x2d, 0x87, 0x6a, - 0x63, 0x47, 0x48, 0xe6, 0x3c, 0x2e, 0x04, 0x0c, - 0x34, 0x55, 0xd3, 0xc2, 0x5d, 0x53, 0xa9, 0xa0, - 0xcf, 0xcb, 0xe6, 0xb5, 0x22, 0xb3, 0xbc, 0x59, - 0x78, 0x27, 0x45, 0xb4, 0x20, 0xa5, 0x7b, 0x6d, - 0x26, 0xef, 0x4d, 0x6a, 0x31, 0xdf, 0x99, 0x31, - 0xa6, 0xe0, 0x06, 0x1b, 0x42, 0xd1, 0x45, 0x0a, - 0x50, 0x28, 0xd0, 0xd0, 0xd2, 0x8e, 0x2c, 0x39, - 0xe9, 0x2b, 0x26, 0xf6, 0xc2, 0x2b, 0x08, 0xe6, - 0x3c, 0x58, 0x5a, 0x47, 0xd7, 0x5a, 0xd2, 0x0a, - 0xc5, 0x18, 0x1f, 0x8b, 0x11, 0x37, 0xa2, 0x2b, - 0xad, 0x58, 0x58, 0x73, 0xdf, 0x52, 0x8b, 0xd5, - 0x32, 0xac, 0x47, 0x97, 0x9e, 0x14, 0xb0, 0x96, - 0x51, 0x44, 0x6a, 0x34, 0x85, 0xe3, 0x4e, 0x9a, - 0x7c, 0x35, 0x31, 0x1a, 0xd9, 0x75, 0x22, 0xdd, - 0xdc, 0xfd, 0x29, 0x7a, 0x67, 0xeb, 0xfd, 0xb4, - 0xb1, 0xe2, 0x1f, 0x94, 0xcc, 0x6c, 0x4e, 0xf1, - 0x1c, 0xbb, 0x29, 0xa1, 0x46, 0xb9, 0x82, 0xc7, - 0x58, 0x91, 0x28, 0xcb, 0xa8, 0x2a, 0xd4, 0x58, - 0x17, 0xa3, 0xaa, 0x22, 0x33, 0x35, 0x2f, 0x64, - 0xfe, 0x8f, 0xf9, 0x29, 0x05, 0xf2, 0x31, 0x99, - 0xf5, 0x40, 0x1a, 0x0d, 0x81, 0x52, 0x06, 0xe8, - 0x12, 0x85, 0x37, 0x2e, 0x49, 0xd8, 0x14, 0x28, - 0x85, 0xd7, 0xf6, 0xf9, 0xb5, 0xca, 0x9c, 0x65, - 0xf5, 0x7f, 0x18, 0x95, 0xe1, 0xf6, 0x5a, 0xf2, - 0x3b, 0x67, 0x51, 0x9d, 0xce, 0x5e, 0xb0, 0xb0, - 0x25, 0xd9, 0x0b, 0x91, 0x88, 0xce, 0x96, 0x54, - 0x61, 0x69, 0x32, 0x83, 0x3c, 0x23, 0xc7, 0xc1, - 0x14, 0x39, 0x56, 0x06, 0x4d, 0x65, 0x05, 0x58, - 0x78, 0x3d, 0xc6, 0x49, 0x20, 0xcc, 0x16, 0xda, - 0x59, 0xa7, 0xab, 0xaa, 0x2e, 0x4a, 0x7b, 0x4f, - 0x56, 0xa0, 0xe6, 0xa4, 0xaf, 0x98, 0x38, 0x16, - 0x4a, 0xb0, 0xa7, 0x33, 0x05, 0x2d, 0xc3, 0x75, - 0xa0, 0x8a, 0x9a, 0xb0, 0x5b, 0x2d, 0x9a, 0xbc, - 0x8b, 0x11, 0xec, 0x62, 0xc8, 0xf9, 0x00, 0x3b, - 0x1b, 0x97, 0xa7, 0x28, 0xd9, 0x23, 0xce, 0x77, - 0xdd, 0xd6, 0x50, 0xe5, 0x3b, 0x4a, 0xbe, 0xea, - 0x00, 0x79, 0xec, 0xb9, 0xa4, 0x48, 0xcd, 0x16, - 0x4e, 0x4e, 0x51, 0x28, 0x2d, 0xd3, 0x6a, 0x0a, - 0x2c, 0x72, 0xbb, 0xc7, 0x6b, 0xff, 0x91, 0xf0, - 0x3f, 0x0c, 0x38, 0xb2, 0xf9, 0x6f, 0x4d, 0x89, - 0x9f, 0x58, 0x78, 0xf1, 0xc7, 0x7d, 0x71, 0xe1, - 0x4f, 0xe9, 0x35, 0x2b, 0x7b, 0xe2, 0x12, 0x58, - 0xfd, 0x62, 0x28, 0xd1, 0x0e, 0xad, 0x05, 0x21, - 0x3e, 0x12, 0xd1, 0x80, 0xe9, 0x2e, 0xbe, 0x7d, - 0xe8, 0xff, 0xac, 0x6e, 0xf2, 0xa3, 0x41, 0xaa, - 0xed, 0xd5, 0x2e, 0x37, 0x8f, 0xb2, 0xf2, 0x5d, - 0x14, 0xb1, 0xf8, 0xcc, 0xfc, 0x6f, 0x56, 0xd7, - 0x13, 0x49, 0x6d, 0xa6, 0x59, 0x4e, 0x9b, 0x2a, - 0x7b, 0x2b, 0xa8, 0x51, 0xf9, 0x7e, 0x3f, 0xf9, - 0xeb, 0xcc, 0x0d, 0x0a, 0x31, 0xcc, 0xdc, 0xda, - 0x96, 0xf7, 0xc4, 0xe3, 0xf0, 0x5e, 0xac, 0x0a, - 0x5c, 0x2f, 0x41, 0x41, 0x93, 0xe0, 0x95, 0x1c, - 0x28, 0x95, 0x99, 0xb0, 0xe7, 0xd3, 0x1c, 0xf9, - 0x7a, 0x53, 0xc9, 0xea, 0x86, 0xb7, 0xb4, 0x4a, - 0x75, 0x57, 0xc7, 0x54, 0x57, 0xba, 0xd1, 0xa1, - 0x4b, 0xa6, 0x64, 0x75, 0xab, 0xa4, 0x2b, 0xec, - 0x5c, 0x45, 0x33, 0x67, 0xe1, 0x1f, 0x5b, 0x9c, - 0x03, 0x8e, 0xfd, 0xec, 0xab, 0x0e, 0x53, 0xd9, - 0x9e, 0x46, 0x9d, 0xe3, 0x40, 0xe6, 0xbf, 0xe7, - 0xd5, 0xee, 0xa5, 0x87, 0xb7, 0xbd, 0x4f, 0x75, - 0x46, 0x82, 0xd0, 0xa7, 0xfc, 0xa6, 0x9e, 0x95, - 0x18, 0x80, 0xe9, 0xab, 0x0f, 0x3c, 0x52, 0x8f, - 0x77, 0x5d, 0x93, 0x20, 0xf8, 0xcd, 0xd8, 0xb1, - 0xab, 0x05, 0xcd, 0x34, 0x55, 0x55, 0x6b, 0x83, - 0xc1, 0x60, 0xa7, 0x70, 0x38, 0x9c, 0xb2, 0xa2, - 0x7a, 0xa6, 0xa1, 0x66, 0x1d, 0x9d, 0x64, 0xb3, - 0xd8, 0x52, 0xbc, 0x79, 0x19, 0xe4, 0xf6, 0x3a, - 0xc9, 0xe9, 0x66, 0x61, 0x39, 0xdb, 0x18, 0x92, - 0x6a, 0x16, 0x36, 0xb1, 0xa8, 0xce, 0x29, 0xde, - 0x5f, 0x1f, 0xa1, 0xba, 0xb2, 0x00, 0xf9, 0x2a, - 0xc3, 0x9c, 0x81, 0xc8, 0x57, 0x7f, 0x90, 0x9e, - 0xd9, 0x3c, 0xcb, 0xec, 0x76, 0x85, 0x57, 0x1b, - 0x59, 0x66, 0xad, 0xad, 0x3f, 0x35, 0xb0, 0xa2, - 0xd0, 0x0d, 0xc0, 0x0b, 0x0e, 0x0d, 0xc2, 0x1e, - 0x41, 0x40, 0x5f, 0x83, 0x2d, 0x77, 0x51, 0x33, - 0xc2, 0xbc, 0xf6, 0xf2, 0xd2, 0xd2, 0xd2, 0xa5, - 0x53, 0xa6, 0x4c, 0xd9, 0xc0, 0xca, 0x38, 0xb2, - 0xfb, 0x52, 0x76, 0xf7, 0x9b, 0xe8, 0x69, 0x5b, - 0x32, 0x0d, 0x16, 0x49, 0xd1, 0x6a, 0xb3, 0xe8, - 0xf6, 0x24, 0xab, 0x6c, 0xb5, 0x2b, 0xa6, 0x02, - 0x91, 0x48, 0x8c, 0x22, 0x81, 0x98, 0xc1, 0x35, - 0xc0, 0xe4, 0x56, 0xb4, 0x89, 0xd6, 0xec, 0xfe, - 0x84, 0xa6, 0x55, 0xef, 0x34, 0xe9, 0x19, 0xc2, - 0xc8, 0x5b, 0xc3, 0xeb, 0xc6, 0xda, 0xa4, 0xc0, - 0x71, 0x7e, 0x37, 0x71, 0x23, 0x3a, 0x53, 0x0f, - 0x7e, 0x1b, 0xb1, 0x04, 0x5b, 0xec, 0x62, 0x53, - 0x60, 0x6f, 0x41, 0x41, 0x41, 0x08, 0xe7, 0xd2, - 0x30, 0x6e, 0x9a, 0xb3, 0x44, 0xc7, 0xa1, 0x74, - 0x56, 0x76, 0x7f, 0x1a, 0xc6, 0x23, 0xc3, 0x60, - 0xc5, 0x4a, 0xd9, 0xdc, 0x9b, 0x99, 0x7b, 0xa9, - 0xba, 0x46, 0x35, 0xdc, 0xab, 0x55, 0x84, 0xeb, - 0x69, 0x7d, 0x45, 0x21, 0x7d, 0x55, 0xb4, 0xca, - 0xec, 0x06, 0x74, 0x18, 0x2a, 0x14, 0xff, 0x3d, - 0x46, 0x9b, 0x3d, 0xf0, 0xb3, 0x5f, 0x81, 0x36, - 0x47, 0xa9, 0x1d, 0xca, 0xd9, 0x31, 0x28, 0x29, - 0x09, 0x1b, 0xc7, 0x4a, 0xab, 0x4d, 0xe4, 0xb8, - 0xb0, 0x89, 0x47, 0x3d, 0x61, 0x9f, 0x55, 0x64, - 0xc5, 0x48, 0x9b, 0x62, 0xe0, 0x34, 0x94, 0x48, - 0x14, 0x36, 0x2e, 0xb0, 0x74, 0x9c, 0x63, 0x5c, - 0x01, 0x03, 0xd0, 0x13, 0xfe, 0xd6, 0xe2, 0x0a, - 0x19, 0xc6, 0xb1, 0x1b, 0x5b, 0xff, 0x15, 0x60, - 0x00, 0xc5, 0x21, 0xe2, 0xc4, 0xad, 0xbe, 0xab, - 0x3c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x6c, 0x65, 0x66, - 0x74, 0x2d, 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, - 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, - 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xdc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, + 0x12, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0xe7, 0x1d, 0xf2, 0xcc, + 0x05, 0x00, 0x00, 0x00, 0xa4, 0x02, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0xc0, 0x02, 0x00, 0x00, + 0xb2, 0x08, 0x00, 0x00, 0x82, 0xbb, 0x68, 0x24, + 0x05, 0x00, 0x00, 0x00, 0xb2, 0x08, 0x00, 0x00, + 0x0e, 0x00, 0x76, 0x00, 0xc0, 0x08, 0x00, 0x00, + 0x27, 0x26, 0x00, 0x00, 0xa7, 0x03, 0x26, 0xe9, + 0x05, 0x00, 0x00, 0x00, 0x27, 0x26, 0x00, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0x38, 0x26, 0x00, 0x00, + 0x16, 0x2c, 0x00, 0x00, 0x2c, 0x4b, 0x34, 0x62, + 0x05, 0x00, 0x00, 0x00, 0x16, 0x2c, 0x00, 0x00, + 0x14, 0x00, 0x76, 0x00, 0x30, 0x2c, 0x00, 0x00, + 0x28, 0x32, 0x00, 0x00, 0x1e, 0xbf, 0xf2, 0x01, + 0x05, 0x00, 0x00, 0x00, 0x28, 0x32, 0x00, 0x00, + 0x17, 0x00, 0x76, 0x00, 0x40, 0x32, 0x00, 0x00, + 0x01, 0x6a, 0x00, 0x00, 0xc9, 0xd6, 0xd8, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x01, 0x6a, 0x00, 0x00, + 0x0e, 0x00, 0x4c, 0x00, 0x10, 0x6a, 0x00, 0x00, + 0x58, 0x6a, 0x00, 0x00, 0x9e, 0xb9, 0x01, 0x2d, + 0x05, 0x00, 0x00, 0x00, 0x58, 0x6a, 0x00, 0x00, + 0x17, 0x00, 0x76, 0x00, 0x70, 0x6a, 0x00, 0x00, + 0x3c, 0x70, 0x00, 0x00, 0xbd, 0x4d, 0xa2, 0x82, + 0x05, 0x00, 0x00, 0x00, 0x3c, 0x70, 0x00, 0x00, + 0x17, 0x00, 0x76, 0x00, 0x58, 0x70, 0x00, 0x00, + 0x2f, 0x76, 0x00, 0x00, 0xd7, 0xe0, 0x64, 0x7d, + 0x05, 0x00, 0x00, 0x00, 0x2f, 0x76, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0x48, 0x76, 0x00, 0x00, + 0xeb, 0x93, 0x00, 0x00, 0x5f, 0x07, 0x78, 0x81, + 0x05, 0x00, 0x00, 0x00, 0xeb, 0x93, 0x00, 0x00, + 0x15, 0x00, 0x76, 0x00, 0x00, 0x94, 0x00, 0x00, + 0xf2, 0x99, 0x00, 0x00, 0xa5, 0xdb, 0xee, 0x7c, + 0x05, 0x00, 0x00, 0x00, 0xf2, 0x99, 0x00, 0x00, + 0x12, 0x00, 0x76, 0x00, 0x08, 0x9a, 0x00, 0x00, + 0x14, 0xbc, 0x00, 0x00, 0xb4, 0xb1, 0xe2, 0x6e, + 0x05, 0x00, 0x00, 0x00, 0x14, 0xbc, 0x00, 0x00, + 0x0e, 0x00, 0x76, 0x00, 0x28, 0xbc, 0x00, 0x00, + 0x20, 0xc2, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x20, 0xc2, 0x00, 0x00, + 0x01, 0x00, 0x4c, 0x00, 0x24, 0xc2, 0x00, 0x00, + 0x28, 0xc2, 0x00, 0x00, 0x54, 0xdb, 0x36, 0xc5, + 0x05, 0x00, 0x00, 0x00, 0x28, 0xc2, 0x00, 0x00, + 0x15, 0x00, 0x76, 0x00, 0x40, 0xc2, 0x00, 0x00, + 0x3b, 0xc8, 0x00, 0x00, 0xc4, 0x94, 0xef, 0xa3, + 0x05, 0x00, 0x00, 0x00, 0x3b, 0xc8, 0x00, 0x00, + 0x11, 0x00, 0x76, 0x00, 0x50, 0xc8, 0x00, 0x00, + 0x0a, 0xd5, 0x00, 0x00, 0x62, 0xf4, 0x40, 0xf5, + 0x05, 0x00, 0x00, 0x00, 0x0a, 0xd5, 0x00, 0x00, + 0x0c, 0x00, 0x76, 0x00, 0x18, 0xd5, 0x00, 0x00, + 0x85, 0xe3, 0x00, 0x00, 0xce, 0xd7, 0x2c, 0x8d, + 0x16, 0x00, 0x00, 0x00, 0x85, 0xe3, 0x00, 0x00, + 0x0f, 0x00, 0x4c, 0x00, 0x94, 0xe3, 0x00, 0x00, + 0x98, 0xe3, 0x00, 0x00, 0xab, 0x24, 0xde, 0x2d, + 0x05, 0x00, 0x00, 0x00, 0x98, 0xe3, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0xb0, 0xe3, 0x00, 0x00, + 0x8b, 0xe9, 0x00, 0x00, 0xca, 0xb8, 0x7e, 0x83, + 0x05, 0x00, 0x00, 0x00, 0x8b, 0xe9, 0x00, 0x00, + 0x16, 0x00, 0x76, 0x00, 0xa8, 0xe9, 0x00, 0x00, + 0x94, 0xef, 0x00, 0x00, 0x7f, 0xc0, 0xa0, 0x77, + 0x05, 0x00, 0x00, 0x00, 0x94, 0xef, 0x00, 0x00, + 0x11, 0x00, 0x76, 0x00, 0xa8, 0xef, 0x00, 0x00, + 0xb7, 0x4f, 0x01, 0x00, 0x52, 0x9f, 0x80, 0xcc, + 0x05, 0x00, 0x00, 0x00, 0xb7, 0x4f, 0x01, 0x00, + 0x0f, 0x00, 0x76, 0x00, 0xc8, 0x4f, 0x01, 0x00, + 0x18, 0x60, 0x01, 0x00, 0x4b, 0x50, 0x90, 0x0b, + 0x0c, 0x00, 0x00, 0x00, 0x18, 0x60, 0x01, 0x00, + 0x04, 0x00, 0x4c, 0x00, 0x1c, 0x60, 0x01, 0x00, + 0x20, 0x60, 0x01, 0x00, 0xb0, 0xb7, 0x24, 0x30, + 0x15, 0x00, 0x00, 0x00, 0x20, 0x60, 0x01, 0x00, + 0x06, 0x00, 0x4c, 0x00, 0x28, 0x60, 0x01, 0x00, + 0x2c, 0x60, 0x01, 0x00, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x2d, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2d, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, + 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe2, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, @@ -569,6150 +109,4640 @@ 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x59, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x5b, - 0x6c, 0x94, 0x45, 0x14, 0xc7, 0x7f, 0x7b, 0xe9, - 0xf6, 0x0e, 0x96, 0xb4, 0x94, 0xb6, 0x68, 0x55, - 0xe4, 0x22, 0x98, 0x70, 0xc4, 0x9a, 0x48, 0x02, - 0x1a, 0x20, 0x91, 0x44, 0x88, 0x89, 0x44, 0x34, - 0x04, 0x88, 0x46, 0x89, 0x9a, 0x90, 0x90, 0xa8, - 0x89, 0xf1, 0x91, 0x18, 0x5f, 0x50, 0x62, 0xe4, - 0xc1, 0x08, 0x51, 0x7c, 0x50, 0xb9, 0x04, 0x95, - 0x28, 0xb1, 0xc4, 0x80, 0x10, 0x0d, 0x11, 0x88, - 0x6d, 0xf1, 0x90, 0xb4, 0xca, 0xa5, 0x28, 0x97, - 0x02, 0x2d, 0x0d, 0x16, 0x68, 0xa5, 0xd0, 0x6e, - 0x77, 0x7d, 0xd8, 0xdd, 0xf6, 0xeb, 0x74, 0xb6, - 0xfd, 0x2e, 0x4b, 0x8c, 0xff, 0xa7, 0xf9, 0xe6, - 0x5c, 0xe6, 0xfc, 0xe7, 0x9c, 0x9d, 0xef, 0x9b, - 0x99, 0x0d, 0x25, 0x93, 0x49, 0xfe, 0xcf, 0x88, - 0xe6, 0xda, 0xa1, 0x88, 0x44, 0x80, 0x27, 0x81, - 0x02, 0xa0, 0x5e, 0x55, 0xfb, 0x72, 0x3d, 0x86, - 0x13, 0xe1, 0x3b, 0xe0, 0xf3, 0x0d, 0x60, 0x2f, - 0xb0, 0x1b, 0x78, 0xe7, 0x0e, 0xf8, 0x1f, 0x06, - 0x5f, 0x19, 0x10, 0x91, 0xbb, 0x80, 0x1a, 0xe0, - 0x77, 0x55, 0x35, 0x6b, 0x70, 0x85, 0xa3, 0xfd, - 0x2c, 0xf0, 0xb6, 0xc5, 0x7e, 0x21, 0xf0, 0x2a, - 0xd0, 0xa4, 0xaa, 0xef, 0xf9, 0x89, 0x21, 0x03, - 0xcf, 0x19, 0x10, 0x91, 0xe9, 0x40, 0x3b, 0xd0, - 0x0c, 0xbc, 0x6f, 0x51, 0x99, 0xec, 0x68, 0x8f, - 0xb7, 0xd8, 0xd7, 0x00, 0xdf, 0x03, 0xcf, 0x01, - 0x1b, 0x44, 0x64, 0xae, 0xd7, 0x18, 0x9c, 0xf0, - 0x53, 0x42, 0xcf, 0x03, 0xf9, 0xe9, 0xf6, 0x6a, - 0x23, 0xb8, 0x7c, 0xa0, 0xdc, 0xd1, 0x35, 0xce, - 0x62, 0xbf, 0x14, 0x28, 0x74, 0x3c, 0x57, 0xf9, - 0x88, 0x61, 0x10, 0x7e, 0x08, 0x38, 0xcb, 0x6e, - 0xa2, 0x88, 0x4c, 0x71, 0x3c, 0x57, 0x03, 0x21, - 0xc7, 0x73, 0x2c, 0x4d, 0xca, 0x89, 0x25, 0xc6, - 0x73, 0xa0, 0x1f, 0x79, 0x56, 0x02, 0x73, 0x76, - 0x87, 0x6a, 0xe5, 0xab, 0x50, 0x8d, 0x0b, 0x1b, - 0x67, 0x09, 0xd8, 0x66, 0x7c, 0xb0, 0x4f, 0x44, - 0xf2, 0x80, 0x45, 0x86, 0x3c, 0xb7, 0x04, 0x66, - 0xef, 0x8d, 0xae, 0xa9, 0x3b, 0x58, 0xda, 0x52, - 0x3a, 0xb9, 0xf6, 0x68, 0x59, 0xed, 0x7d, 0x0d, - 0x8f, 0x1d, 0x2c, 0x6b, 0x7e, 0xa4, 0x3e, 0xba, - 0x6c, 0x14, 0x9b, 0x3a, 0x47, 0xbb, 0x90, 0x91, - 0x28, 0x71, 0xb4, 0x67, 0x00, 0x45, 0x86, 0xfc, - 0xa6, 0xa7, 0x88, 0x0d, 0x0c, 0x5b, 0x85, 0x1e, - 0xfe, 0x21, 0x6f, 0x7d, 0x51, 0x65, 0xe5, 0xba, - 0xda, 0x4a, 0x29, 0x2b, 0x8f, 0x56, 0x90, 0x1f, - 0x2a, 0xe0, 0x56, 0xa2, 0xb7, 0xea, 0x74, 0xdb, - 0xd1, 0xcd, 0x73, 0xea, 0x0b, 0x2a, 0x8f, 0x2d, - 0xb9, 0xf5, 0x31, 0x30, 0x60, 0xf8, 0x98, 0xee, - 0x68, 0x9b, 0xc1, 0x01, 0x14, 0x3b, 0xda, 0xb3, - 0x2d, 0xf2, 0xcb, 0xfe, 0x42, 0x4f, 0x61, 0x70, - 0x36, 0xe7, 0xec, 0x09, 0x55, 0x27, 0x0b, 0x62, - 0x2f, 0x56, 0x4f, 0x9c, 0x59, 0x56, 0x35, 0x30, - 0x99, 0x81, 0x1f, 0x23, 0x14, 0x34, 0x97, 0x72, - 0x6f, 0x6c, 0x0a, 0xb3, 0xee, 0x7e, 0xa2, 0xa2, - 0xb0, 0x78, 0xdc, 0xeb, 0x33, 0xf6, 0x84, 0x4a, - 0x81, 0x6b, 0x86, 0x8f, 0x69, 0x8e, 0xf6, 0x58, - 0x19, 0x10, 0x8b, 0xfc, 0xa2, 0xff, 0xf0, 0x1d, - 0x04, 0x12, 0x79, 0xd1, 0x75, 0x45, 0xd5, 0x35, - 0xb5, 0x13, 0xa2, 0xe5, 0x74, 0x6c, 0xef, 0xe2, - 0xc8, 0xc6, 0x26, 0xea, 0xdf, 0xdc, 0x4f, 0x5f, - 0x43, 0x82, 0x49, 0xd1, 0x6a, 0xee, 0xa9, 0x91, - 0xa9, 0x25, 0x91, 0xfc, 0xd5, 0x40, 0x97, 0xe1, - 0xa3, 0x56, 0x44, 0x62, 0xe9, 0xb6, 0x2d, 0x03, - 0x4e, 0x02, 0x66, 0x06, 0xae, 0xaa, 0xea, 0xad, - 0x9c, 0x10, 0x20, 0xc4, 0x43, 0xc5, 0xf9, 0x65, - 0x94, 0x86, 0xc7, 0x11, 0xbe, 0x19, 0x19, 0xec, - 0xd6, 0x5d, 0xcd, 0x94, 0x45, 0x26, 0x50, 0x5e, - 0x52, 0x43, 0x28, 0x2f, 0x3c, 0x97, 0x91, 0x04, - 0x22, 0xc0, 0xfd, 0xe9, 0xf6, 0x58, 0x19, 0x30, - 0x09, 0x04, 0x9a, 0x7d, 0x70, 0x12, 0x08, 0x93, - 0x17, 0x0d, 0x45, 0xc9, 0x23, 0xc6, 0xf8, 0xf2, - 0xa1, 0xc5, 0xa4, 0x55, 0xcf, 0xd0, 0xdf, 0x19, - 0x27, 0x16, 0x8e, 0x11, 0x26, 0x52, 0xc0, 0x48, - 0x02, 0x30, 0x54, 0x46, 0x59, 0x09, 0x88, 0x48, - 0x15, 0x50, 0x61, 0xc8, 0xda, 0x82, 0x04, 0x9f, - 0x0a, 0x3b, 0x8d, 0x50, 0x3c, 0xd9, 0x1a, 0x8f, - 0xdf, 0x66, 0x80, 0x38, 0x85, 0xe5, 0x43, 0x71, - 0x24, 0x13, 0x49, 0x5a, 0xf6, 0xff, 0x41, 0x4f, - 0xef, 0x35, 0x92, 0x89, 0x81, 0x26, 0xe0, 0x6f, - 0x8b, 0x9f, 0x0c, 0x81, 0x88, 0x45, 0x96, 0xc9, - 0xc0, 0x2c, 0x8b, 0x2c, 0x77, 0x19, 0x88, 0x24, - 0x06, 0xb6, 0x76, 0x5f, 0x69, 0xeb, 0xf8, 0x27, - 0xd1, 0x43, 0xb4, 0x7a, 0xf8, 0x4a, 0xd9, 0xb2, - 0xef, 0x24, 0xe7, 0x3b, 0x8e, 0x5f, 0x48, 0xc4, - 0x7b, 0xb7, 0x63, 0xcf, 0xc0, 0x83, 0x19, 0x37, - 0x16, 0x59, 0x66, 0x15, 0x9a, 0x66, 0x91, 0x05, - 0x5a, 0x81, 0xc0, 0x41, 0xa0, 0x71, 0x69, 0xf2, - 0x58, 0x5f, 0x57, 0xd7, 0x4f, 0xed, 0x3d, 0x67, - 0xfb, 0x99, 0xd6, 0x4f, 0x24, 0x7f, 0x28, 0x96, - 0xeb, 0xe7, 0x6e, 0x70, 0xf5, 0xf0, 0xb5, 0xc3, - 0x8d, 0x4b, 0x93, 0xe7, 0xd3, 0x83, 0xc6, 0x0d, - 0x3f, 0x8f, 0x9a, 0xfe, 0x1c, 0xc8, 0x64, 0x60, - 0xba, 0x45, 0xd6, 0xeb, 0x3f, 0x74, 0xcb, 0x80, - 0x0f, 0xf4, 0xf4, 0xad, 0x6c, 0xfb, 0xb3, 0xf1, - 0x8b, 0xdf, 0xda, 0xf6, 0xb5, 0x17, 0xcf, 0x88, - 0x0d, 0x53, 0xec, 0xfb, 0x7c, 0x52, 0x07, 0x80, - 0xaa, 0xc6, 0x81, 0xbf, 0x0c, 0x3f, 0xb3, 0x44, - 0xa4, 0x94, 0xd1, 0x4b, 0xc8, 0x96, 0x81, 0x40, - 0x2b, 0x10, 0x18, 0x04, 0x76, 0x2d, 0x4f, 0x0e, - 0x34, 0x2c, 0xee, 0x7d, 0xb9, 0xe3, 0xfc, 0xa9, - 0xba, 0x9e, 0xdb, 0x9d, 0x5f, 0x0f, 0xd3, 0x4c, - 0xb2, 0x42, 0x44, 0x32, 0x2f, 0xbe, 0x56, 0x8b, - 0x9f, 0x3a, 0x46, 0x27, 0x60, 0xcb, 0x40, 0x6e, - 0x09, 0x64, 0xa0, 0xcb, 0x93, 0x17, 0x13, 0x27, - 0x4a, 0x36, 0x18, 0xdd, 0x15, 0xc0, 0xe2, 0x74, - 0xfb, 0xb4, 0xc5, 0xec, 0x71, 0x60, 0x92, 0xa5, - 0x7f, 0x91, 0x88, 0xac, 0x04, 0x6a, 0x2d, 0xb2, - 0xdb, 0x6e, 0x03, 0xcd, 0x86, 0xd1, 0x36, 0x34, - 0xc7, 0x80, 0x0e, 0xa0, 0xd2, 0xd1, 0xb7, 0x0a, - 0xa8, 0x07, 0xce, 0x59, 0xf4, 0xd7, 0x67, 0xf1, - 0x33, 0x15, 0xf8, 0x32, 0x8b, 0x2c, 0x6b, 0x06, - 0x44, 0x24, 0x04, 0xbc, 0x92, 0x1e, 0x73, 0x2a, - 0x70, 0x18, 0x78, 0x41, 0x55, 0xbb, 0x9d, 0x7a, - 0x59, 0xbf, 0x46, 0x55, 0x35, 0x01, 0xec, 0x30, - 0xba, 0x97, 0x89, 0xc8, 0x4c, 0xe0, 0x4a, 0x36, - 0x3b, 0x8f, 0xb0, 0x12, 0x10, 0x91, 0x22, 0xe0, - 0x00, 0xb0, 0x19, 0x98, 0x47, 0x6a, 0x12, 0x9f, - 0x01, 0x9e, 0x36, 0x75, 0xc7, 0xda, 0x0f, 0x98, - 0x33, 0x17, 0x03, 0xb6, 0x01, 0x66, 0x79, 0xf9, - 0xc5, 0x88, 0x12, 0x4a, 0x1f, 0x0a, 0xec, 0x00, - 0x16, 0x18, 0xa2, 0x04, 0xd0, 0x68, 0xea, 0x8f, - 0x4a, 0x40, 0x55, 0x9b, 0x80, 0x13, 0xe6, 0x18, - 0xa4, 0x36, 0x2e, 0xb9, 0x80, 0x2d, 0x03, 0x9b, - 0xb0, 0xcc, 0x34, 0xf0, 0xa9, 0xaa, 0x9e, 0x34, - 0x3b, 0xdd, 0xec, 0xc8, 0x0e, 0x78, 0x8d, 0xca, - 0x03, 0x86, 0x11, 0x10, 0x91, 0x25, 0xc0, 0x5a, - 0x8b, 0xde, 0x25, 0xe0, 0x2d, 0x9b, 0x03, 0x37, - 0x04, 0x1a, 0xbc, 0xc7, 0xe5, 0x1a, 0x83, 0x25, - 0x24, 0x22, 0xe3, 0x81, 0x2d, 0x59, 0xf4, 0xd6, - 0xaa, 0xea, 0x75, 0x9b, 0xc0, 0x0d, 0x81, 0x5f, - 0x7d, 0x04, 0xe6, 0x16, 0xce, 0x13, 0x8c, 0x8d, - 0xa4, 0x8e, 0x6a, 0x4c, 0x7c, 0xa3, 0xaa, 0xdf, - 0x66, 0x73, 0xe0, 0x86, 0xc0, 0x49, 0xa0, 0x7b, - 0x4c, 0x2d, 0x7f, 0x98, 0x0f, 0x20, 0x22, 0xf3, - 0x81, 0x35, 0x16, 0x79, 0x3f, 0x59, 0x4a, 0x27, - 0x83, 0x90, 0x9b, 0xb3, 0x51, 0x11, 0x51, 0xec, - 0xdb, 0xc1, 0xa0, 0xe8, 0x06, 0x9e, 0x02, 0x3e, - 0x23, 0xb5, 0xd6, 0x9b, 0xd8, 0xa2, 0xaa, 0xaf, - 0x8d, 0xe6, 0xc0, 0xed, 0xb1, 0xca, 0x25, 0x8f, - 0x81, 0xb9, 0x45, 0x29, 0x70, 0x08, 0x7b, 0xf0, - 0x7d, 0xc0, 0xbb, 0x63, 0x39, 0xf8, 0xaf, 0x09, - 0x8c, 0x86, 0x9d, 0xaa, 0x3a, 0xe6, 0x86, 0xc7, - 0x2d, 0x81, 0xc0, 0xdf, 0xed, 0x3e, 0xf0, 0x81, - 0x1b, 0x25, 0xb7, 0x04, 0x9a, 0x02, 0x04, 0xe2, - 0x07, 0x87, 0x54, 0xf5, 0xb8, 0x1b, 0x45, 0xb7, - 0x04, 0x0e, 0x32, 0x72, 0x13, 0x73, 0x27, 0xb1, - 0xd3, 0xad, 0xa2, 0x2b, 0x02, 0xaa, 0x7a, 0x03, - 0x38, 0xe2, 0x3b, 0x1c, 0x6f, 0x48, 0x90, 0xba, - 0x5b, 0x70, 0x05, 0x2f, 0x87, 0xbb, 0xdf, 0x79, - 0x8f, 0xc5, 0x17, 0x7e, 0x56, 0xd5, 0x76, 0xb7, - 0xca, 0x5e, 0x08, 0x7c, 0x02, 0x58, 0x5f, 0xe7, - 0x39, 0xc4, 0x05, 0xe0, 0x25, 0x2f, 0x06, 0xae, - 0x09, 0xa4, 0xcb, 0xe8, 0x23, 0xaf, 0x11, 0x79, - 0xc0, 0x45, 0x60, 0x81, 0xaa, 0x9e, 0xf5, 0x62, - 0xe4, 0xf5, 0x7e, 0xe0, 0x43, 0x72, 0x70, 0x92, - 0x60, 0xc1, 0x65, 0x60, 0xa1, 0xaa, 0x9e, 0xf1, - 0x6a, 0xe8, 0x89, 0x80, 0xaa, 0x76, 0x02, 0x5b, - 0xbd, 0x0e, 0x32, 0x06, 0xda, 0x48, 0xcd, 0xfc, - 0x29, 0x3f, 0xc6, 0x7e, 0x6e, 0x68, 0x36, 0x01, - 0xb9, 0xba, 0x5c, 0x3e, 0x0b, 0xcc, 0xb3, 0x6d, - 0x54, 0xdc, 0xc2, 0x33, 0x01, 0x55, 0x6d, 0x25, - 0x75, 0x8d, 0x1a, 0x14, 0x09, 0x60, 0x95, 0xaa, - 0xda, 0x0e, 0x08, 0x5c, 0xc3, 0xef, 0x3d, 0xf1, - 0xb6, 0x20, 0x83, 0xa6, 0xd1, 0xa2, 0xaa, 0xbf, - 0x04, 0x75, 0xe2, 0x97, 0x40, 0xe0, 0x81, 0x19, - 0xb9, 0xd7, 0xf6, 0x05, 0xbf, 0x04, 0x3a, 0x73, - 0x30, 0xb6, 0xef, 0xba, 0x77, 0xc2, 0x2f, 0x81, - 0xc0, 0x27, 0x6a, 0xe4, 0x68, 0x97, 0xe7, 0x8b, - 0x40, 0xfa, 0xd0, 0x2b, 0xe8, 0xc7, 0x9d, 0x79, - 0x59, 0xe8, 0x0b, 0x41, 0xfe, 0xec, 0x11, 0xf4, - 0x60, 0x36, 0x11, 0xd0, 0x1e, 0x80, 0x7f, 0x01, - 0xb6, 0x0f, 0x73, 0x65, 0xf5, 0x45, 0xca, 0xbe, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0x93, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, - 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, - 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, - 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x31, - 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, - 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, - 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, - 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, - 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, - 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4c, 0x65, 0x66, 0x74, 0x20, 0x74, 0x68, - 0x75, 0x6d, 0x62, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, - 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, 0x74, 0x20, - 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, - 0x74, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, - 0x74, 0x20, 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, - 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, - 0x69, 0x67, 0x68, 0x74, 0x20, 0x74, 0x68, 0x75, - 0x6d, 0x62, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, - 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x52, 0x69, 0x67, 0x68, 0x74, 0x20, - 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x69, 0x67, - 0x68, 0x74, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x20, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, - 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x69, - 0x67, 0x68, 0x74, 0x20, 0x6c, 0x69, 0x74, 0x74, - 0x6c, 0x65, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, - 0x72, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, - 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, - 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, - 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x73, - 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x20, 0x46, 0x69, 0x6e, - 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, - 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x2d, 0x75, 0x73, 0x65, 0x72, 0x73, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, - 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, - 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, - 0x62, 0x6f, 0x78, 0x37, 0x34, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, - 0x6b, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2d, 0x69, 0x6e, 0x66, 0x6f, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, - 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x74, - 0x72, 0x6f, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x54, 0x6f, 0x20, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, - 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x20, 0x6c, - 0x6f, 0x67, 0x69, 0x6e, 0x2c, 0x20, 0x79, 0x6f, - 0x75, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x74, - 0x6f, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x6f, - 0x6e, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x79, 0x6f, - 0x75, 0x72, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, - 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x73, 0x2c, - 0x20, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x41, 0x63, 0x6d, 0x65, 0x20, - 0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x20, 0x35, - 0x30, 0x30, 0x30, 0x2e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x76, 0x62, 0x6f, 0x78, 0x37, 0x30, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x69, 0x67, 0x68, - 0x74, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x66, 0x74, - 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, - 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x33, 0x2d, 0x68, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, - 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, - 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x33, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4f, 0x74, 0x68, - 0x65, 0x72, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, - 0x72, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, - 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, - 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x72, 0x61, 0x64, - 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, - 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x69, 0x6e, - 0x67, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x62, - 0x6f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, - 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, - 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, - 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, - 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x32, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, - 0x72, 0x6f, 0x6c, 0x6c, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x49, 0x6e, 0x20, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x73, - 0x61, 0x76, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x72, - 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x79, - 0x6f, 0x75, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, - 0x74, 0x6f, 0x20, 0x73, 0x77, 0x69, 0x70, 0x65, - 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x74, 0x68, - 0x75, 0x6d, 0x62, 0x20, 0x6f, 0x6e, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x22, 0x41, 0x63, 0x6d, 0x65, - 0x20, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x22, - 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x72, 0x6f, 0x6c, - 0x6c, 0x5f, 0x68, 0x62, 0x6f, 0x78, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x74, - 0x6f, 0x70, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, - 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, - 0x7a, 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, - 0x61, 0x67, 0x65, 0x32, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, - 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, - 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, - 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, - 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x6f, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, - 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x34, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, - 0x74, 0x6b, 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, - 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, - 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, - 0x6e, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x33, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x59, 0x6f, 0x75, 0x72, 0x20, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, - 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, - 0x75, 0x6c, 0x6c, 0x79, 0x20, 0x73, 0x61, 0x76, - 0x65, 0x64, 0x2e, 0x20, 0x59, 0x6f, 0x75, 0x20, - 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6e, - 0x6f, 0x77, 0x20, 0x62, 0x65, 0x20, 0x61, 0x62, - 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, - 0x67, 0x20, 0x69, 0x6e, 0x20, 0x75, 0x73, 0x69, - 0x6e, 0x67, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x20, 0x72, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, - 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, - 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, - 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x69, - 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x62, - 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x61, 0x64, - 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, 0x2f, - 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x33, 0x2d, 0x68, 0x62, 0x6f, 0x78, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, - 0x61, 0x79, 0x29, 0x6c, 0x65, 0x66, 0x74, 0x2d, - 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x2d, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, - 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xcb, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x48, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xc5, 0x99, 0x5b, - 0x6c, 0x54, 0x45, 0x18, 0xc7, 0x7f, 0x67, 0x2f, - 0xdd, 0x76, 0xa1, 0x05, 0x2c, 0x94, 0x16, 0x30, - 0x04, 0x48, 0x29, 0x97, 0x07, 0x3e, 0xb9, 0xc4, - 0x90, 0x80, 0x0a, 0xc4, 0x18, 0x11, 0x4d, 0xaa, - 0x89, 0xc4, 0x00, 0x1a, 0x89, 0x31, 0x1a, 0x1e, - 0x4d, 0x7c, 0x55, 0x13, 0x13, 0x42, 0x34, 0x06, - 0x24, 0x26, 0x12, 0xc5, 0x07, 0x2f, 0x11, 0x4d, - 0x14, 0xef, 0x89, 0x0f, 0x98, 0x34, 0x05, 0x15, - 0xa4, 0x75, 0x48, 0xb8, 0xc8, 0x2d, 0x54, 0x29, - 0xa5, 0x5c, 0x0a, 0x94, 0xd2, 0x76, 0x4f, 0x77, - 0xbb, 0xeb, 0xc3, 0x6e, 0x9b, 0xc3, 0xec, 0x9c, - 0xed, 0xb9, 0x2c, 0xf0, 0x7f, 0xd9, 0x99, 0xf9, - 0xfe, 0xf3, 0xcd, 0xf7, 0x9f, 0x99, 0x73, 0x76, - 0xe6, 0x3b, 0x56, 0x2e, 0x97, 0xa3, 0x5c, 0x58, - 0xbc, 0xd7, 0x9a, 0x4c, 0x65, 0x7c, 0x67, 0x2c, - 0x9e, 0x68, 0x8c, 0x58, 0xd1, 0xaa, 0x6c, 0x26, - 0xdd, 0x3d, 0x9c, 0x1e, 0x7a, 0xbf, 0x6d, 0x5d, - 0xfa, 0xfb, 0xb2, 0x0d, 0xa2, 0xc1, 0x2a, 0x97, - 0x80, 0x07, 0x7e, 0x8c, 0x2e, 0xb1, 0x12, 0x15, - 0x5f, 0xd7, 0xcf, 0x5a, 0x34, 0xbb, 0xf2, 0xc4, - 0x24, 0x62, 0xe9, 0x38, 0xd5, 0xcb, 0x2a, 0xe9, - 0xe8, 0x6a, 0xbb, 0xda, 0x7b, 0xbd, 0xeb, 0xd3, - 0xc3, 0x8f, 0x0f, 0xbe, 0x56, 0x96, 0x81, 0x34, - 0x94, 0x45, 0xc0, 0xe2, 0xbd, 0x56, 0x24, 0x9b, - 0x8c, 0xb7, 0x35, 0xcc, 0x5b, 0x2a, 0xf1, 0x1f, - 0x6a, 0xf8, 0x6f, 0x77, 0x37, 0x00, 0x4d, 0xeb, - 0xe7, 0x30, 0xed, 0xc5, 0x5a, 0x8e, 0x9e, 0x6f, - 0xe9, 0xe9, 0xe9, 0x3e, 0xfb, 0x4c, 0xfb, 0x93, - 0x99, 0x96, 0xd0, 0x83, 0x69, 0x88, 0x04, 0xe9, - 0x24, 0x22, 0x13, 0x45, 0x64, 0xa1, 0x88, 0x58, - 0x00, 0xb9, 0x78, 0xf4, 0xd5, 0x8a, 0x86, 0xa9, - 0xf3, 0x27, 0xc7, 0xea, 0xe8, 0x6d, 0xe9, 0x1f, - 0xe5, 0x5d, 0x6a, 0xbd, 0xca, 0xb4, 0xf8, 0x0c, - 0x1a, 0xa7, 0x3f, 0x58, 0x1b, 0x4f, 0x24, 0xb7, - 0x3a, 0xfa, 0xaf, 0x16, 0x91, 0xaf, 0x44, 0xe4, - 0xf5, 0xbb, 0x2e, 0x40, 0x44, 0x9a, 0x80, 0x6e, - 0xe0, 0x28, 0xf0, 0x0e, 0x40, 0x2e, 0x6a, 0x3d, - 0x5a, 0x5d, 0x53, 0x97, 0xa8, 0x89, 0x4e, 0xc4, - 0xbe, 0x3a, 0x34, 0xca, 0x4d, 0xf7, 0x67, 0xa8, - 0x8b, 0xd6, 0x33, 0x29, 0x56, 0x4b, 0xa2, 0x6a, - 0x7c, 0xdd, 0xe2, 0xbd, 0x56, 0x4c, 0x44, 0xa6, - 0x03, 0x3f, 0x01, 0xcf, 0x02, 0xdb, 0x44, 0x64, - 0xf9, 0x5d, 0x15, 0x00, 0xac, 0x07, 0x12, 0x85, - 0xf2, 0x26, 0x80, 0x5c, 0x2c, 0x52, 0x5b, 0x11, - 0xa9, 0x24, 0x91, 0x49, 0x90, 0xea, 0xb5, 0x47, - 0x89, 0xf6, 0x80, 0x4d, 0x4d, 0x64, 0x02, 0xc9, - 0x48, 0x92, 0x64, 0x72, 0x52, 0x0d, 0x30, 0x0b, - 0x58, 0x07, 0x54, 0x39, 0xfc, 0x35, 0x04, 0x0b, - 0x3d, 0x8f, 0x20, 0x02, 0x62, 0x8e, 0x72, 0x9d, - 0x88, 0xcc, 0xb1, 0x86, 0xb3, 0xfd, 0x16, 0x16, - 0x43, 0x3d, 0x69, 0x70, 0x3c, 0x52, 0x99, 0x74, - 0x86, 0x6c, 0x26, 0x87, 0x45, 0x84, 0x74, 0x6a, - 0x60, 0x10, 0xb8, 0x08, 0x3c, 0xa1, 0xf9, 0x1b, - 0x22, 0x04, 0x82, 0x08, 0xd0, 0xfb, 0x2c, 0xb7, - 0xb2, 0xb9, 0xa3, 0xa9, 0xd4, 0x4d, 0x06, 0xfb, - 0x53, 0x45, 0xe4, 0xeb, 0x7d, 0xd7, 0xb0, 0x73, - 0x29, 0x6c, 0xbb, 0xef, 0x46, 0xf6, 0xad, 0x45, - 0x36, 0xb0, 0x46, 0xa3, 0xdc, 0x73, 0x01, 0x4b, - 0x2d, 0x7b, 0x78, 0x6b, 0x5f, 0x67, 0xc7, 0xd9, - 0x5b, 0xa9, 0xbe, 0x22, 0xf2, 0xa5, 0x5b, 0xdd, - 0x74, 0x5c, 0x3b, 0x96, 0xb2, 0x53, 0xfd, 0x7b, - 0x80, 0x79, 0x40, 0x52, 0xa3, 0x0c, 0x04, 0x88, - 0xc1, 0x35, 0x18, 0x2f, 0x18, 0xd6, 0xea, 0x4d, - 0xed, 0xcd, 0xb9, 0x9e, 0x4c, 0x6a, 0x70, 0x47, - 0xe7, 0xb9, 0xe3, 0x37, 0x74, 0xf2, 0xa9, 0xcb, - 0x47, 0x32, 0xa7, 0x3b, 0x0e, 0xb4, 0x0d, 0xdb, - 0xa9, 0x6d, 0xc0, 0x22, 0x83, 0xbf, 0x8b, 0x01, - 0x62, 0x18, 0x85, 0x51, 0x80, 0x88, 0x8c, 0x13, - 0x91, 0xcd, 0x22, 0xb2, 0xda, 0x60, 0xd6, 0x83, - 0x9c, 0x0b, 0xf0, 0xf7, 0xda, 0xf4, 0xce, 0x81, - 0x83, 0xe9, 0xed, 0x3a, 0xf9, 0x44, 0xfb, 0xc1, - 0x5f, 0x53, 0x03, 0x37, 0x1f, 0x69, 0x6f, 0xce, - 0x65, 0x01, 0x31, 0xf8, 0xbb, 0xe0, 0x37, 0x68, - 0x27, 0xdc, 0x56, 0xe0, 0x0d, 0x60, 0x37, 0xb0, - 0x4f, 0x44, 0xf4, 0x87, 0xee, 0xba, 0x56, 0x9f, - 0x29, 0x22, 0x15, 0x00, 0xb9, 0x43, 0xf7, 0x1d, - 0xd7, 0x1d, 0x0d, 0x7d, 0x56, 0xbf, 0xbd, 0xbd, - 0x39, 0x97, 0x29, 0x54, 0xf5, 0x15, 0xe8, 0x51, - 0x4a, 0x15, 0x3f, 0x38, 0x3e, 0xe0, 0x26, 0x60, - 0x82, 0xa3, 0xac, 0x1f, 0x01, 0x74, 0x01, 0x51, - 0x60, 0x76, 0xa1, 0x5c, 0x45, 0x31, 0xc6, 0x3b, - 0xca, 0xba, 0x80, 0x50, 0xb3, 0x0f, 0xee, 0x02, - 0xba, 0x1c, 0xe5, 0x87, 0x45, 0xe4, 0x7e, 0x47, - 0x5d, 0x17, 0x00, 0x85, 0x6d, 0x44, 0x09, 0x01, - 0x22, 0xd2, 0x00, 0x4c, 0xd1, 0x6c, 0x9d, 0x5e, - 0x82, 0x2c, 0x05, 0x37, 0x01, 0x17, 0x34, 0xce, - 0x06, 0x47, 0xfd, 0x9a, 0x81, 0x3f, 0x22, 0x20, - 0x6a, 0xb0, 0x8d, 0xac, 0xc0, 0xc2, 0x31, 0xc6, - 0x09, 0x04, 0x37, 0x01, 0xa7, 0xb5, 0xfa, 0x26, - 0x47, 0xd9, 0xb4, 0x02, 0xf3, 0x0b, 0xbf, 0x26, - 0x01, 0xe3, 0x0a, 0xbf, 0x73, 0x0d, 0xb6, 0x50, - 0x6f, 0x20, 0x70, 0x17, 0xf0, 0x27, 0x30, 0xe8, - 0xa8, 0x2f, 0x10, 0x91, 0x25, 0x8e, 0x41, 0x33, - 0x1a, 0x7f, 0x59, 0x09, 0x7f, 0x23, 0x2b, 0xd0, - 0x64, 0xb0, 0x0d, 0x1a, 0xda, 0x7c, 0xc1, 0x28, - 0x40, 0x29, 0x65, 0x03, 0xfb, 0xb5, 0xe6, 0xe7, - 0x0b, 0xb6, 0x0c, 0x70, 0x4e, 0xb3, 0x2d, 0x14, - 0x91, 0x6a, 0x4a, 0x6f, 0x21, 0xd3, 0x0a, 0x84, - 0x7a, 0x03, 0x41, 0xe9, 0x3f, 0xb2, 0x7d, 0x5a, - 0xfd, 0x39, 0x11, 0x19, 0x39, 0x07, 0x9d, 0x31, - 0xf8, 0x59, 0x4a, 0x69, 0x01, 0xa6, 0x15, 0xb8, - 0xab, 0x02, 0xa6, 0x00, 0x8f, 0x15, 0xca, 0xfa, - 0x33, 0x02, 0xf0, 0x10, 0x50, 0x6f, 0x68, 0x5f, - 0x23, 0x22, 0x1b, 0x80, 0x99, 0x06, 0x9b, 0x6d, - 0x68, 0xf3, 0x85, 0x58, 0x09, 0x5b, 0x3b, 0x70, - 0x09, 0x98, 0xea, 0x68, 0xdb, 0x08, 0xfc, 0x0c, - 0xfc, 0x6b, 0xe0, 0xbf, 0xe9, 0xe2, 0xa7, 0x11, - 0xf8, 0xdc, 0xc5, 0xe6, 0xba, 0x02, 0x85, 0xcb, - 0xd2, 0xcb, 0x85, 0x31, 0x1b, 0x81, 0xdf, 0x81, - 0x17, 0x94, 0x52, 0xb7, 0x1d, 0xb8, 0x5c, 0x57, - 0x40, 0x29, 0x95, 0x05, 0xbe, 0xd4, 0x9a, 0x9f, - 0x16, 0x91, 0x05, 0xc0, 0x65, 0xb7, 0x7e, 0x3e, - 0x61, 0x14, 0x20, 0x22, 0x49, 0xf2, 0x3b, 0xe0, - 0x43, 0x60, 0x05, 0xf9, 0x49, 0x6c, 0x06, 0x9e, - 0xd2, 0xb9, 0x63, 0x1d, 0xe6, 0xf4, 0x99, 0xab, - 0x00, 0xbe, 0x00, 0xb6, 0xf9, 0x8d, 0xd4, 0x05, - 0x45, 0x5b, 0x48, 0x44, 0xa2, 0xe4, 0x27, 0x6e, - 0x95, 0x66, 0xca, 0x02, 0x87, 0x75, 0x7e, 0x49, - 0x01, 0x4a, 0xa9, 0x36, 0xe0, 0x1f, 0x7d, 0x0c, - 0x60, 0x9a, 0xaf, 0x30, 0xdd, 0x61, 0x5a, 0x81, - 0x1d, 0x18, 0x66, 0x1a, 0xf8, 0x58, 0x29, 0x75, - 0x52, 0x6f, 0xf4, 0x72, 0x9c, 0xd6, 0x1f, 0xe6, - 0x72, 0xe2, 0x36, 0x01, 0x85, 0x83, 0xe3, 0x16, - 0x03, 0xaf, 0x0b, 0x30, 0x26, 0x00, 0xbc, 0x08, - 0xf8, 0xcb, 0x7f, 0x5c, 0x9e, 0x31, 0xba, 0x85, - 0x44, 0x64, 0x02, 0xb0, 0xcb, 0x85, 0xb7, 0x45, - 0x29, 0xd5, 0x6b, 0x32, 0x78, 0x11, 0x70, 0x28, - 0x40, 0x60, 0x5e, 0x31, 0xc3, 0x51, 0x7e, 0x17, - 0x98, 0x6e, 0xe0, 0x7c, 0xa3, 0x94, 0xfa, 0xce, - 0xcd, 0x81, 0x17, 0x01, 0x27, 0x81, 0xe2, 0xbb, - 0x62, 0x79, 0xb0, 0x12, 0x40, 0x44, 0x56, 0x02, - 0x2f, 0x19, 0xec, 0x69, 0x5c, 0xb6, 0xce, 0x08, - 0x3c, 0x65, 0xe6, 0x44, 0x44, 0x61, 0xbe, 0x0e, - 0x86, 0x45, 0x1f, 0xb0, 0x16, 0xf8, 0x84, 0xfc, - 0xbb, 0x5e, 0xc7, 0x2e, 0xa5, 0xd4, 0x2b, 0xa5, - 0x1c, 0x78, 0xbd, 0x13, 0x77, 0x8d, 0x4d, 0x09, - 0x84, 0x6a, 0xa0, 0x15, 0x73, 0xf0, 0x43, 0xc0, - 0xdb, 0x63, 0x39, 0xb8, 0xd7, 0x02, 0x4a, 0x61, - 0x8f, 0x52, 0x6a, 0xcc, 0x0b, 0x8f, 0x57, 0x01, - 0xa1, 0xcf, 0xed, 0x01, 0xf0, 0x9e, 0x17, 0x92, - 0x57, 0x01, 0x6d, 0x21, 0x02, 0x09, 0x82, 0x56, - 0xa5, 0xd4, 0x11, 0x2f, 0x44, 0xaf, 0x02, 0x7e, - 0xa3, 0xf8, 0x12, 0x73, 0x27, 0xb1, 0xc7, 0x2b, - 0xd1, 0x93, 0x00, 0xa5, 0xd4, 0x4d, 0xe0, 0x8f, - 0xc0, 0xe1, 0xf8, 0x43, 0x16, 0xf8, 0xd6, 0x2b, - 0xd9, 0x4f, 0x66, 0xee, 0x8e, 0x7d, 0x26, 0xd2, - 0xd0, 0xa2, 0x94, 0xea, 0xf6, 0x4a, 0xf6, 0x23, - 0xe0, 0x23, 0xc0, 0xf8, 0x77, 0x5e, 0x46, 0x9c, - 0x07, 0x36, 0xfb, 0xe9, 0xe0, 0x59, 0x40, 0x61, - 0x1b, 0x7d, 0xe0, 0x37, 0x22, 0x1f, 0xb8, 0x00, - 0xac, 0x52, 0x4a, 0x75, 0xf8, 0xe9, 0xe4, 0x37, - 0xb9, 0xbb, 0x9d, 0x32, 0x64, 0x12, 0x0c, 0xb8, - 0x08, 0xac, 0x56, 0x4a, 0x9d, 0xf5, 0xdb, 0xd1, - 0x97, 0x00, 0xa5, 0xd4, 0x15, 0xf2, 0x39, 0xd3, - 0x72, 0xa2, 0x93, 0xfc, 0xcc, 0x9f, 0x0a, 0xd2, - 0x39, 0x48, 0x7a, 0x7d, 0x07, 0xb7, 0x7d, 0x87, - 0x09, 0x85, 0x0e, 0x60, 0x85, 0xe9, 0xa2, 0xe2, - 0x15, 0xbe, 0x05, 0x28, 0xa5, 0xce, 0x00, 0xbf, - 0x04, 0x1d, 0xd0, 0x81, 0x2c, 0xb0, 0x51, 0x29, - 0x65, 0x4a, 0x10, 0x78, 0x46, 0xa0, 0xcf, 0xac, - 0xe4, 0xef, 0xc5, 0x61, 0x71, 0x4c, 0x29, 0x75, - 0x20, 0xac, 0x93, 0xa0, 0x02, 0x42, 0x0f, 0x4c, - 0xf1, 0x5d, 0x3b, 0x10, 0x82, 0x0a, 0xb8, 0x52, - 0x86, 0xb1, 0x03, 0xef, 0x7b, 0x27, 0x82, 0x0a, - 0x08, 0x9d, 0x51, 0xa3, 0x4c, 0xb7, 0xbc, 0x40, - 0x02, 0x0a, 0x49, 0xaf, 0xb0, 0x87, 0x3b, 0xfd, - 0x63, 0x61, 0x20, 0x04, 0x5d, 0x01, 0x08, 0x9f, - 0x98, 0xcd, 0x86, 0xec, 0x0f, 0xc0, 0xff, 0xde, - 0x5e, 0x95, 0xe6, 0x34, 0x65, 0xd9, 0xd5, 0x00, - 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, - 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, - 0x61, 0x79, 0x29, 0x6f, 0x72, 0x67, 0x2f, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x6c, 0x65, 0x66, 0x74, - 0x2d, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x2e, 0x70, - 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x65, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x5b, - 0x6c, 0x94, 0x45, 0x14, 0xc7, 0x7f, 0xdb, 0x6d, - 0xb7, 0x94, 0xb6, 0x2c, 0x95, 0x72, 0x29, 0x2d, - 0xad, 0x29, 0x72, 0xb1, 0x78, 0x39, 0xa4, 0x85, - 0x40, 0x14, 0xbc, 0x00, 0x92, 0x20, 0x12, 0x62, - 0x0c, 0x8a, 0xa0, 0x06, 0x43, 0x24, 0xbe, 0xc2, - 0x0b, 0x2f, 0xc6, 0x0b, 0x4f, 0xa0, 0xf1, 0xf2, - 0xe0, 0x8b, 0xc6, 0xcb, 0x03, 0x55, 0x9e, 0xbc, - 0x45, 0x40, 0x22, 0x90, 0x08, 0x18, 0x8b, 0x58, - 0x3c, 0x06, 0x35, 0x16, 0x4a, 0x40, 0x4b, 0x4b, - 0xb9, 0x14, 0x04, 0x6a, 0x4b, 0xb7, 0xed, 0xae, - 0x0f, 0xbb, 0x5b, 0xa6, 0xb3, 0xdf, 0x6e, 0xbf, - 0xef, 0xdb, 0x6d, 0x8c, 0xff, 0x97, 0x9d, 0x33, - 0xe7, 0xcc, 0xcc, 0xf9, 0x7f, 0x67, 0x66, 0xbe, - 0x99, 0xf3, 0x6d, 0x20, 0x16, 0x8b, 0xf1, 0x7f, - 0x46, 0x7e, 0xae, 0x3b, 0x14, 0x91, 0x20, 0xf0, - 0x08, 0x30, 0x06, 0xd8, 0xad, 0xaa, 0x91, 0x5c, - 0x8f, 0x61, 0x22, 0x6f, 0x14, 0xfa, 0xdc, 0x0c, - 0xec, 0x01, 0x3e, 0x03, 0x5e, 0x1b, 0x85, 0xfe, - 0x87, 0xc1, 0x57, 0x04, 0x44, 0x64, 0x3c, 0x50, - 0x09, 0xfc, 0xae, 0xaa, 0xf6, 0x1c, 0x5c, 0x6b, - 0x94, 0x9f, 0x00, 0xb6, 0x3a, 0xb4, 0x7f, 0x18, - 0xd8, 0x04, 0x34, 0xab, 0xea, 0x0e, 0x3f, 0x3e, - 0x24, 0xe1, 0x39, 0x02, 0x22, 0x32, 0x0b, 0xe8, - 0x04, 0x7e, 0x05, 0x5e, 0x77, 0x30, 0xa9, 0x32, - 0xca, 0x61, 0x87, 0xf6, 0x95, 0xc0, 0xd7, 0xc0, - 0x1a, 0x60, 0xbb, 0x88, 0x2c, 0xf4, 0xea, 0x83, - 0x09, 0x3f, 0x53, 0xe8, 0x49, 0xa0, 0x30, 0x51, - 0x7e, 0xc6, 0x72, 0xae, 0x10, 0x28, 0x37, 0xaa, - 0xc6, 0x39, 0xb4, 0x5f, 0x09, 0x14, 0x19, 0x72, - 0x85, 0x0f, 0x1f, 0x86, 0xe0, 0x87, 0x80, 0x39, - 0xed, 0x26, 0x89, 0xc8, 0x74, 0x43, 0x9e, 0x0a, - 0x04, 0x0c, 0x39, 0x94, 0x20, 0x65, 0xe2, 0x51, - 0x4b, 0xce, 0x6a, 0x91, 0xfb, 0x21, 0x60, 0xb7, - 0x31, 0xa7, 0x80, 0xd3, 0x13, 0x1f, 0xaa, 0x13, - 0x91, 0x02, 0x60, 0x89, 0xa5, 0xff, 0xcf, 0x09, - 0x34, 0x18, 0xe5, 0x22, 0x52, 0x51, 0x62, 0x94, - 0x67, 0x03, 0x63, 0x2d, 0x7d, 0x8f, 0x0f, 0x1f, - 0xd2, 0x3a, 0xe3, 0x06, 0x83, 0x96, 0x3c, 0xcb, - 0x28, 0xdb, 0xce, 0x01, 0x14, 0x1b, 0xe5, 0x7b, - 0x1d, 0xf4, 0xe7, 0x7d, 0xf8, 0x30, 0x04, 0xc7, - 0x6d, 0x54, 0x44, 0x8a, 0x89, 0x2f, 0xd6, 0xb3, - 0xaa, 0x7a, 0xd0, 0x52, 0xff, 0x6d, 0xc9, 0x33, - 0x8d, 0xf2, 0x48, 0x11, 0x10, 0x07, 0x7d, 0xfb, - 0x48, 0x4e, 0x66, 0x42, 0xba, 0x08, 0xbc, 0x0c, - 0x7c, 0x00, 0x1c, 0x10, 0x11, 0x7b, 0xd1, 0x5d, - 0xb5, 0xe4, 0x1a, 0x11, 0x09, 0x25, 0xca, 0x4e, - 0x11, 0x30, 0x09, 0xd8, 0x11, 0xe8, 0x52, 0xd5, - 0x9b, 0xae, 0x3c, 0x4d, 0x83, 0x74, 0x04, 0xcc, - 0xfd, 0x7b, 0x8b, 0xa5, 0xb3, 0x09, 0x04, 0x81, - 0xda, 0x44, 0x79, 0xa4, 0x08, 0xd8, 0x04, 0xb2, - 0x7a, 0xfa, 0x90, 0x9e, 0x40, 0x87, 0x51, 0x7e, - 0x40, 0x44, 0xa6, 0x19, 0xb2, 0x4d, 0x00, 0x6e, - 0x4d, 0xa3, 0xb4, 0x04, 0x44, 0xa4, 0x02, 0x98, - 0x68, 0xe9, 0xce, 0xb9, 0x71, 0x32, 0x13, 0xd2, - 0x11, 0x68, 0xb7, 0x6c, 0xd6, 0x19, 0xf2, 0x15, - 0x07, 0xfb, 0x24, 0x81, 0xa0, 0x83, 0x2e, 0x19, - 0x81, 0x39, 0x23, 0x8c, 0xe3, 0x0b, 0xe9, 0x08, - 0x9c, 0xb2, 0x64, 0xf3, 0x8d, 0xeb, 0x14, 0x81, - 0x3b, 0x13, 0xbf, 0x4e, 0x04, 0x92, 0xbb, 0xd0, - 0x4c, 0x07, 0x5d, 0x56, 0x3b, 0x10, 0xa4, 0x27, - 0xd0, 0x04, 0xf4, 0x1a, 0x72, 0x9d, 0x88, 0xd4, - 0x1b, 0x83, 0x0e, 0x58, 0xf6, 0xf3, 0x32, 0xf4, - 0x97, 0x8c, 0xc0, 0x2c, 0x07, 0x5d, 0xaf, 0x43, - 0x9d, 0x27, 0x38, 0x12, 0x50, 0xd5, 0x3e, 0xe0, - 0x88, 0x55, 0xfd, 0x6c, 0x42, 0x37, 0x00, 0x9c, - 0xb1, 0x74, 0x73, 0x44, 0xa4, 0x94, 0xcc, 0x53, - 0xc8, 0x29, 0x02, 0x69, 0x77, 0xa0, 0xfa, 0x3d, - 0xf9, 0x1b, 0xea, 0xf7, 0x8e, 0xd9, 0x3f, 0xff, - 0xdb, 0xd2, 0xe3, 0xf3, 0xf6, 0x8e, 0xdd, 0x5f, - 0xbf, 0x27, 0xb4, 0xc1, 0xc9, 0x2e, 0xd3, 0x71, - 0xfa, 0x00, 0xb0, 0xcc, 0x90, 0xd7, 0x8a, 0xc8, - 0x96, 0x04, 0x81, 0x56, 0x60, 0x86, 0xa1, 0xcb, - 0x23, 0xfe, 0x46, 0xce, 0x44, 0xc0, 0x29, 0x02, - 0x29, 0x04, 0x1a, 0xde, 0x0b, 0x14, 0x0c, 0x56, - 0x06, 0x3f, 0x29, 0x99, 0x5c, 0xb9, 0xac, 0x62, - 0x72, 0x5d, 0xb8, 0x34, 0x58, 0x4a, 0x2c, 0x16, - 0xa5, 0xe3, 0x42, 0x4b, 0x43, 0xc3, 0xde, 0x31, - 0x2b, 0x68, 0xeb, 0x7b, 0xfa, 0xa7, 0x17, 0x62, - 0xfd, 0xe6, 0xc0, 0x99, 0x08, 0x98, 0x98, 0x08, - 0x2c, 0x4f, 0x94, 0xed, 0x35, 0x02, 0xb0, 0x18, - 0x98, 0xe2, 0x50, 0xbf, 0x44, 0x44, 0xd6, 0x01, - 0x35, 0x0e, 0xba, 0x3e, 0xbb, 0x62, 0x70, 0x6a, - 0xfe, 0xab, 0x45, 0xd5, 0xd5, 0xab, 0x6a, 0x2a, - 0x24, 0x5c, 0x1d, 0xba, 0x9d, 0xea, 0x82, 0x5a, - 0x6a, 0x42, 0xd3, 0xb9, 0xab, 0xf2, 0xbe, 0x70, - 0x55, 0xcd, 0xdc, 0x55, 0x54, 0x86, 0x5e, 0x32, - 0xed, 0x33, 0x11, 0x38, 0x0e, 0x5c, 0xb0, 0xea, - 0xd6, 0x27, 0x7e, 0xff, 0x74, 0xb0, 0x7f, 0x85, - 0xf8, 0x6d, 0xcc, 0xc6, 0x0c, 0x60, 0x67, 0x9a, - 0xb1, 0x86, 0x45, 0xe0, 0x9e, 0xdd, 0x81, 0xb2, - 0x68, 0x51, 0xf0, 0xa9, 0x89, 0xe3, 0x6b, 0x42, - 0x93, 0x82, 0x53, 0xe8, 0xfe, 0x26, 0xc2, 0xd1, - 0xcd, 0xca, 0xbe, 0x35, 0x87, 0x38, 0xb9, 0xad, - 0x8d, 0xea, 0xa2, 0xba, 0x50, 0xe1, 0xd8, 0x71, - 0xeb, 0xe6, 0x7e, 0x11, 0x18, 0x3f, 0x22, 0x01, - 0x55, 0x8d, 0x02, 0x9f, 0x5a, 0xd5, 0x8f, 0x8b, - 0x48, 0x1d, 0x70, 0x31, 0x5d, 0x3b, 0x8f, 0x18, - 0x46, 0x20, 0x38, 0xc0, 0xc2, 0x82, 0x09, 0x65, - 0x55, 0xa5, 0xfd, 0x61, 0x4e, 0x6c, 0x6d, 0xa5, - 0xe9, 0xad, 0x66, 0x3a, 0x4e, 0x74, 0xd2, 0x73, - 0xb5, 0x97, 0xbf, 0x8e, 0xb4, 0x73, 0xf3, 0xe8, - 0x20, 0xe5, 0xe5, 0xb5, 0xd3, 0x02, 0xc1, 0x5b, - 0x27, 0xe0, 0x91, 0x0e, 0x73, 0x3b, 0x2d, 0x39, - 0x04, 0x34, 0x02, 0xdb, 0x73, 0xe3, 0xbf, 0x35, - 0x85, 0x0a, 0xf2, 0x1f, 0x2c, 0x2c, 0x1c, 0x57, - 0xd0, 0xbe, 0xa3, 0x8b, 0x4b, 0xda, 0x35, 0x4c, - 0x15, 0xc8, 0x0b, 0x50, 0x39, 0x7b, 0x2a, 0xe1, - 0x92, 0x49, 0x05, 0x79, 0xc1, 0xd0, 0xe2, 0x64, - 0x7d, 0x46, 0x02, 0xaa, 0xda, 0x0c, 0xfc, 0x61, - 0x55, 0x0b, 0xf1, 0x8b, 0x4b, 0x2e, 0x90, 0xb2, - 0x88, 0x23, 0x1f, 0x87, 0xb8, 0xda, 0x74, 0x23, - 0xc5, 0x70, 0xc1, 0x63, 0xf3, 0x99, 0x50, 0x7d, - 0x1b, 0xf9, 0xd6, 0xbe, 0xe3, 0xe6, 0x38, 0x6d, - 0x2f, 0xe6, 0x5c, 0x62, 0x18, 0x81, 0xd8, 0xe7, - 0x53, 0xfe, 0xe9, 0xdf, 0x97, 0xba, 0x91, 0x95, - 0x95, 0x97, 0xb1, 0xfc, 0xc5, 0xa5, 0x0c, 0xc4, - 0xfa, 0xe9, 0xee, 0xb9, 0xdc, 0x1f, 0x1d, 0x8c, - 0x1c, 0x4a, 0xea, 0xdc, 0x64, 0x25, 0x8e, 0x65, - 0xef, 0x67, 0x5a, 0x0c, 0x4d, 0x21, 0x11, 0x09, - 0x13, 0x98, 0xb0, 0xc9, 0xc9, 0x68, 0xf5, 0x96, - 0x95, 0xf4, 0x14, 0x75, 0xd3, 0x1d, 0xb9, 0xc1, - 0x85, 0xcb, 0xad, 0x6d, 0xb1, 0x41, 0x7e, 0x48, - 0xea, 0xdc, 0x44, 0xe0, 0xc7, 0x1c, 0x38, 0x9a, - 0x0e, 0x66, 0x06, 0xe3, 0x0d, 0x62, 0xa9, 0x17, - 0xfc, 0x3b, 0x16, 0xd7, 0x12, 0x5e, 0x58, 0x4c, - 0xe7, 0x40, 0x07, 0xa7, 0xba, 0x34, 0xd2, 0xdb, - 0x7d, 0xbd, 0xf1, 0xe7, 0xd5, 0xb1, 0xa1, 0x3b, - 0x89, 0x1b, 0x02, 0x2d, 0x40, 0xea, 0xa4, 0xcc, - 0x0d, 0x16, 0x01, 0x88, 0xc8, 0x22, 0x60, 0xa3, - 0xad, 0x0c, 0xe4, 0x07, 0xa8, 0xdd, 0x58, 0xc5, - 0x99, 0xc8, 0x69, 0x8e, 0x9d, 0xdb, 0x77, 0xad, - 0xe5, 0xcc, 0xe1, 0xaf, 0xa2, 0xed, 0x3d, 0xdb, - 0x86, 0xd9, 0xb8, 0xc9, 0x8d, 0x8a, 0x88, 0xe2, - 0x7c, 0x1d, 0xcc, 0x16, 0x37, 0x80, 0x15, 0xc0, - 0x87, 0x0c, 0x7f, 0xb3, 0x03, 0x10, 0xbc, 0xbb, - 0xbb, 0xbd, 0xf8, 0xb9, 0xeb, 0x17, 0x07, 0x06, - 0x22, 0x57, 0xa2, 0xd1, 0xbe, 0xc6, 0xa6, 0x15, - 0xbd, 0x1f, 0xd9, 0x36, 0x6e, 0x33, 0x73, 0x1d, - 0x8c, 0x0e, 0x81, 0x52, 0xe0, 0x70, 0x1a, 0x5d, - 0x64, 0xf0, 0x44, 0xc9, 0x82, 0x43, 0x4b, 0x5b, - 0x33, 0xde, 0x19, 0xdc, 0x5e, 0xea, 0x3b, 0x46, - 0x36, 0xc9, 0x39, 0x76, 0xa9, 0xea, 0x88, 0x17, - 0x1e, 0xb7, 0x04, 0xb2, 0x3e, 0xb7, 0xfb, 0xc0, - 0x9b, 0x6e, 0x8c, 0xdc, 0x12, 0x68, 0xce, 0xc2, - 0x11, 0x3f, 0x38, 0xac, 0xaa, 0xbf, 0xb8, 0x31, - 0x74, 0x4b, 0xe0, 0x20, 0xa9, 0x97, 0x98, 0xd1, - 0xc4, 0x2e, 0xb7, 0x86, 0xae, 0x08, 0xa8, 0xea, - 0x75, 0xb8, 0xf5, 0xf2, 0x18, 0x65, 0x44, 0x89, - 0x7f, 0x5b, 0x70, 0x05, 0x2f, 0x99, 0xb9, 0x2f, - 0xbd, 0xfb, 0xe2, 0x0b, 0xdf, 0xa9, 0x6a, 0xa7, - 0x5b, 0x63, 0x2f, 0x04, 0xde, 0x07, 0xae, 0x79, - 0xf7, 0xc7, 0x13, 0xda, 0x80, 0xe7, 0xbd, 0x34, - 0x70, 0x4d, 0x20, 0x31, 0x8d, 0xde, 0xf5, 0xea, - 0x91, 0x07, 0xb4, 0x03, 0x0f, 0xa9, 0xea, 0x59, - 0x2f, 0x8d, 0xbc, 0x26, 0x77, 0xdf, 0x26, 0x07, - 0x99, 0x04, 0x07, 0x9c, 0x07, 0x1e, 0x56, 0xd5, - 0xd3, 0x5e, 0x1b, 0x7a, 0x22, 0xa0, 0xaa, 0x97, - 0x88, 0xe7, 0x4c, 0x73, 0x89, 0x73, 0xc4, 0x9f, - 0xfc, 0x49, 0x3f, 0x8d, 0xfd, 0xa4, 0xd7, 0xdf, - 0x01, 0x72, 0xf5, 0x71, 0xf9, 0x2c, 0x70, 0xbf, - 0xaa, 0xb6, 0xf8, 0xed, 0xc0, 0x33, 0x01, 0x55, - 0x6d, 0x25, 0xfe, 0x19, 0x35, 0x5b, 0x44, 0x81, - 0xf5, 0xaa, 0xea, 0x94, 0x20, 0x70, 0x0d, 0xbf, - 0xdf, 0x89, 0x1b, 0xb3, 0x19, 0x34, 0x81, 0xdf, - 0x54, 0xf5, 0xfb, 0x6c, 0x3b, 0xf1, 0x4b, 0x20, - 0xeb, 0x81, 0x49, 0xbd, 0x6b, 0xfb, 0x82, 0x5f, - 0x02, 0x97, 0x72, 0x30, 0xb6, 0xef, 0x79, 0x6f, - 0xc2, 0x2f, 0x81, 0x94, 0x8c, 0x9a, 0x0f, 0xe4, - 0xe4, 0x96, 0xe7, 0x8b, 0x40, 0x22, 0xe9, 0x95, - 0xed, 0xe1, 0xce, 0xfe, 0x58, 0xe8, 0x0b, 0xd9, - 0xfc, 0xd9, 0x23, 0xab, 0x6f, 0x5b, 0xc4, 0x77, - 0xa1, 0xac, 0xf1, 0x2f, 0x72, 0xb4, 0x70, 0x1f, - 0xbc, 0xbf, 0xb5, 0x7f, 0x00, 0x00, 0x00, 0x00, - 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x72, 0x69, 0x6e, - 0x67, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, - 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, - 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x65, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x99, 0x5b, - 0x6c, 0x54, 0x55, 0x14, 0x86, 0xbf, 0x33, 0x97, - 0xb6, 0x4c, 0x5b, 0x4a, 0x0d, 0xe5, 0x56, 0x08, - 0x84, 0xa6, 0x20, 0xa0, 0xb2, 0x40, 0x79, 0xd0, - 0x80, 0x06, 0x48, 0x54, 0xc0, 0x10, 0x51, 0x24, - 0x10, 0x50, 0x12, 0x22, 0x6a, 0xc2, 0x9b, 0x26, - 0xc6, 0x27, 0xf5, 0xc1, 0x17, 0x8c, 0x31, 0x68, - 0x62, 0x22, 0x51, 0x7c, 0x51, 0x03, 0xc6, 0x80, - 0x68, 0xc0, 0x17, 0xac, 0x11, 0x91, 0x4b, 0xb8, - 0x6e, 0x13, 0x48, 0x8a, 0xdc, 0x2b, 0xa5, 0xb4, - 0xdc, 0x99, 0x42, 0xdb, 0xb9, 0x1d, 0x1f, 0xe6, - 0x4c, 0x73, 0xe6, 0xb0, 0xcf, 0xcc, 0xb9, 0x0c, - 0x1a, 0xff, 0x97, 0xd9, 0x7b, 0xaf, 0x7f, 0xed, - 0xbd, 0xfe, 0xb3, 0xf6, 0xb9, 0xac, 0x3d, 0x86, - 0x69, 0x9a, 0xfc, 0x9f, 0x11, 0xf3, 0x43, 0x5e, - 0xf6, 0xbd, 0x11, 0x3d, 0x95, 0x88, 0xae, 0x8a, - 0x44, 0x63, 0x8b, 0x23, 0x18, 0x89, 0x6c, 0x36, - 0xf3, 0x8b, 0x99, 0xce, 0x6c, 0x3a, 0xf6, 0xbc, - 0x79, 0xb3, 0xc0, 0x11, 0x91, 0x28, 0xf0, 0x34, - 0x50, 0x03, 0xec, 0x54, 0x4a, 0xa5, 0x2a, 0x1c, - 0x73, 0x11, 0x3c, 0x0b, 0x98, 0xf9, 0x93, 0x31, - 0xc6, 0xac, 0x8b, 0x6f, 0x6f, 0x18, 0x33, 0x41, - 0x46, 0x0c, 0x9b, 0x10, 0xaf, 0x89, 0xd6, 0x92, - 0xec, 0xed, 0x79, 0xb6, 0xab, 0xe3, 0xf8, 0xeb, - 0x33, 0x7f, 0x88, 0xaf, 0x3e, 0xba, 0x24, 0xbd, - 0xdf, 0xa2, 0xbe, 0x09, 0x7c, 0x68, 0xb5, 0xd7, - 0x03, 0xef, 0x54, 0x3a, 0x68, 0x3b, 0x22, 0x5e, - 0x89, 0xb9, 0xea, 0xd8, 0xb6, 0xe1, 0x93, 0x1f, - 0x99, 0xd5, 0xd2, 0x34, 0x23, 0x3e, 0x2e, 0xd3, - 0x42, 0x53, 0xd7, 0x68, 0xa6, 0x34, 0xce, 0x62, - 0xfa, 0x43, 0x8b, 0x5a, 0x6b, 0x86, 0xd6, 0x7f, - 0x3d, 0x63, 0xbb, 0x31, 0xcc, 0xa2, 0xae, 0xb0, - 0xb9, 0x2d, 0xd5, 0xcd, 0x25, 0x22, 0xf3, 0x44, - 0xe4, 0x3b, 0x11, 0x79, 0x3b, 0x4c, 0xf0, 0xe0, - 0x51, 0xc0, 0x8c, 0x1d, 0xb1, 0xb5, 0xf1, 0x91, - 0x4d, 0xd3, 0x46, 0x54, 0x37, 0x53, 0x7f, 0xb9, - 0x91, 0xdf, 0x96, 0x1f, 0xa4, 0x6d, 0xed, 0x3e, - 0x3a, 0x37, 0x5d, 0x65, 0x6c, 0x7c, 0x3c, 0x2d, - 0x13, 0x9f, 0x68, 0x89, 0xd4, 0xd4, 0x7c, 0x6a, - 0xd1, 0xc7, 0xda, 0x5c, 0x1b, 0x34, 0xc1, 0x37, - 0x03, 0x3b, 0x80, 0x65, 0xc0, 0x7a, 0x11, 0x79, - 0xfc, 0xbe, 0x0b, 0x30, 0x63, 0xc6, 0xd2, 0x86, - 0xc6, 0xe6, 0xba, 0xc6, 0x68, 0x23, 0xb7, 0x7e, - 0xbf, 0x43, 0x36, 0x9d, 0x05, 0xe0, 0xcc, 0xae, - 0x73, 0x8c, 0x88, 0x8d, 0x62, 0x64, 0x62, 0x1c, - 0xd5, 0xf1, 0xc4, 0xc3, 0x22, 0x52, 0x0d, 0x0c, - 0xb7, 0xb9, 0x0e, 0xd5, 0x4c, 0xf7, 0x1c, 0x30, - 0xc4, 0xd6, 0x1f, 0x1d, 0x34, 0x78, 0xf0, 0x2c, - 0x20, 0xf2, 0x40, 0x8d, 0x31, 0x84, 0x84, 0x51, - 0x4b, 0x55, 0xae, 0x6a, 0x70, 0xbc, 0xf7, 0xc6, - 0x1d, 0xcc, 0xcb, 0x06, 0xb5, 0x91, 0x3a, 0xaa, - 0xaa, 0x87, 0x34, 0x46, 0x46, 0xf5, 0x4d, 0x04, - 0x0c, 0x9b, 0x6b, 0x95, 0x25, 0xca, 0x8e, 0x45, - 0x8e, 0x7e, 0xa8, 0x9b, 0xdc, 0xdb, 0x3d, 0x60, - 0x92, 0x8d, 0x18, 0x11, 0xa2, 0x46, 0x0c, 0xc3, - 0x2c, 0x76, 0xe9, 0x3e, 0xd1, 0x43, 0x8c, 0x18, - 0xa6, 0x49, 0x36, 0x77, 0x33, 0x9e, 0xd0, 0x78, - 0x0f, 0x66, 0x41, 0x44, 0xe2, 0xc0, 0x7c, 0x87, - 0xfd, 0xfe, 0x0b, 0x88, 0x64, 0x72, 0xd7, 0xb2, - 0xb9, 0x0c, 0x19, 0x33, 0x4d, 0x26, 0x97, 0x2e, - 0xb2, 0x75, 0xb4, 0x5f, 0x24, 0x6d, 0xa6, 0xc8, - 0xa4, 0xfa, 0xaf, 0xd3, 0x1f, 0x8b, 0x6b, 0xdc, - 0xeb, 0x6c, 0xed, 0x07, 0x01, 0xa7, 0xc8, 0xbb, - 0xbe, 0x22, 0x76, 0xc6, 0xe6, 0x89, 0x95, 0x66, - 0xc3, 0xcd, 0xee, 0x0b, 0xd7, 0x7a, 0x73, 0x49, - 0x52, 0xc6, 0x40, 0x91, 0xa9, 0xa7, 0xa3, 0x87, - 0xce, 0xdb, 0x67, 0xd3, 0xe9, 0xd4, 0xdd, 0x36, - 0x4d, 0x70, 0x00, 0xb5, 0xb6, 0xf6, 0x74, 0x8d, - 0xbd, 0xcb, 0x6b, 0xb0, 0x3a, 0x68, 0x05, 0x88, - 0x48, 0xad, 0x88, 0xac, 0x11, 0x91, 0x79, 0x00, - 0xc7, 0x16, 0xa7, 0x77, 0xf5, 0x5f, 0xed, 0x39, - 0xd0, 0x95, 0x3c, 0x9f, 0x49, 0x25, 0xfa, 0x8b, - 0xb8, 0x57, 0x3b, 0xae, 0xd3, 0x7e, 0x76, 0xf7, - 0xc9, 0xbb, 0xbd, 0x7d, 0xef, 0x52, 0x7c, 0x73, - 0x16, 0x60, 0xcf, 0x80, 0x68, 0xec, 0x9d, 0x01, - 0x63, 0x07, 0xdc, 0x33, 0xf0, 0x1e, 0xb0, 0x09, - 0x68, 0x13, 0x91, 0x45, 0x00, 0xb7, 0x8d, 0xd4, - 0x8b, 0x9d, 0xa7, 0x0f, 0x6f, 0xed, 0xec, 0x6d, - 0xef, 0xb5, 0x13, 0xfb, 0xba, 0xfb, 0xcd, 0xe4, - 0x99, 0x81, 0x05, 0xc7, 0x5f, 0x32, 0x53, 0xe8, - 0x33, 0x60, 0x17, 0xe0, 0xcc, 0xc0, 0x35, 0xa5, - 0x54, 0x3f, 0x21, 0xe0, 0x26, 0xc0, 0xfe, 0xfc, - 0x7e, 0x0b, 0xe0, 0xd4, 0x02, 0x73, 0xe0, 0xd0, - 0xc2, 0xbe, 0xe5, 0xc9, 0xbd, 0x99, 0xe2, 0x37, - 0xab, 0x89, 0x11, 0xd9, 0xd8, 0x5a, 0x08, 0xb2, - 0x5c, 0x06, 0x9c, 0x02, 0x42, 0x5d, 0x7d, 0x70, - 0x17, 0x70, 0xc9, 0xd6, 0x7e, 0x4a, 0x44, 0xc6, - 0x0d, 0xf6, 0x2e, 0xd4, 0x9e, 0xd0, 0xf0, 0x27, - 0x59, 0xbf, 0xae, 0x02, 0x44, 0x64, 0x34, 0xd0, - 0xe4, 0xb0, 0x5d, 0xf4, 0x16, 0xa6, 0x3b, 0xdc, - 0x04, 0x74, 0x3a, 0x38, 0x2b, 0x6d, 0xfd, 0xeb, - 0x1a, 0x7e, 0x41, 0x40, 0x54, 0x63, 0x2b, 0x64, - 0x60, 0x5a, 0x99, 0x75, 0x02, 0xc1, 0x4d, 0xc0, - 0x29, 0x47, 0xff, 0x65, 0x5b, 0xfb, 0x86, 0x86, - 0x3f, 0xc5, 0xfa, 0xd5, 0x09, 0x28, 0x3c, 0x85, - 0x26, 0x69, 0x6c, 0xa1, 0x9e, 0x40, 0xe0, 0x2e, - 0xe0, 0x00, 0xd0, 0x67, 0xeb, 0x4f, 0x15, 0x91, - 0x47, 0x6d, 0x8b, 0x66, 0x1c, 0xfc, 0x59, 0x25, - 0xe6, 0x2b, 0x64, 0x60, 0xb2, 0xc6, 0xd6, 0xa7, - 0x19, 0xf3, 0x05, 0xad, 0x00, 0xa5, 0xd4, 0x00, - 0xf0, 0x87, 0x63, 0xf8, 0x15, 0xcb, 0x96, 0x01, - 0xce, 0x39, 0x6c, 0xd3, 0x44, 0xa4, 0x9e, 0xd2, - 0x5b, 0x48, 0x97, 0x81, 0x50, 0x4f, 0x20, 0x28, - 0xfd, 0x22, 0x6b, 0x73, 0xf4, 0x57, 0x88, 0x48, - 0xa1, 0x7e, 0x38, 0xad, 0x99, 0xe7, 0x31, 0x4a, - 0x0b, 0xd0, 0x65, 0xe0, 0x5f, 0x15, 0xd0, 0x04, - 0x3c, 0x63, 0xb5, 0x9d, 0xf7, 0x08, 0xc0, 0x93, - 0xc0, 0x28, 0xcd, 0xf8, 0x7c, 0x11, 0x59, 0x09, - 0x8c, 0xd7, 0xd8, 0x06, 0x34, 0x63, 0xbe, 0x50, - 0xaa, 0x22, 0x3b, 0x0a, 0x74, 0x03, 0x23, 0x6d, - 0x63, 0xab, 0x80, 0x9d, 0xc0, 0x05, 0x0d, 0xff, - 0x7d, 0x97, 0x79, 0x5a, 0x81, 0x6f, 0x5c, 0x6c, - 0xae, 0x19, 0x10, 0x11, 0x03, 0x78, 0xcd, 0x5a, - 0xb3, 0x15, 0xd8, 0x07, 0xac, 0x56, 0x4a, 0x25, - 0xed, 0x3c, 0xd7, 0x0c, 0x28, 0xa5, 0x72, 0xc0, - 0x66, 0xc7, 0xf0, 0x0b, 0x22, 0x32, 0x15, 0xe8, - 0x71, 0xf3, 0xf3, 0x09, 0xad, 0x00, 0x11, 0x49, - 0x90, 0xdf, 0x01, 0x9f, 0x03, 0xb3, 0xc9, 0x5f, - 0xc4, 0x25, 0xc0, 0x62, 0x27, 0xb7, 0xdc, 0xc7, - 0x9c, 0xf3, 0xca, 0x55, 0x01, 0xdf, 0x92, 0xaf, - 0x75, 0x2b, 0x81, 0x7b, 0xb6, 0x90, 0x75, 0x28, - 0xb0, 0x19, 0x98, 0xeb, 0x30, 0xe5, 0x80, 0xc3, - 0x4e, 0x7e, 0x49, 0x01, 0x4a, 0xa9, 0x23, 0x40, - 0xbb, 0x73, 0x0d, 0x60, 0x8c, 0xaf, 0x30, 0xdd, - 0xa1, 0xcb, 0xc0, 0x27, 0x68, 0xae, 0x34, 0xf0, - 0xa5, 0x52, 0xea, 0xa4, 0x73, 0xd0, 0xcb, 0xe7, - 0xb4, 0xf3, 0x66, 0xae, 0x24, 0x8a, 0x04, 0x58, - 0x1f, 0x8e, 0xeb, 0x34, 0xbc, 0x4b, 0x80, 0xf6, - 0x00, 0xc0, 0x8b, 0x80, 0x43, 0xfe, 0xe3, 0xf2, - 0x8c, 0xc1, 0x2d, 0x24, 0x22, 0x0d, 0xc0, 0x46, - 0x17, 0xde, 0x3a, 0xa5, 0xd4, 0x2d, 0x9d, 0xc1, - 0x8b, 0x80, 0x83, 0x01, 0x02, 0xf3, 0x0a, 0xfb, - 0x09, 0xc6, 0x47, 0x40, 0xb3, 0x86, 0xb3, 0x55, - 0x29, 0xb5, 0xdd, 0x6d, 0x02, 0x2f, 0x02, 0x4e, - 0x02, 0xc9, 0xb2, 0xac, 0x60, 0x98, 0x03, 0x20, - 0x22, 0x73, 0x80, 0x57, 0x35, 0xf6, 0x34, 0x2e, - 0x5b, 0xa7, 0x00, 0xc3, 0xcb, 0xd9, 0xa8, 0x88, - 0x28, 0xf4, 0xe5, 0x60, 0x58, 0x24, 0x81, 0x85, - 0xc0, 0x57, 0xe4, 0x9f, 0xf5, 0x4e, 0x6c, 0x54, - 0x4a, 0xbd, 0x51, 0x6a, 0x02, 0xaf, 0x27, 0x73, - 0x97, 0xca, 0x53, 0x02, 0xa1, 0x1e, 0xd8, 0x83, - 0x3e, 0xf8, 0x14, 0xf0, 0x41, 0xb9, 0x09, 0xfe, - 0x6b, 0x01, 0xa5, 0xb0, 0x45, 0x29, 0x55, 0xb6, - 0xe0, 0xf1, 0x2a, 0x20, 0xf4, 0x77, 0x7b, 0x00, - 0x7c, 0xec, 0x85, 0xe4, 0x55, 0xc0, 0x91, 0x10, - 0x81, 0x04, 0xc1, 0x1e, 0xa5, 0xd4, 0x9f, 0x5e, - 0x88, 0x5e, 0x05, 0xfc, 0xca, 0xbd, 0x45, 0xcc, - 0xfd, 0xc4, 0x16, 0xaf, 0x44, 0x4f, 0x02, 0x94, - 0x52, 0xb7, 0x81, 0xfd, 0x65, 0x89, 0x95, 0x41, - 0x0e, 0xd8, 0xe6, 0x95, 0xec, 0xf9, 0xff, 0x01, - 0xe0, 0x47, 0xff, 0xb1, 0x04, 0xc2, 0x6e, 0xa5, - 0xd4, 0x65, 0xaf, 0x64, 0x3f, 0x02, 0xbe, 0x00, - 0xb4, 0xaf, 0xf3, 0x0a, 0xe2, 0x6f, 0x60, 0x8d, - 0x1f, 0x07, 0xcf, 0x02, 0xac, 0x6d, 0xf4, 0x99, - 0xdf, 0x88, 0x7c, 0xa0, 0x13, 0x98, 0xab, 0x94, - 0x3a, 0xef, 0xc7, 0xc9, 0x4f, 0x06, 0x00, 0x36, - 0x50, 0x81, 0x93, 0x04, 0x0d, 0xba, 0x80, 0x79, - 0x4a, 0xa9, 0x33, 0x7e, 0x1d, 0x7d, 0x09, 0x50, - 0x4a, 0x5d, 0x21, 0x7f, 0x66, 0x5a, 0x49, 0x5c, - 0x24, 0x7f, 0xe5, 0xff, 0x0a, 0xe2, 0xec, 0x37, - 0x03, 0x90, 0x2f, 0x38, 0x2a, 0xf5, 0xe7, 0xf2, - 0x79, 0x60, 0xb6, 0xae, 0x50, 0xf1, 0x0a, 0xdf, - 0x02, 0x94, 0x52, 0xa7, 0x81, 0x9f, 0x83, 0x2e, - 0x68, 0x43, 0x0e, 0x58, 0xa5, 0x94, 0xd2, 0x1d, - 0x10, 0x78, 0x46, 0x90, 0x0c, 0x40, 0xbe, 0x2e, - 0x0e, 0x8b, 0x13, 0x4a, 0xa9, 0xbd, 0x61, 0x27, - 0x09, 0x2a, 0x20, 0xf4, 0xc2, 0xdc, 0x5b, 0x6b, - 0x07, 0x42, 0x50, 0x01, 0x57, 0x2a, 0xb0, 0x76, - 0xe0, 0x7d, 0x6f, 0x47, 0x50, 0x01, 0xa1, 0x4f, - 0xd4, 0xa8, 0x50, 0x95, 0x17, 0x48, 0x80, 0x75, - 0xe8, 0x15, 0xf6, 0xe3, 0x2e, 0x1b, 0xd2, 0x1f, - 0x08, 0x9e, 0x01, 0x08, 0x7f, 0x30, 0x9b, 0x0b, - 0xe9, 0x0f, 0xc0, 0x3f, 0x48, 0x26, 0x8d, 0xc1, - 0x5b, 0x1e, 0x56, 0xe4, 0x00, 0x00, 0x00, 0x00, - 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x2d, 0x66, 0x69, 0x6e, 0x67, - 0x65, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, - 0xe2, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x5f, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x59, - 0x6c, 0x54, 0x55, 0x18, 0xc7, 0x7f, 0xb3, 0xb4, - 0x74, 0xa3, 0xa5, 0x2c, 0x6d, 0x91, 0x22, 0xb2, - 0xa9, 0x51, 0x92, 0x7e, 0x44, 0x0c, 0xd1, 0x08, - 0x48, 0x8c, 0x2f, 0x60, 0x5c, 0x12, 0x50, 0x0c, - 0x41, 0x21, 0x01, 0x8d, 0xcb, 0x8b, 0x4f, 0x3c, - 0x10, 0x12, 0x43, 0x8c, 0xc6, 0x2d, 0xd1, 0x07, - 0x0c, 0x62, 0x7c, 0x50, 0x30, 0x18, 0xe5, 0x41, - 0x25, 0x41, 0x83, 0x22, 0x11, 0x8c, 0x86, 0xb2, - 0xe4, 0x23, 0x62, 0x28, 0x94, 0xb6, 0x54, 0xa1, - 0xb5, 0xec, 0x30, 0xb5, 0x9d, 0xb6, 0xd3, 0xb9, - 0x3e, 0xf4, 0x0e, 0xde, 0xb9, 0x73, 0x66, 0xb9, - 0x77, 0x6e, 0x31, 0xfe, 0x5f, 0xee, 0x99, 0x6f, - 0x3b, 0xdf, 0x7f, 0xee, 0x37, 0xe7, 0x9c, 0xef, - 0xb4, 0x21, 0xcb, 0xb2, 0xf8, 0x3f, 0x23, 0x5a, - 0x8c, 0x73, 0xd3, 0xae, 0xd0, 0xf4, 0x48, 0xa4, - 0x74, 0x5d, 0x38, 0x1c, 0xbd, 0x07, 0x2b, 0xd9, - 0x69, 0x0d, 0x26, 0xb6, 0x1d, 0x79, 0x6c, 0xe8, - 0x80, 0xd3, 0x46, 0x44, 0x4a, 0x81, 0xa5, 0x40, - 0x1c, 0xd8, 0xa3, 0xaa, 0xc3, 0xc5, 0xcc, 0xe9, - 0x86, 0x6f, 0x02, 0xb2, 0x3b, 0xba, 0xa6, 0xb4, - 0x6a, 0xec, 0xa6, 0xfa, 0xa9, 0x77, 0x37, 0xd6, - 0x96, 0xd7, 0x93, 0x4c, 0x24, 0x38, 0xdf, 0xd3, - 0xb2, 0x6c, 0xde, 0xb7, 0xe5, 0x3b, 0x67, 0xf4, - 0xc6, 0x5f, 0xf8, 0x62, 0xb9, 0x95, 0x4a, 0x74, - 0x13, 0xb0, 0xde, 0x1e, 0x6f, 0x00, 0x5e, 0x2f, - 0x36, 0x69, 0x27, 0x7c, 0x11, 0x90, 0x6f, 0x43, - 0x73, 0xc3, 0x55, 0xd5, 0x6f, 0xdc, 0x3a, 0x63, - 0x7e, 0xbd, 0xf5, 0x4d, 0x29, 0x97, 0x5a, 0xfa, - 0x98, 0xb6, 0xa4, 0x91, 0x86, 0xb9, 0x8d, 0xb5, - 0x6d, 0x55, 0xc7, 0x9e, 0x69, 0x3f, 0x73, 0xb4, - 0x07, 0xd8, 0x68, 0x9b, 0x2f, 0x73, 0xb8, 0xae, - 0xc4, 0x45, 0x40, 0x44, 0x42, 0xc0, 0x5d, 0x40, - 0x97, 0xaa, 0x5e, 0xf1, 0x9a, 0x4b, 0xd8, 0x0f, - 0x01, 0x2b, 0x14, 0xdd, 0x3c, 0x61, 0xea, 0xed, - 0xf5, 0x55, 0x67, 0x6a, 0x68, 0xdf, 0x7a, 0x96, - 0xae, 0xfd, 0xe7, 0x69, 0xde, 0xa8, 0x8c, 0xbb, - 0x38, 0x91, 0x99, 0x13, 0x9a, 0xc6, 0x94, 0x55, - 0xd4, 0x3c, 0x3d, 0xe7, 0xcb, 0xd0, 0x78, 0xdb, - 0xbc, 0xc6, 0xe1, 0x7a, 0x8b, 0x21, 0xdc, 0xdb, - 0xc0, 0x71, 0xa0, 0x5b, 0x44, 0xee, 0xf0, 0x9a, - 0x8b, 0x67, 0x02, 0x4d, 0x7b, 0x42, 0x95, 0xa1, - 0xf2, 0x92, 0xc9, 0x35, 0x25, 0xe3, 0x29, 0xbd, - 0x52, 0x7e, 0x43, 0x3e, 0x3c, 0x94, 0x24, 0x76, - 0xa8, 0x8f, 0x09, 0x91, 0x49, 0xd4, 0xd5, 0xcd, - 0x9e, 0x36, 0xa6, 0x34, 0xb2, 0xc8, 0x56, 0x55, - 0x3b, 0xdc, 0xc7, 0x89, 0x48, 0x39, 0xe9, 0x58, - 0x65, 0x3f, 0xc7, 0x00, 0x4f, 0x79, 0xcd, 0xc7, - 0x33, 0x81, 0x92, 0x7e, 0xe6, 0x84, 0xcb, 0x2b, - 0x6b, 0xcb, 0x43, 0xe5, 0x54, 0x44, 0x2b, 0xd3, - 0x74, 0x7f, 0x36, 0x77, 0x31, 0x36, 0x5c, 0x4d, - 0x6d, 0x65, 0x43, 0x94, 0xd2, 0xe8, 0x42, 0x11, - 0x29, 0x03, 0x4a, 0x5d, 0x21, 0x1a, 0x52, 0x03, - 0x11, 0x99, 0x09, 0xd4, 0x39, 0x74, 0x9e, 0x4b, - 0xda, 0x33, 0x81, 0x64, 0x92, 0x78, 0x08, 0x86, - 0x22, 0xa1, 0x08, 0xd1, 0x68, 0xfa, 0x7c, 0x6d, - 0x47, 0xdb, 0x09, 0x0f, 0x87, 0xc1, 0x82, 0x70, - 0x32, 0xd4, 0x07, 0x54, 0x19, 0x42, 0x38, 0x4b, - 0xea, 0xbe, 0x62, 0xf3, 0xf1, 0xec, 0x30, 0x98, - 0xe0, 0x44, 0xb2, 0x3f, 0x7e, 0x3d, 0x61, 0x25, - 0xa0, 0x24, 0x99, 0xae, 0x8b, 0x0f, 0x72, 0xa1, - 0xf3, 0x22, 0xb1, 0xbf, 0xcf, 0xc7, 0x87, 0xe2, - 0xf1, 0xfd, 0x40, 0xa5, 0x21, 0x44, 0x85, 0x63, - 0x3c, 0xaf, 0xd8, 0x7c, 0x3c, 0x3b, 0x1c, 0x5f, - 0x6e, 0x0d, 0xd2, 0x17, 0x3f, 0x19, 0x1b, 0xbc, - 0x4a, 0x62, 0xdc, 0x50, 0x86, 0xfe, 0xdc, 0xe9, - 0x2e, 0xba, 0xbb, 0x5b, 0x3a, 0x6a, 0x63, 0xfc, - 0x84, 0x99, 0x80, 0x53, 0x36, 0xdb, 0xa5, 0xf3, - 0xbc, 0x47, 0xf8, 0x5b, 0x85, 0x7a, 0x13, 0xeb, - 0x7a, 0x3a, 0x8e, 0x75, 0xc6, 0x6a, 0xae, 0x66, - 0xe8, 0x4e, 0x1d, 0xfe, 0x6d, 0xa0, 0x7f, 0xa0, - 0xf7, 0xcd, 0x7d, 0xab, 0xad, 0x38, 0xe9, 0xdf, - 0x76, 0x0a, 0xb9, 0x08, 0x64, 0x04, 0x14, 0x91, - 0x45, 0x22, 0xb2, 0x56, 0x44, 0xc6, 0x9a, 0x72, - 0xf1, 0x45, 0x40, 0x97, 0x5b, 0xe7, 0x92, 0xf1, - 0x6b, 0x8f, 0x9f, 0x68, 0xfd, 0xae, 0x25, 0x52, - 0x15, 0x4a, 0x3b, 0x8b, 0x5c, 0x3f, 0x32, 0xd0, - 0x7e, 0x78, 0x69, 0xff, 0x27, 0x86, 0x64, 0x53, - 0xa8, 0xb0, 0x13, 0x8b, 0x02, 0xd3, 0x5d, 0xba, - 0xb4, 0x7d, 0x40, 0x44, 0x96, 0x00, 0xfb, 0x80, - 0x8f, 0x80, 0x57, 0x4d, 0xb9, 0xf8, 0x22, 0x00, - 0xd0, 0xbc, 0xc4, 0xd2, 0xb2, 0xae, 0xd8, 0xdc, - 0xe1, 0xa1, 0xe1, 0x0e, 0xa7, 0xdc, 0xba, 0x52, - 0x32, 0xd1, 0xf1, 0x31, 0x57, 0x09, 0xdd, 0x46, - 0xe6, 0xaa, 0xe3, 0xde, 0xc8, 0x5e, 0x01, 0x42, - 0xf6, 0xb8, 0x1a, 0x03, 0x7c, 0x13, 0x00, 0xd8, - 0xb7, 0xda, 0x8a, 0x33, 0x10, 0x3e, 0xe9, 0x12, - 0x4f, 0x12, 0x91, 0xc9, 0xf6, 0xd8, 0x54, 0x42, - 0x29, 0xd9, 0x2c, 0x83, 0xee, 0x06, 0x01, 0x11, - 0x69, 0x00, 0x16, 0x3b, 0x74, 0x7f, 0x99, 0x72, - 0x28, 0x8a, 0x80, 0x8d, 0xb3, 0x06, 0xd9, 0x1c, - 0xfb, 0x69, 0xaa, 0xdb, 0x88, 0xfd, 0x74, 0xd7, - 0x3f, 0xc0, 0x65, 0xc7, 0x78, 0x85, 0xc3, 0x16, - 0xa0, 0xdb, 0x34, 0x79, 0x10, 0x04, 0x4c, 0x81, - 0x53, 0x47, 0x82, 0x5c, 0x04, 0xee, 0x34, 0xe8, - 0x9c, 0x25, 0xb4, 0xda, 0xa5, 0x6b, 0x33, 0x4d, - 0x1e, 0x04, 0x81, 0x7e, 0x83, 0x2c, 0x95, 0x9c, - 0x89, 0x40, 0x6a, 0xce, 0xf9, 0x2e, 0x79, 0x02, - 0xfb, 0xcb, 0x10, 0x91, 0x26, 0xa0, 0xc9, 0xa1, - 0x1b, 0x04, 0x0e, 0x60, 0x40, 0x10, 0x04, 0xe2, - 0x06, 0x59, 0x2e, 0x02, 0x11, 0x11, 0xa9, 0x20, - 0x3d, 0x41, 0x80, 0x0e, 0x55, 0x4d, 0xd8, 0xe3, - 0x67, 0x5d, 0xba, 0x5f, 0x54, 0xb5, 0xcf, 0x34, - 0xf9, 0x68, 0x13, 0x30, 0xad, 0x1c, 0x11, 0xe0, - 0x5e, 0x32, 0x57, 0xa0, 0xd3, 0x70, 0x63, 0x79, - 0x5d, 0xe9, 0xd2, 0x7d, 0x9f, 0x6d, 0xf2, 0x20, - 0x08, 0x0c, 0x18, 0x64, 0x53, 0x44, 0x64, 0x15, - 0xf0, 0x90, 0x41, 0x57, 0x07, 0x3c, 0x68, 0x90, - 0xb7, 0xda, 0xcf, 0x87, 0x49, 0x3f, 0xe0, 0x41, - 0x0e, 0x02, 0x19, 0xa7, 0x3f, 0x11, 0xa9, 0x04, - 0xb6, 0x01, 0xf7, 0xdb, 0x41, 0xb7, 0x03, 0x5b, - 0x55, 0x35, 0x5b, 0xf3, 0x6c, 0x7a, 0x03, 0x00, - 0x9f, 0x66, 0x91, 0xbf, 0x9c, 0x45, 0xde, 0x69, - 0x3f, 0x57, 0xb8, 0xe4, 0x3d, 0xc0, 0x91, 0x2c, - 0x3e, 0xc6, 0x37, 0xf0, 0x08, 0xf0, 0x04, 0x50, - 0x0f, 0x3c, 0x00, 0x6c, 0x01, 0xf6, 0xda, 0x75, - 0x6b, 0x42, 0x36, 0x02, 0x5e, 0x71, 0x41, 0x44, - 0x66, 0x01, 0x4f, 0xba, 0xe4, 0x3b, 0x54, 0x35, - 0x69, 0x72, 0x00, 0x33, 0x81, 0xa3, 0x64, 0x1e, - 0xaa, 0x16, 0x03, 0x3b, 0x44, 0x24, 0x62, 0xb0, - 0x37, 0x95, 0x90, 0x1f, 0xbc, 0x05, 0xec, 0x00, - 0xca, 0x5c, 0xf2, 0xed, 0xb9, 0x9c, 0x32, 0x08, - 0xa8, 0x6a, 0x2b, 0xf0, 0x81, 0xc1, 0xf6, 0x51, - 0xe0, 0x7d, 0x83, 0x3c, 0xa8, 0x37, 0xd0, 0x40, - 0xe6, 0xf1, 0xba, 0x45, 0x55, 0xb3, 0x96, 0x0f, - 0x64, 0xff, 0x11, 0x6f, 0xc0, 0xbc, 0xc3, 0xbe, - 0x24, 0x22, 0x4b, 0x5d, 0xb2, 0xa0, 0x08, 0x98, - 0xb0, 0x37, 0x9f, 0x81, 0x91, 0x80, 0xaa, 0xc6, - 0x80, 0x17, 0xb3, 0xf8, 0x7c, 0x28, 0x22, 0xce, - 0xae, 0x2a, 0xa8, 0x12, 0x32, 0xe1, 0x50, 0x3e, - 0x83, 0xac, 0xcb, 0xa8, 0xaa, 0xee, 0x02, 0x76, - 0x1a, 0x54, 0x53, 0x80, 0x77, 0x1c, 0x9f, 0x1b, - 0xbd, 0xe7, 0x55, 0x30, 0x9a, 0xf3, 0x19, 0xe4, - 0xdb, 0x07, 0xd6, 0x03, 0x99, 0x6d, 0x17, 0xac, - 0x15, 0x91, 0x05, 0xf6, 0x78, 0x81, 0x41, 0x1f, - 0x04, 0x62, 0x80, 0xfb, 0xa4, 0x9b, 0x81, 0x50, - 0xbe, 0xbb, 0x51, 0x11, 0xd9, 0x02, 0x3c, 0x6f, - 0x50, 0xb5, 0x02, 0x6b, 0x80, 0xdd, 0x64, 0x39, - 0xab, 0x17, 0x89, 0x63, 0xaa, 0x2a, 0xf9, 0x8c, - 0x0a, 0xd9, 0x89, 0x5f, 0x63, 0xe4, 0x30, 0xe5, - 0xc6, 0x6c, 0xe0, 0x67, 0x46, 0x27, 0x79, 0x80, - 0xae, 0x42, 0x8c, 0xf2, 0x12, 0x50, 0xd5, 0xb3, - 0xc0, 0x67, 0x45, 0xa7, 0xe3, 0x1d, 0xc1, 0x10, - 0xb0, 0xf1, 0x2e, 0x70, 0xb3, 0xef, 0xe1, 0x8d, - 0x0d, 0x8c, 0x1b, 0x05, 0x11, 0x50, 0xd5, 0xdf, - 0x81, 0x1f, 0x8a, 0x4a, 0xc7, 0x3b, 0x72, 0x6e, - 0x60, 0x29, 0x78, 0x39, 0x8d, 0x7e, 0xee, 0x33, - 0x11, 0x3f, 0x48, 0x00, 0x3f, 0x16, 0x62, 0xe8, - 0x85, 0xc0, 0x57, 0x98, 0x97, 0xd4, 0xd1, 0xc0, - 0xaf, 0xaa, 0x7a, 0xbd, 0x10, 0xc3, 0x82, 0x09, - 0xa8, 0xea, 0x65, 0x6e, 0x5e, 0x19, 0x7d, 0x5d, - 0xa8, 0xa1, 0xd7, 0x86, 0xe6, 0x39, 0xa0, 0x23, - 0xaf, 0x55, 0x71, 0xb8, 0xc6, 0xc8, 0x45, 0x56, - 0x41, 0xf0, 0x44, 0xc0, 0x5e, 0x52, 0x17, 0xf3, - 0x6f, 0xf3, 0x31, 0x1a, 0xd8, 0x5c, 0x68, 0xf9, - 0x80, 0x8f, 0x96, 0x52, 0x55, 0x3b, 0x19, 0x21, - 0x61, 0x3a, 0xad, 0x16, 0x8b, 0x7e, 0xe0, 0x3d, - 0x2f, 0x0e, 0xfe, 0xee, 0x46, 0x55, 0x3b, 0x18, - 0xe9, 0x6b, 0x83, 0x7e, 0x13, 0x1f, 0xab, 0xea, - 0x05, 0x2f, 0x0e, 0xbe, 0x9b, 0x7a, 0x55, 0x6d, - 0x03, 0x16, 0x02, 0x67, 0xfc, 0xc6, 0x70, 0xc1, - 0xc2, 0xdc, 0x30, 0xe5, 0x44, 0x51, 0xb7, 0x12, - 0xaa, 0xfa, 0x07, 0x23, 0x4d, 0x78, 0x10, 0x7f, - 0xfb, 0xdd, 0xad, 0xaa, 0xa7, 0xbd, 0x3a, 0x15, - 0x7d, 0xad, 0xa2, 0xaa, 0x07, 0x01, 0x2d, 0x36, - 0x0e, 0x23, 0xfd, 0xb0, 0x67, 0x04, 0x71, 0x2f, - 0x04, 0x70, 0x2a, 0x80, 0x18, 0x07, 0xfd, 0x38, - 0x05, 0x45, 0xc0, 0xf3, 0xab, 0x37, 0xe0, 0x92, - 0x1f, 0xa7, 0xa0, 0x08, 0xf4, 0x06, 0x10, 0xc3, - 0x57, 0x6f, 0x1d, 0x14, 0x81, 0x20, 0x7e, 0xc4, - 0xff, 0x29, 0x81, 0xac, 0x37, 0x67, 0x05, 0x22, - 0xe1, 0xf7, 0xbf, 0x58, 0xfe, 0x01, 0x7b, 0x8d, - 0x8d, 0x79, 0x60, 0x61, 0xa9, 0x26, 0x00, 0x00, - 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, - 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, - 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, 0x2d, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, - 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc7, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x44, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x7f, - 0x68, 0x55, 0x65, 0x18, 0xc7, 0x3f, 0xe7, 0x9e, - 0x7b, 0xaf, 0x77, 0x77, 0x6e, 0xe5, 0xe6, 0x9c, - 0xdb, 0x74, 0x68, 0x2a, 0x0d, 0x0b, 0x7c, 0x34, - 0x25, 0x94, 0x8c, 0x24, 0x82, 0x50, 0x51, 0x8a, - 0xca, 0x40, 0x0c, 0x8a, 0xa8, 0xa8, 0x08, 0xca, - 0x3f, 0xfc, 0x23, 0xfa, 0x47, 0xc4, 0xa0, 0x32, - 0xf2, 0x8f, 0xc2, 0xca, 0x20, 0xca, 0x30, 0x24, - 0xac, 0x14, 0x06, 0x69, 0x2a, 0x61, 0x21, 0x9a, - 0xae, 0x47, 0x2c, 0xb2, 0xd4, 0xf9, 0xdb, 0xe9, - 0x46, 0xde, 0xa5, 0xe9, 0x7e, 0xdd, 0xed, 0xf6, - 0xc7, 0xce, 0xdd, 0xce, 0xce, 0xde, 0xbb, 0x7b, - 0xcf, 0x3d, 0x67, 0x46, 0xdf, 0x7f, 0xce, 0xfb, - 0x3e, 0x3f, 0xde, 0xf3, 0x7c, 0x79, 0x9f, 0xf7, - 0xc7, 0x73, 0xee, 0xb5, 0x32, 0x99, 0x0c, 0xff, - 0x67, 0x44, 0x47, 0xfb, 0x05, 0x22, 0x12, 0x07, - 0x96, 0x00, 0x9d, 0xc0, 0x2e, 0x55, 0xed, 0x0d, - 0x73, 0xfc, 0x48, 0x98, 0x83, 0xe5, 0xc0, 0x5a, - 0x60, 0x3b, 0xd0, 0x08, 0xac, 0x09, 0x7b, 0xf0, - 0xc0, 0x33, 0x20, 0x22, 0xaf, 0x02, 0xf3, 0x81, - 0xcd, 0xaa, 0xba, 0xcb, 0x60, 0xf2, 0x98, 0xab, - 0xbd, 0x12, 0x58, 0xef, 0xf1, 0xb7, 0x80, 0x99, - 0xc0, 0x25, 0x55, 0x4d, 0xf9, 0x7d, 0x7f, 0xa0, - 0x19, 0x10, 0x91, 0xd9, 0xc0, 0xbb, 0xc0, 0xe3, - 0xc0, 0x4e, 0x11, 0x99, 0x62, 0x30, 0xbb, 0xcd, - 0xd5, 0xae, 0x35, 0xe8, 0xdf, 0x06, 0x7e, 0x05, - 0x5a, 0x44, 0xe4, 0x4e, 0xbf, 0x31, 0x04, 0x4d, - 0xa1, 0x3a, 0x57, 0x3b, 0x0e, 0x2c, 0x35, 0xd8, - 0x94, 0xbb, 0xda, 0xb7, 0x8b, 0x48, 0x89, 0x47, - 0xbf, 0xca, 0x79, 0x8e, 0x01, 0x56, 0xf8, 0x0d, - 0x20, 0x28, 0x81, 0xb4, 0xa7, 0xff, 0xb0, 0xbb, - 0x23, 0x22, 0x09, 0xfa, 0x89, 0xb9, 0x31, 0xd1, - 0xa5, 0x9f, 0x06, 0x4c, 0x70, 0xe9, 0x7c, 0xa7, - 0x74, 0xd8, 0x04, 0x16, 0x89, 0x48, 0xcc, 0xd5, - 0x1f, 0x6b, 0xf0, 0x71, 0xa7, 0xd4, 0xfc, 0x7c, - 0xf1, 0xcc, 0xdd, 0x6e, 0xd5, 0xcc, 0xda, 0x69, - 0x4d, 0xcd, 0x15, 0x40, 0xd0, 0x45, 0xdc, 0xe9, - 0xe9, 0x27, 0x81, 0x06, 0xe0, 0x98, 0xd3, 0x2f, - 0x35, 0xf8, 0x24, 0x5d, 0xed, 0xb9, 0x1e, 0xdd, - 0x00, 0x81, 0xd9, 0x8d, 0xd1, 0xe5, 0x76, 0x3c, - 0xb1, 0x2e, 0x59, 0x3b, 0xb9, 0x22, 0x6a, 0xc7, - 0xed, 0xf9, 0xfb, 0x2a, 0x53, 0x5d, 0x1d, 0x37, - 0x36, 0x36, 0x2d, 0xee, 0xdc, 0xe4, 0x76, 0x08, - 0x4a, 0xa0, 0xc5, 0x20, 0x9b, 0xc5, 0xc8, 0x04, - 0xdc, 0xb2, 0x19, 0x1e, 0x5d, 0x2f, 0xc0, 0x9c, - 0x46, 0xfb, 0x85, 0xe8, 0xb8, 0xca, 0xb5, 0x53, - 0x27, 0xdf, 0x53, 0x55, 0x65, 0x4f, 0x20, 0x11, - 0x29, 0xa1, 0x2b, 0xd3, 0x55, 0xdd, 0x7c, 0xb9, - 0x69, 0xfd, 0xdc, 0xc6, 0x92, 0xba, 0xc3, 0x8b, - 0x3b, 0xde, 0xc8, 0x3a, 0x04, 0x4d, 0xa1, 0x8b, - 0x06, 0x99, 0xb8, 0xda, 0x49, 0x83, 0x7e, 0x24, - 0x02, 0xed, 0x0d, 0x3b, 0xac, 0xb2, 0xbe, 0x58, - 0x6c, 0x75, 0xed, 0xa4, 0xbb, 0xaa, 0xea, 0xa2, - 0x93, 0x49, 0xfe, 0x5e, 0x4e, 0xf7, 0x2e, 0x8b, - 0xba, 0x9e, 0x7a, 0x66, 0xd6, 0x2c, 0x18, 0x57, - 0x5a, 0x5e, 0xf9, 0xd4, 0x9c, 0x1d, 0xd6, 0xc0, - 0x6e, 0x16, 0x88, 0x80, 0xaa, 0x76, 0x02, 0x7f, - 0x79, 0xc4, 0xb3, 0x72, 0x04, 0x9b, 0x45, 0x12, - 0x40, 0x44, 0xa2, 0x80, 0x37, 0xb7, 0x53, 0x25, - 0x11, 0x7b, 0x45, 0xbc, 0xa6, 0x7a, 0x5a, 0x85, - 0x3d, 0x9e, 0xde, 0x23, 0x11, 0x76, 0xaf, 0xde, - 0xcf, 0xfe, 0x0d, 0x07, 0x38, 0xb3, 0xe5, 0x22, - 0x13, 0xa3, 0xb5, 0xdc, 0x51, 0x3f, 0xaf, 0x3e, - 0x12, 0x1b, 0xf3, 0x5a, 0x28, 0x04, 0x1c, 0x78, - 0x67, 0x21, 0x1f, 0x81, 0xac, 0x6c, 0x0a, 0xc3, - 0x53, 0x38, 0x85, 0xcd, 0xc2, 0x64, 0xe9, 0x38, - 0xab, 0x2c, 0x52, 0x46, 0xf3, 0xf6, 0x73, 0xe0, - 0x5c, 0xd5, 0xa2, 0x1d, 0x31, 0x2a, 0xec, 0xf1, - 0x54, 0x8c, 0xa9, 0xc6, 0x8e, 0xc5, 0x07, 0xce, - 0x8b, 0xd1, 0x20, 0x50, 0x25, 0x22, 0x35, 0x4e, - 0xdb, 0x94, 0x42, 0x59, 0xd9, 0x74, 0x83, 0x2e, - 0x85, 0x15, 0x29, 0x89, 0x59, 0x31, 0x32, 0xed, - 0x16, 0x17, 0x7f, 0x19, 0x5c, 0x62, 0x55, 0x95, - 0x55, 0x24, 0xac, 0x04, 0x31, 0x2b, 0x86, 0x45, - 0x64, 0x60, 0xa7, 0x0b, 0x83, 0xc0, 0x05, 0x83, - 0xec, 0x6e, 0xe7, 0x59, 0x66, 0xd0, 0xd9, 0xce, - 0xd3, 0x9b, 0xff, 0x00, 0x57, 0x33, 0xbd, 0xbd, - 0x07, 0xbb, 0x3b, 0x6f, 0xd0, 0xb2, 0xaf, 0x95, - 0x4c, 0xdf, 0xe0, 0x4d, 0x39, 0x59, 0x99, 0xa4, - 0x27, 0xd3, 0x4d, 0x77, 0xba, 0x93, 0x4c, 0x5f, - 0xef, 0x99, 0xac, 0x3c, 0x0c, 0x02, 0xa6, 0x9d, - 0x28, 0x3b, 0xc5, 0x23, 0x11, 0x68, 0x30, 0xe8, - 0x52, 0xf1, 0x74, 0xdf, 0xb6, 0x9b, 0x6d, 0x97, - 0xcf, 0x5f, 0xda, 0xdd, 0x36, 0x44, 0x11, 0xad, - 0xb1, 0x68, 0xef, 0x4b, 0xd1, 0x7c, 0xf9, 0x48, - 0x6b, 0x4f, 0x67, 0xd7, 0xe6, 0xac, 0x3c, 0x0c, - 0x02, 0x1d, 0x06, 0x59, 0x36, 0x38, 0x13, 0x81, - 0xec, 0x3b, 0xef, 0xf5, 0xc8, 0xd3, 0x40, 0xcb, - 0xa1, 0xe5, 0x99, 0xf3, 0xe9, 0x26, 0x7e, 0xba, - 0xd9, 0x3c, 0x78, 0xc4, 0xd8, 0xd1, 0x08, 0xd6, - 0xcc, 0x3e, 0x4e, 0xb6, 0x1f, 0x4b, 0x5f, 0x69, - 0x3d, 0xb5, 0xb7, 0x69, 0x59, 0xf7, 0xe1, 0xac, - 0x2e, 0x8c, 0x7a, 0xc0, 0x7b, 0x98, 0xc1, 0xc8, - 0x04, 0x6c, 0x11, 0x49, 0x32, 0x74, 0xb1, 0x03, - 0x9c, 0x56, 0xd5, 0x34, 0x40, 0xe6, 0xd3, 0xfa, - 0x21, 0xb3, 0x3a, 0xb6, 0x21, 0xc1, 0x0f, 0xe7, - 0xb7, 0xb5, 0xb6, 0xa6, 0x9a, 0xbf, 0x4b, 0x24, - 0xae, 0x3d, 0xe3, 0xd6, 0x8d, 0x36, 0x81, 0x72, - 0x83, 0xce, 0x06, 0xe6, 0x19, 0xde, 0x7d, 0x12, - 0x06, 0xb6, 0xd7, 0x95, 0x6e, 0xc5, 0xb5, 0x74, - 0xeb, 0xd7, 0xed, 0x17, 0x4e, 0xbd, 0x72, 0xf4, - 0xd1, 0xcc, 0xb0, 0xf5, 0x16, 0x46, 0x0a, 0x75, - 0x19, 0x64, 0x75, 0x22, 0xb2, 0x0a, 0x78, 0xd0, - 0xa0, 0x9b, 0x00, 0x3c, 0x60, 0x90, 0x9f, 0x70, - 0x9e, 0x0f, 0x31, 0xf4, 0x82, 0x47, 0xe6, 0xf8, - 0xd8, 0x37, 0x4d, 0xc1, 0x83, 0x61, 0x06, 0x44, - 0xa4, 0x14, 0xf8, 0x1c, 0x58, 0xe0, 0x0c, 0xba, - 0x05, 0xf8, 0x48, 0x55, 0x73, 0x15, 0xcf, 0xa6, - 0x19, 0x00, 0xf8, 0x2c, 0x87, 0xfc, 0xe5, 0x1c, - 0xf2, 0xb3, 0xce, 0xf3, 0x49, 0x8f, 0xfc, 0x0a, - 0x70, 0x24, 0x87, 0x8f, 0x71, 0x06, 0x96, 0x02, - 0x8f, 0x00, 0xd5, 0xc0, 0x7d, 0xc0, 0x26, 0x60, - 0x8f, 0x93, 0xb7, 0x26, 0xe4, 0x22, 0xe0, 0x17, - 0x6d, 0x22, 0x32, 0x1d, 0x78, 0xc2, 0x23, 0xdf, - 0xaa, 0xaa, 0x7d, 0xb9, 0x9c, 0x4c, 0x04, 0x9a, - 0x70, 0x2e, 0x55, 0x2e, 0x2c, 0x02, 0xb6, 0x8a, - 0x88, 0x6d, 0xb0, 0x37, 0xa5, 0x50, 0x31, 0x78, - 0x0b, 0xd8, 0x0a, 0x24, 0x3c, 0xf2, 0x2d, 0x23, - 0x39, 0x0d, 0x23, 0xa0, 0xaa, 0x27, 0x80, 0x0f, - 0x0c, 0xb6, 0xcb, 0x80, 0x8d, 0x06, 0x79, 0x58, - 0x33, 0x30, 0x91, 0xe1, 0xd7, 0xeb, 0xe3, 0xaa, - 0x9a, 0x33, 0x7d, 0x20, 0xf7, 0x22, 0x7e, 0x1d, - 0xf3, 0x09, 0xfb, 0x92, 0x88, 0x2c, 0xf1, 0xc8, - 0xc2, 0x22, 0x60, 0xc2, 0x9e, 0x7c, 0x06, 0x46, - 0x02, 0xaa, 0x7a, 0x1d, 0x78, 0x31, 0x87, 0xcf, - 0x87, 0x22, 0xe2, 0xae, 0xaa, 0xc2, 0x4a, 0x21, - 0x13, 0x7e, 0xce, 0x67, 0x90, 0x73, 0x1b, 0x55, - 0xd5, 0x9d, 0xc0, 0x57, 0x06, 0x55, 0x1d, 0xf0, - 0x8e, 0xab, 0x3f, 0xc9, 0x7f, 0x5c, 0x05, 0xe3, - 0x50, 0x3e, 0x83, 0x7c, 0xe7, 0xc0, 0x1a, 0xa0, - 0xc7, 0x20, 0x7f, 0x56, 0x44, 0x16, 0x3a, 0xed, - 0x85, 0x06, 0x7d, 0x18, 0xb8, 0x0e, 0xfc, 0x91, - 0xcf, 0xc8, 0xca, 0xf7, 0x6d, 0x54, 0x44, 0x36, - 0x01, 0xcf, 0x1b, 0x54, 0x27, 0x80, 0xa7, 0xe9, - 0xff, 0xe2, 0x66, 0x3a, 0x71, 0x83, 0xe2, 0xa8, - 0xaa, 0x4a, 0x3e, 0xa3, 0x42, 0x4e, 0xe2, 0x75, - 0x40, 0xb7, 0x41, 0x3e, 0x03, 0xf8, 0x91, 0xd1, - 0x09, 0x1e, 0xe0, 0x52, 0x21, 0x46, 0x79, 0x09, - 0xa8, 0xea, 0x05, 0xe0, 0x8b, 0xc0, 0xe1, 0xf8, - 0x47, 0x38, 0x04, 0x1c, 0x6c, 0x60, 0xa0, 0xb8, - 0xbb, 0x65, 0x30, 0xd5, 0x19, 0xc3, 0x50, 0x10, - 0x01, 0x55, 0xfd, 0x0d, 0xf8, 0x3e, 0x50, 0x38, - 0xfe, 0x31, 0xe2, 0x01, 0x96, 0x85, 0x9f, 0xdb, - 0xe8, 0x97, 0x45, 0x06, 0x52, 0x0c, 0xd2, 0xc0, - 0xde, 0x42, 0x0c, 0xfd, 0x10, 0xf8, 0x06, 0xf3, - 0x96, 0x3a, 0x1a, 0x38, 0xa0, 0xaa, 0xd7, 0x0a, - 0x31, 0x2c, 0x98, 0x80, 0xaa, 0x5e, 0xe5, 0xd6, - 0xa5, 0xd1, 0xb7, 0x85, 0x1a, 0xfa, 0x2d, 0x68, - 0x9e, 0x03, 0x4e, 0xfb, 0xf4, 0xf1, 0x8b, 0xbf, - 0x81, 0x8f, 0x0b, 0x35, 0xf6, 0x45, 0xc0, 0xd9, - 0x52, 0x17, 0x31, 0x58, 0x7c, 0x8c, 0x06, 0xde, - 0x2f, 0x34, 0x7d, 0xa0, 0x88, 0x92, 0x52, 0x55, - 0xcf, 0xd2, 0x4f, 0xc2, 0x58, 0xe2, 0x05, 0x44, - 0x07, 0xf0, 0x9e, 0x1f, 0x87, 0xa2, 0x6a, 0x62, - 0x55, 0x3d, 0x4d, 0x7f, 0x5d, 0x1b, 0xf6, 0x4c, - 0x7c, 0xa2, 0xaa, 0x6d, 0xf9, 0xcd, 0x06, 0x51, - 0x74, 0x51, 0xaf, 0xaa, 0xa7, 0x80, 0xfb, 0x81, - 0x33, 0xc5, 0x8e, 0xe1, 0x41, 0x06, 0x73, 0xc1, - 0x34, 0x22, 0x82, 0x7e, 0x9d, 0x3e, 0x47, 0x7f, - 0x11, 0x1e, 0xc6, 0x6f, 0xbf, 0x8d, 0xaa, 0x7a, - 0xd2, 0xaf, 0x53, 0xe0, 0xcf, 0x2a, 0xaa, 0x7a, - 0x10, 0xd0, 0xa0, 0xe3, 0xd0, 0x5f, 0x0f, 0xfb, - 0x46, 0x58, 0x3f, 0x74, 0xff, 0x19, 0xc2, 0x18, - 0x07, 0x8b, 0x71, 0x0a, 0x8b, 0x80, 0xef, 0xa9, - 0x37, 0xc0, 0xfb, 0x43, 0x49, 0x41, 0x08, 0x8b, - 0xc0, 0x3f, 0x21, 0x8c, 0x51, 0x54, 0x6d, 0x1d, - 0x16, 0x81, 0x30, 0x16, 0xf1, 0x7f, 0x4a, 0x20, - 0xe7, 0x97, 0xb3, 0x02, 0x91, 0x2e, 0xf6, 0x5f, - 0x2c, 0xff, 0x02, 0xf3, 0xd4, 0x74, 0x76, 0x23, - 0xdb, 0xd9, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49, - 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, - 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfc, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, - 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x32, 0x2e, - 0x31, 0x32, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, - 0x2d, 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x66, 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, - 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, - 0x76, 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, - 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6f, - 0x6e, 0x2d, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x79, - 0x73, 0x74, 0x65, 0x6d, 0x2d, 0x75, 0x73, 0x65, - 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, - 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, - 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x2d, 0x62, 0x61, - 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, - 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, - 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x63, 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6f, 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x68, - 0x5f, 0x61, 0x6e, 0x67, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x67, - 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x2d, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, - 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, - 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, - 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, - 0x6f, 0x78, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x34, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, - 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, - 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x76, 0x65, 0x72, 0x69, 0x66, - 0x79, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, - 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, - 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, - 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, - 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, - 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, - 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, - 0x2d, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, - 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, - 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, - 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, - 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, - 0x2d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x20, 0x4e, 0x65, 0x77, - 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x69, 0x66, - 0x79, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6e, - 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x2d, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4e, 0x65, 0x77, - 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, - 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x42, 0x61, 0x72, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, - 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x2d, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, - 0x64, 0x69, 0x73, 0x63, 0x72, 0x65, 0x74, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x34, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, - 0x74, 0x73, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, - 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x22, 0x2f, - 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x69, 0x67, 0x68, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x33, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6f, 0x6c, 0x64, 0x2d, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x75, 0x72, - 0x72, 0x65, 0x6e, 0x74, 0x20, 0x5f, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x6f, 0x6c, 0x64, 0x2d, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, - 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x32, 0x35, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x6c, 0x64, - 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, - 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x72, 0x61, 0x64, - 0x69, 0x6f, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x72, - 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x75, 0x73, - 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x65, - 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x20, 0x77, 0x68, 0x65, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x6e, - 0x65, 0x78, 0x74, 0x20, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, - 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2d, 0x6e, 0x6f, 0x77, 0x2d, 0x72, 0x61, 0x64, - 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, - 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x20, 0x6e, 0x6f, 0x77, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, - 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, - 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x22, 0x3e, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x72, 0x69, 0x67, 0x68, - 0x74, 0x2d, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x2e, - 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xce, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x4b, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x4b, - 0x6c, 0x54, 0x65, 0x14, 0xc7, 0x7f, 0x77, 0xe6, - 0xf6, 0x35, 0x2d, 0x6d, 0x69, 0x6d, 0xad, 0x7d, - 0x10, 0x50, 0x10, 0x44, 0x0c, 0x07, 0x10, 0x95, - 0x05, 0x60, 0x83, 0x24, 0xa6, 0x18, 0x35, 0xd1, - 0x2a, 0x91, 0x34, 0x82, 0x1a, 0x57, 0x6e, 0xd8, - 0xe8, 0xca, 0xc4, 0x28, 0xb8, 0x10, 0x35, 0xba, - 0x70, 0x23, 0xba, 0x51, 0xb4, 0x1a, 0x13, 0x03, - 0x92, 0x40, 0x82, 0x0f, 0x8c, 0x26, 0x20, 0x08, - 0x72, 0x14, 0x0c, 0xf2, 0xa8, 0xb5, 0x05, 0x4a, - 0x6d, 0xd3, 0x07, 0x02, 0x6d, 0x29, 0x9d, 0x19, - 0x17, 0x33, 0x2d, 0xb7, 0x77, 0xbe, 0x61, 0xe6, - 0xce, 0xbd, 0xc5, 0xf8, 0xdf, 0xdc, 0xef, 0x9e, - 0x73, 0xbe, 0xf3, 0x9d, 0x7f, 0xbf, 0x73, 0xbf, - 0xc7, 0x99, 0x5a, 0xf1, 0x78, 0x9c, 0xff, 0x33, - 0xec, 0xa9, 0x1e, 0x40, 0x44, 0xf2, 0x81, 0x35, - 0xc0, 0x08, 0xb0, 0x47, 0x55, 0xa3, 0x41, 0xfa, - 0x0f, 0x05, 0xe9, 0x2c, 0x0d, 0x5e, 0x05, 0xbe, - 0x04, 0x76, 0x01, 0x2f, 0x05, 0xed, 0xdc, 0xf7, - 0x0c, 0x88, 0xc8, 0x46, 0x60, 0x19, 0xf0, 0x81, - 0xaa, 0xee, 0x31, 0x98, 0x3c, 0xee, 0x68, 0xaf, - 0x03, 0x5e, 0x77, 0xf5, 0xb7, 0x80, 0xf9, 0x40, - 0x97, 0xaa, 0x0e, 0x78, 0x1d, 0xdf, 0xd7, 0x0c, - 0x88, 0xc8, 0x22, 0xe0, 0x6d, 0xa0, 0x19, 0xd8, - 0x29, 0x22, 0x33, 0x0d, 0x66, 0x65, 0x8e, 0x76, - 0xad, 0x41, 0xbf, 0x05, 0x38, 0x06, 0x9c, 0x17, - 0x91, 0xb9, 0x5e, 0x63, 0xf0, 0x9b, 0x42, 0x75, - 0x8e, 0x76, 0x3e, 0xf0, 0x90, 0xc1, 0xa6, 0xd4, - 0xd1, 0x2e, 0x17, 0x91, 0x22, 0x97, 0xbe, 0x25, - 0xf9, 0x2c, 0x00, 0x9e, 0xf4, 0x1a, 0x80, 0x5f, - 0x02, 0x63, 0xae, 0xf7, 0x07, 0x9d, 0x2f, 0x22, - 0x52, 0x48, 0x82, 0x98, 0x13, 0x35, 0x0e, 0xfd, - 0x6d, 0x40, 0xb5, 0x43, 0xe7, 0x39, 0xa5, 0x83, - 0x26, 0xd0, 0x28, 0x22, 0x79, 0x8e, 0xf7, 0x12, - 0x43, 0x1f, 0x67, 0x4a, 0x2d, 0xf3, 0x1b, 0x8f, - 0x5f, 0x02, 0x23, 0xae, 0xf7, 0x08, 0x30, 0xcf, - 0xf1, 0x5e, 0x6c, 0xe8, 0x13, 0x71, 0xb4, 0xef, - 0xf6, 0x1b, 0x8f, 0x5f, 0x02, 0xe7, 0x0d, 0xb2, - 0x85, 0x8e, 0xb6, 0x89, 0x80, 0x53, 0x36, 0xc7, - 0xa5, 0xf3, 0xbc, 0x47, 0xf8, 0x5d, 0x46, 0xcf, - 0x19, 0x64, 0x02, 0x6c, 0x4b, 0xb6, 0x23, 0x06, - 0xfd, 0xf5, 0x08, 0x0c, 0xa6, 0x38, 0x13, 0x59, - 0x99, 0xb4, 0xfb, 0x5c, 0x55, 0x2f, 0xba, 0xf5, - 0xbe, 0x66, 0x40, 0x55, 0x47, 0x80, 0x3e, 0x97, - 0x38, 0xd3, 0x0c, 0x44, 0x92, 0x81, 0xd9, 0xc0, - 0x2c, 0x97, 0x6e, 0xd2, 0x3e, 0x20, 0x22, 0x4d, - 0xc0, 0x5e, 0x60, 0x2b, 0xf0, 0x8a, 0x29, 0x86, - 0x20, 0x76, 0x62, 0xf7, 0x2c, 0x64, 0x9b, 0x42, - 0x33, 0x49, 0xcd, 0x00, 0xf7, 0x46, 0xb6, 0x11, - 0xb0, 0x92, 0xed, 0x52, 0x0c, 0x98, 0x0a, 0x02, - 0x55, 0x22, 0x72, 0x4b, 0xb2, 0x6d, 0x4a, 0xa1, - 0x71, 0xd9, 0x6c, 0x83, 0x6e, 0x82, 0x80, 0x88, - 0xd4, 0x00, 0x8d, 0x0e, 0x5d, 0xb7, 0x69, 0xf0, - 0x20, 0x08, 0x9c, 0x35, 0xc8, 0x16, 0x24, 0x9f, - 0xd3, 0x0c, 0xba, 0x70, 0xf2, 0xe9, 0xce, 0x7f, - 0x80, 0x7e, 0x47, 0x7b, 0xad, 0xc3, 0x16, 0xcc, - 0x0b, 0x46, 0x20, 0x04, 0x4c, 0x8e, 0xc7, 0x8f, - 0x04, 0xd7, 0x23, 0x30, 0xcf, 0xa0, 0x73, 0xa6, - 0xd0, 0x7a, 0x97, 0xae, 0xcd, 0x34, 0x78, 0x10, - 0x04, 0x86, 0x0d, 0xb2, 0xf1, 0xe0, 0x4c, 0x04, - 0xc6, 0xc7, 0xbc, 0xd7, 0x25, 0x1f, 0x23, 0xf9, - 0xc7, 0x10, 0x91, 0x85, 0x4c, 0xfe, 0x96, 0x46, - 0x81, 0x1f, 0x4d, 0x83, 0x1b, 0x97, 0xd1, 0x45, - 0x3b, 0xed, 0xf5, 0x21, 0xdb, 0x6e, 0x09, 0x87, - 0xed, 0xaa, 0x78, 0x2c, 0xda, 0x17, 0x8b, 0x46, - 0x5b, 0x0f, 0xaf, 0x19, 0x7d, 0x3f, 0x0d, 0x01, - 0xf7, 0x66, 0x96, 0x89, 0x40, 0x58, 0x44, 0x22, - 0xae, 0x00, 0x01, 0xda, 0x55, 0x75, 0x7c, 0x67, - 0x7f, 0xda, 0xa5, 0xdb, 0xa7, 0xaa, 0x43, 0x19, - 0x09, 0x34, 0x7e, 0x6f, 0xd9, 0x83, 0x97, 0xc3, - 0xad, 0x91, 0x9a, 0xda, 0x07, 0xea, 0x6a, 0xe6, - 0x97, 0x97, 0x84, 0x4b, 0x21, 0x1e, 0xe3, 0x7c, - 0xcf, 0xc9, 0xc5, 0x4b, 0x77, 0x17, 0xae, 0x19, - 0xbe, 0x74, 0xa5, 0xf9, 0x58, 0x73, 0x7c, 0xd4, - 0x03, 0x01, 0xd3, 0xca, 0x11, 0x06, 0x96, 0xba, - 0xc7, 0x06, 0x4e, 0xc3, 0xc4, 0xf2, 0xba, 0xce, - 0xa5, 0xfb, 0xda, 0x14, 0x7c, 0x0a, 0x81, 0x81, - 0xcb, 0xf6, 0xcb, 0x45, 0x0d, 0xf5, 0x0f, 0xcf, - 0xac, 0xbc, 0x2b, 0xbf, 0xc6, 0xae, 0xa5, 0x34, - 0x54, 0x06, 0x58, 0x54, 0xd4, 0x56, 0x95, 0xb6, - 0x15, 0x4e, 0x6b, 0xea, 0x6c, 0x3f, 0xb4, 0x09, - 0x78, 0xd1, 0xe5, 0xe3, 0x8a, 0xc1, 0x6f, 0x9d, - 0x88, 0xb4, 0x00, 0xab, 0x0c, 0xba, 0x6a, 0xe0, - 0x7e, 0x83, 0xfc, 0x54, 0xf2, 0xb9, 0x9a, 0xc9, - 0x07, 0xbc, 0xec, 0x08, 0x2c, 0xda, 0x6e, 0x95, - 0x53, 0x52, 0xf0, 0xd4, 0x4d, 0x45, 0x33, 0xf2, - 0x7b, 0x36, 0x5f, 0xa4, 0xed, 0xb8, 0x52, 0x51, - 0x5f, 0xce, 0x1d, 0xab, 0xe7, 0x52, 0xdf, 0xd4, - 0x40, 0xac, 0x22, 0x66, 0xf7, 0x76, 0x9f, 0x7a, - 0x6c, 0xf1, 0x17, 0xd6, 0x96, 0x5f, 0x9a, 0xe3, - 0xbd, 0x0e, 0x1f, 0xa6, 0x19, 0x00, 0xf8, 0x28, - 0x8d, 0xfc, 0x85, 0x34, 0xf2, 0x8e, 0xe4, 0x73, - 0xad, 0x4b, 0xfe, 0x37, 0x70, 0x38, 0x23, 0x81, - 0x50, 0x9c, 0xfb, 0xac, 0xca, 0xe9, 0xf5, 0xd6, - 0xa1, 0x7c, 0x7a, 0xf7, 0x25, 0xe2, 0xeb, 0x1a, - 0xe8, 0xa6, 0xeb, 0x68, 0x37, 0x33, 0xf6, 0x36, - 0xb0, 0x64, 0xd3, 0x9d, 0x54, 0x55, 0xcf, 0x6e, - 0xe8, 0x1c, 0xec, 0x5f, 0x4e, 0xe2, 0x8a, 0x98, - 0x89, 0x80, 0x57, 0xf4, 0x8a, 0xc8, 0x6c, 0xe0, - 0x09, 0x97, 0xbc, 0x55, 0x55, 0x63, 0xe9, 0x3a, - 0x4d, 0xac, 0x42, 0xb1, 0x3c, 0x7b, 0x45, 0x41, - 0x64, 0x5a, 0x61, 0xf9, 0x9c, 0x32, 0xac, 0x90, - 0x35, 0xc9, 0xa8, 0xf3, 0xc8, 0x19, 0x0e, 0x6f, - 0x3e, 0x4a, 0x59, 0xe4, 0xe6, 0x3c, 0xab, 0xc0, - 0x5e, 0xe9, 0xf2, 0x61, 0x4a, 0xa1, 0x5c, 0xf0, - 0x06, 0xd0, 0x0a, 0x14, 0xba, 0xe4, 0xdb, 0x0c, - 0xb6, 0x13, 0x98, 0xb4, 0x8c, 0x5a, 0x84, 0x28, - 0xae, 0x2b, 0x62, 0xfe, 0x23, 0xb7, 0xa7, 0x18, - 0x76, 0xee, 0x3b, 0x47, 0xd7, 0xd6, 0xfe, 0x14, - 0x39, 0xc1, 0xcd, 0x40, 0x0d, 0xa9, 0xc7, 0xeb, - 0x3f, 0x54, 0x35, 0x6d, 0xfa, 0x80, 0x83, 0x40, - 0xe8, 0xea, 0xd8, 0x0f, 0xd1, 0x91, 0xa1, 0x91, - 0x28, 0x51, 0x16, 0x3e, 0xb3, 0x80, 0xb2, 0xea, - 0xd4, 0x05, 0xa4, 0x67, 0xd7, 0x05, 0xa2, 0x3b, - 0xaa, 0x2e, 0xb9, 0xc4, 0x41, 0x11, 0x30, 0xe1, - 0xdb, 0x4c, 0x06, 0xd7, 0x52, 0xc8, 0xe2, 0xa7, - 0xd1, 0xbe, 0xbe, 0xb3, 0xc3, 0xb1, 0x21, 0xae, - 0x14, 0x0e, 0xb1, 0x6a, 0xa3, 0x3b, 0x53, 0x12, - 0x88, 0x1f, 0xac, 0xdc, 0x20, 0x22, 0xce, 0x5b, - 0x55, 0x50, 0x29, 0x64, 0xc2, 0xcf, 0x99, 0x0c, - 0x26, 0x08, 0x1c, 0x79, 0x34, 0x3e, 0x18, 0x1d, - 0x1e, 0xfd, 0xb4, 0x67, 0xe0, 0xcf, 0xd1, 0xfe, - 0x68, 0x1f, 0x25, 0xf7, 0x14, 0x32, 0x67, 0xe5, - 0xad, 0xa9, 0x3d, 0xe2, 0xdc, 0x02, 0xbc, 0xe9, - 0x90, 0xd4, 0x07, 0x11, 0x69, 0x1a, 0x1c, 0xcc, - 0x64, 0x30, 0xe9, 0x1b, 0x98, 0x5e, 0x3c, 0xf6, - 0x5a, 0x5f, 0xc7, 0x89, 0xaf, 0x8e, 0x77, 0xed, - 0x1f, 0x3c, 0x73, 0xb5, 0x83, 0x59, 0xcf, 0xd6, - 0x13, 0xb2, 0x2d, 0x53, 0xbf, 0xe7, 0x44, 0x64, - 0x79, 0xb2, 0xbd, 0xdc, 0x64, 0x10, 0x00, 0x2e, - 0x02, 0x27, 0x32, 0x19, 0x59, 0xa6, 0xda, 0xe8, - 0x92, 0x9d, 0xf9, 0xeb, 0xf3, 0xec, 0x82, 0x96, - 0x3c, 0x3b, 0xbf, 0x6a, 0xe8, 0xe3, 0x8a, 0xca, - 0xe8, 0x6f, 0xc5, 0xa6, 0x7a, 0xce, 0x29, 0x60, - 0x03, 0x89, 0x8a, 0x9b, 0xf1, 0xac, 0xee, 0x13, - 0xbf, 0xaa, 0xaa, 0x64, 0x32, 0x32, 0x12, 0x70, - 0x42, 0x44, 0xea, 0x49, 0x9c, 0x04, 0xdd, 0xe5, - 0x91, 0xa9, 0xc6, 0x6e, 0x55, 0x6d, 0xca, 0x64, - 0x94, 0xf1, 0x34, 0xaa, 0xaa, 0x67, 0x81, 0x4f, - 0x02, 0x09, 0xc9, 0x1b, 0xba, 0xb2, 0x31, 0xca, - 0xf6, 0x38, 0xfd, 0x16, 0x70, 0xa3, 0xeb, 0xf0, - 0xc6, 0x0b, 0x8c, 0x1b, 0x59, 0x11, 0x50, 0xd5, - 0xdf, 0x81, 0x6f, 0x7c, 0x85, 0xe3, 0x1d, 0xd7, - 0xdd, 0xc0, 0xc6, 0xe1, 0xe5, 0x42, 0xf3, 0x59, - 0x8e, 0x81, 0xe4, 0x82, 0x31, 0xe0, 0xbb, 0x6c, - 0x0c, 0xbd, 0x10, 0xd8, 0x0e, 0x5c, 0xcd, 0x29, - 0x1c, 0xef, 0xd8, 0xaf, 0xaa, 0xff, 0x64, 0x63, - 0x98, 0x35, 0x01, 0x55, 0xed, 0xe7, 0xc6, 0xa5, - 0xd1, 0x8e, 0x6c, 0x0d, 0xbd, 0xde, 0x89, 0x9f, - 0x07, 0xda, 0x3d, 0xf6, 0xf1, 0x8a, 0x0b, 0x24, - 0x0a, 0x59, 0x59, 0xc1, 0x13, 0x81, 0xe4, 0x92, - 0xda, 0xc8, 0xb5, 0xcb, 0xc7, 0x54, 0xe0, 0xbd, - 0x6c, 0xd3, 0x07, 0x72, 0xa8, 0x4a, 0xa8, 0x6a, - 0x07, 0x09, 0x12, 0xa6, 0x7a, 0x90, 0x5f, 0x0c, - 0x03, 0xef, 0x78, 0xe9, 0x90, 0x53, 0x59, 0x45, - 0x55, 0xdb, 0x49, 0xdc, 0x6b, 0x83, 0x9e, 0x89, - 0x0f, 0x55, 0xb5, 0x37, 0xb3, 0xd9, 0x35, 0xe4, - 0x5c, 0x17, 0x52, 0xd5, 0x36, 0x60, 0x05, 0xf0, - 0x57, 0xae, 0x3e, 0x5c, 0x88, 0x03, 0xef, 0x7a, - 0xed, 0xe4, 0xb7, 0x3a, 0xdd, 0x49, 0xe2, 0x12, - 0x1e, 0xc4, 0x6f, 0xbf, 0xbb, 0x54, 0xf5, 0xb4, - 0xd7, 0x4e, 0xbe, 0x2b, 0x73, 0xaa, 0x7a, 0x00, - 0x50, 0xbf, 0x7e, 0x48, 0xdc, 0x87, 0x3d, 0x23, - 0xa8, 0x1f, 0xba, 0x4f, 0x06, 0xe0, 0xe3, 0x40, - 0x2e, 0x9d, 0x82, 0x22, 0xe0, 0x79, 0xea, 0x0d, - 0x70, 0xff, 0x50, 0x92, 0x15, 0x82, 0x22, 0xe0, - 0xbe, 0xe8, 0xe7, 0x82, 0x9c, 0xee, 0xd6, 0x41, - 0x11, 0x08, 0xe2, 0x23, 0xfe, 0x4f, 0x09, 0xa4, - 0xad, 0x9c, 0x65, 0x89, 0xb1, 0x5c, 0xff, 0x8b, - 0xe5, 0x5f, 0x56, 0x8c, 0x71, 0x3c, 0x97, 0xb1, - 0xa1, 0x76, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, - 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, - 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6c, 0x65, - 0x66, 0x74, 0x2d, 0x69, 0x6e, 0x64, 0x65, 0x78, - 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, - 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xeb, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x68, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x99, 0x6d, - 0x88, 0x54, 0x65, 0x14, 0xc7, 0x7f, 0x77, 0x66, - 0x67, 0x67, 0xdc, 0xd7, 0xf1, 0x6d, 0x7d, 0xdb, - 0x32, 0x0c, 0xdd, 0xd2, 0xc0, 0x63, 0xb9, 0x42, - 0xa4, 0x85, 0x06, 0x86, 0x09, 0x45, 0xd2, 0x12, - 0xa2, 0x99, 0x48, 0x54, 0xe0, 0xb7, 0x82, 0x88, - 0x3e, 0x94, 0x51, 0x04, 0x59, 0x44, 0x42, 0x41, - 0x96, 0x06, 0x41, 0xa1, 0x5f, 0x0a, 0x0b, 0xf4, - 0x43, 0x90, 0x25, 0x96, 0x56, 0xeb, 0xcb, 0xd1, - 0x0c, 0x77, 0x37, 0xdf, 0x4a, 0x5d, 0x5f, 0xd6, - 0xd6, 0xd5, 0x75, 0xdb, 0x99, 0xd9, 0xd9, 0x99, - 0x3e, 0xcc, 0xac, 0xde, 0xbd, 0xfb, 0xdc, 0x99, - 0x7b, 0xef, 0x4c, 0x46, 0xff, 0x2f, 0x7b, 0x9e, - 0xe7, 0x9c, 0xe7, 0x79, 0xce, 0xff, 0x9e, 0x73, - 0xf7, 0x3e, 0xe7, 0x8c, 0x95, 0xcd, 0x66, 0xf9, - 0x3f, 0xa3, 0xa2, 0xdc, 0x1b, 0x8a, 0x48, 0x18, - 0x58, 0x0c, 0xc4, 0x80, 0xed, 0xaa, 0x9a, 0xb2, - 0xeb, 0x9b, 0xbf, 0xb6, 0xee, 0xcb, 0x44, 0xa2, - 0xab, 0x2c, 0x2b, 0x7c, 0x1b, 0xd9, 0xcc, 0xc1, - 0x54, 0x7f, 0xe2, 0xa3, 0xc3, 0xcb, 0xb2, 0x27, - 0x82, 0x9e, 0x57, 0x76, 0x02, 0xc0, 0xf3, 0xc0, - 0xfa, 0xbc, 0xfc, 0x16, 0xf0, 0x12, 0x80, 0xf5, - 0x9a, 0x15, 0x92, 0x79, 0xe1, 0xf7, 0x63, 0x13, - 0x27, 0xb5, 0x4c, 0x6c, 0xb8, 0x63, 0x5c, 0x5d, - 0x24, 0x4e, 0x22, 0x79, 0x6d, 0x71, 0xe7, 0xe9, - 0x5f, 0x57, 0x34, 0x6f, 0xaf, 0x5c, 0xd7, 0xba, - 0x34, 0xb5, 0x39, 0xc8, 0x61, 0xa1, 0x20, 0x8b, - 0x44, 0x24, 0x2e, 0x22, 0xb3, 0x44, 0xc4, 0x32, - 0xa8, 0x97, 0xdb, 0xe4, 0xc7, 0x87, 0x84, 0xd9, - 0xcd, 0x15, 0x2f, 0xc7, 0x1a, 0x1b, 0x57, 0x4f, - 0x9b, 0x32, 0x77, 0x5c, 0xbc, 0x7d, 0x02, 0x97, - 0xd6, 0xf7, 0x11, 0xda, 0x51, 0xc7, 0x9c, 0xa6, - 0x25, 0x8d, 0xb5, 0x63, 0x26, 0xbf, 0xd9, 0xbc, - 0xad, 0x72, 0x5e, 0x10, 0x5f, 0x7c, 0x13, 0x10, - 0x91, 0x26, 0xe0, 0x3c, 0x70, 0x04, 0x78, 0xdb, - 0x60, 0xd2, 0x68, 0x93, 0xeb, 0x01, 0xe6, 0x6c, - 0xb3, 0xe2, 0xd9, 0x58, 0x78, 0x75, 0x43, 0x7c, - 0xda, 0xa8, 0x78, 0xcf, 0x58, 0x0e, 0xbf, 0xd2, - 0xc1, 0xd9, 0x5d, 0x17, 0x38, 0xba, 0xe9, 0x18, - 0xd1, 0x8e, 0x1a, 0x66, 0xdc, 0x3a, 0xbf, 0xc1, - 0xaa, 0x8a, 0x6e, 0xb8, 0x29, 0x04, 0x80, 0x27, - 0x80, 0x68, 0x5e, 0x7e, 0xd2, 0xae, 0x10, 0x91, - 0x28, 0x30, 0xce, 0x36, 0x55, 0x07, 0x10, 0xb2, - 0x58, 0x10, 0x19, 0x33, 0x66, 0x6a, 0x3c, 0x14, - 0x27, 0xd1, 0x9a, 0x66, 0x30, 0x39, 0x78, 0xdd, - 0x20, 0xd6, 0x53, 0xc5, 0xf8, 0x48, 0x03, 0xd5, - 0xd5, 0xf1, 0x49, 0xb3, 0xbf, 0xb1, 0xaa, 0xfd, - 0x3a, 0x13, 0x84, 0x80, 0xfd, 0xbd, 0x69, 0x10, - 0x91, 0xdb, 0x6d, 0xe3, 0xc9, 0x80, 0x3d, 0xad, - 0x2a, 0x45, 0x24, 0x9a, 0x89, 0x54, 0x2c, 0x8c, - 0x55, 0xd5, 0x55, 0x8c, 0x0a, 0x55, 0xd1, 0xf5, - 0x73, 0xf7, 0xb0, 0xcd, 0xea, 0xa2, 0xf5, 0xd4, - 0x84, 0x6a, 0xa9, 0xad, 0x69, 0x18, 0x1b, 0xe9, - 0xe7, 0x2e, 0xbf, 0xce, 0x04, 0x21, 0xe0, 0x5c, - 0x73, 0xaf, 0xdd, 0x1f, 0x83, 0x7d, 0x9d, 0x05, - 0x7d, 0x56, 0xc6, 0x22, 0x94, 0x0e, 0xd1, 0x79, - 0xe0, 0xc2, 0x30, 0x65, 0x2c, 0x12, 0x23, 0x6c, - 0x55, 0x40, 0x36, 0x33, 0x90, 0xc9, 0x90, 0x28, - 0xd5, 0x99, 0x20, 0x6b, 0xe6, 0xda, 0xe4, 0x51, - 0x06, 0xfb, 0x9a, 0x4c, 0x22, 0xbd, 0x33, 0xdd, - 0xdf, 0x97, 0xe8, 0x3d, 0xd3, 0x47, 0x3a, 0x99, - 0x1e, 0xa6, 0xcc, 0x46, 0x33, 0x0c, 0x64, 0x53, - 0xf4, 0xf6, 0xfe, 0xd5, 0x93, 0x4a, 0x73, 0xb4, - 0x54, 0x67, 0xbc, 0x60, 0xd0, 0x31, 0x6e, 0xb2, - 0xc9, 0x55, 0x06, 0xfb, 0xea, 0xd1, 0x57, 0xd9, - 0x9b, 0xbc, 0xd4, 0x75, 0xe2, 0xf2, 0xf1, 0x2b, - 0x23, 0x94, 0xe9, 0xd1, 0x29, 0xba, 0x53, 0x17, - 0x49, 0xfc, 0xdd, 0xd3, 0x7e, 0xa4, 0x25, 0x9b, - 0x32, 0xac, 0x2f, 0x08, 0x23, 0x01, 0x11, 0xa9, - 0x16, 0x91, 0x35, 0x22, 0xb2, 0xc8, 0xa0, 0xee, - 0x71, 0x8c, 0x67, 0xd8, 0x64, 0x63, 0x04, 0xbe, - 0x5b, 0x9d, 0x4d, 0x0c, 0xa6, 0x06, 0x5e, 0xef, - 0x3a, 0xd8, 0xd9, 0xef, 0x54, 0x5e, 0xa9, 0xeb, - 0x66, 0x5f, 0xc7, 0xf6, 0xd3, 0x03, 0x57, 0x7b, - 0x9f, 0xf5, 0xee, 0xf6, 0x0d, 0xb8, 0x45, 0xe0, - 0x55, 0x60, 0x33, 0xf0, 0xad, 0x88, 0x2c, 0x75, - 0xe8, 0x2e, 0x3b, 0xc6, 0x53, 0x45, 0xa4, 0x32, - 0x2f, 0x9b, 0x22, 0x50, 0x03, 0x70, 0x68, 0x69, - 0x7a, 0x6b, 0x72, 0xbf, 0x75, 0xd2, 0xae, 0x08, - 0xd7, 0x84, 0xb2, 0xdf, 0xb7, 0x7d, 0xda, 0x76, - 0xad, 0xff, 0xe2, 0xa3, 0xfb, 0x5a, 0xb2, 0x7f, - 0xfa, 0xf4, 0x1d, 0x70, 0x27, 0x50, 0x6f, 0x93, - 0x5f, 0x70, 0xe8, 0x9c, 0x04, 0xc2, 0xc0, 0xb4, - 0xbc, 0x6c, 0x8c, 0xc0, 0x75, 0xa9, 0x27, 0x32, - 0xde, 0xae, 0x18, 0x1c, 0x48, 0x9f, 0x1c, 0xb8, - 0xdc, 0x75, 0x77, 0xeb, 0x92, 0xd4, 0xc1, 0xe2, - 0xae, 0x9a, 0xe1, 0x46, 0xa0, 0xd3, 0x26, 0x3f, - 0x20, 0x22, 0xb7, 0xd8, 0xc6, 0x4e, 0x02, 0x70, - 0x23, 0x8d, 0x5c, 0x09, 0x88, 0xc8, 0x24, 0x60, - 0x18, 0x01, 0x92, 0xa1, 0xb6, 0x3d, 0x2d, 0xd9, - 0x11, 0x69, 0xe5, 0x07, 0x6e, 0x04, 0xce, 0x3a, - 0x6c, 0x56, 0xd8, 0xc6, 0xdd, 0x8c, 0xc4, 0x10, - 0x81, 0xb0, 0x41, 0x37, 0x14, 0x81, 0x59, 0x45, - 0xce, 0x09, 0x04, 0x37, 0x02, 0xbf, 0x3b, 0xc6, - 0xf6, 0x2f, 0xae, 0x29, 0x02, 0x77, 0xe6, 0xff, - 0x9a, 0x08, 0x0c, 0x7d, 0x5d, 0x67, 0x18, 0x74, - 0xe7, 0xdc, 0x5d, 0xf3, 0x06, 0x37, 0x02, 0x3f, - 0x01, 0xf6, 0xd0, 0xce, 0x14, 0x91, 0x7b, 0x6c, - 0x87, 0xa6, 0x1d, 0xf6, 0xcd, 0x05, 0xf6, 0x1b, - 0x8a, 0x40, 0x93, 0x41, 0x57, 0x52, 0xfa, 0xb8, - 0x1d, 0x88, 0xaa, 0x26, 0x81, 0x1f, 0x1c, 0xd3, - 0xab, 0xf2, 0xba, 0x34, 0x70, 0xd2, 0xa1, 0x9b, - 0x25, 0x22, 0xb5, 0x14, 0x4e, 0x21, 0x53, 0x04, - 0x7c, 0x7f, 0x79, 0x9d, 0x28, 0xf4, 0x21, 0xfb, - 0xd6, 0x31, 0x5e, 0x2e, 0x22, 0x43, 0xf7, 0xa0, - 0x63, 0x86, 0x7d, 0xe6, 0x52, 0x98, 0x80, 0x29, - 0x02, 0x37, 0x95, 0xc0, 0x78, 0xe0, 0xa1, 0xbc, - 0xec, 0x7c, 0x47, 0x00, 0xee, 0x07, 0x26, 0x1a, - 0xe6, 0x1f, 0x14, 0x91, 0x15, 0xc0, 0x54, 0x83, - 0x2e, 0x59, 0xd4, 0xc3, 0x22, 0x28, 0x54, 0x91, - 0x1d, 0x00, 0x2e, 0x00, 0x13, 0x6c, 0x73, 0x2b, - 0x81, 0xed, 0xc0, 0x1f, 0x06, 0xfb, 0x75, 0x2e, - 0xfb, 0x4c, 0x07, 0x3e, 0x73, 0xd1, 0xb9, 0x46, - 0x20, 0x5f, 0x2c, 0x3d, 0x93, 0x3f, 0x73, 0x3a, - 0xb0, 0x07, 0x78, 0x4a, 0x55, 0x7b, 0xed, 0x76, - 0xae, 0x11, 0x50, 0xd5, 0x0c, 0xb0, 0xc5, 0x31, - 0xbd, 0x4c, 0x44, 0x66, 0x02, 0x17, 0xdd, 0xd6, - 0xf9, 0x84, 0x91, 0x80, 0x88, 0x54, 0x91, 0xcb, - 0x80, 0x0f, 0x81, 0xf9, 0xe4, 0x1e, 0xe2, 0x63, - 0xc0, 0x23, 0x4e, 0xdb, 0x62, 0x97, 0x39, 0xe7, - 0x93, 0xab, 0x04, 0x3e, 0x27, 0x57, 0xeb, 0x96, - 0x03, 0x23, 0x52, 0x28, 0xdf, 0x14, 0xd8, 0x02, - 0x2c, 0x74, 0xa8, 0x32, 0xc0, 0x3e, 0xa7, 0x7d, - 0x41, 0x02, 0xaa, 0xba, 0x1f, 0x68, 0x73, 0x9e, - 0x41, 0xae, 0x70, 0x29, 0x07, 0x4c, 0x11, 0xd8, - 0x80, 0xe1, 0x49, 0x03, 0x9b, 0x54, 0xb5, 0xdd, - 0x39, 0xe9, 0xe5, 0x3a, 0xed, 0x7c, 0x99, 0xcb, - 0x89, 0x61, 0x04, 0xf2, 0x17, 0xc7, 0xb5, 0x06, - 0xbb, 0x4e, 0xe0, 0x45, 0xd3, 0x06, 0x5e, 0x08, - 0xb4, 0xfa, 0xf7, 0xcb, 0x33, 0xae, 0xa7, 0x90, - 0x88, 0xd4, 0x03, 0x1b, 0x5d, 0xec, 0xd6, 0xaa, - 0xea, 0xc8, 0x62, 0x02, 0x6f, 0x04, 0x7e, 0x09, - 0xe0, 0x98, 0x57, 0xd8, 0x3b, 0x18, 0xef, 0x00, - 0x53, 0x0c, 0x36, 0x5f, 0xa8, 0xea, 0x36, 0xb7, - 0x0d, 0xbc, 0x10, 0x68, 0x07, 0x7a, 0x8b, 0x5a, - 0x05, 0xc3, 0x02, 0x00, 0x11, 0x59, 0x00, 0x3c, - 0x6d, 0xd0, 0x0f, 0xe0, 0x92, 0x3a, 0x43, 0xb0, - 0xbc, 0xf4, 0x46, 0x45, 0x44, 0x81, 0xd9, 0x01, - 0x1c, 0x2c, 0x86, 0x5e, 0xe0, 0x61, 0xe0, 0x13, - 0x72, 0xff, 0xeb, 0x9d, 0xd8, 0xa8, 0xaa, 0xcf, - 0x15, 0xda, 0xc0, 0x6b, 0x4d, 0xdc, 0x59, 0xdc, - 0x24, 0x10, 0x6a, 0x81, 0xdd, 0x98, 0x9d, 0x4f, - 0x01, 0x6f, 0x14, 0xdb, 0xe0, 0xbf, 0x26, 0x50, - 0x08, 0x5b, 0x55, 0xf5, 0x4c, 0x31, 0x23, 0xaf, - 0x04, 0x4a, 0xbe, 0xb7, 0x07, 0xc0, 0xbb, 0x5e, - 0x8c, 0xbc, 0x12, 0xd8, 0x5f, 0x82, 0x23, 0x41, - 0xb0, 0x5b, 0x55, 0x0f, 0x79, 0x31, 0xf4, 0x4a, - 0x60, 0x27, 0x23, 0x8b, 0x98, 0x7f, 0x13, 0x5b, - 0xbd, 0x1a, 0x7a, 0x22, 0xa0, 0xaa, 0x57, 0x81, - 0xbd, 0x81, 0xdd, 0xf1, 0x87, 0x0c, 0xf0, 0xa5, - 0x57, 0x63, 0x3f, 0x9d, 0xb9, 0xaf, 0xfc, 0xfb, - 0x12, 0x08, 0xbb, 0x54, 0xf5, 0xbc, 0x57, 0x63, - 0x3f, 0x04, 0x3e, 0x06, 0x8c, 0x9f, 0xf3, 0x32, - 0xe2, 0x34, 0xb0, 0xc6, 0xcf, 0x02, 0xcf, 0x04, - 0xf2, 0x69, 0xf4, 0x81, 0x5f, 0x8f, 0x7c, 0xe0, - 0x2c, 0xb0, 0x50, 0x55, 0x4f, 0xf9, 0x59, 0xe4, - 0xb7, 0xb9, 0xfb, 0x1e, 0x65, 0xe8, 0x24, 0x18, - 0x70, 0x0e, 0x58, 0xa4, 0xaa, 0xc7, 0xfd, 0x2e, - 0xf4, 0x45, 0x40, 0x55, 0xbb, 0xc8, 0xf5, 0x4c, - 0xcb, 0x89, 0x33, 0xe4, 0x9e, 0x7c, 0x47, 0x90, - 0xc5, 0x41, 0xda, 0xeb, 0x1b, 0x80, 0x72, 0xfd, - 0xb8, 0x7c, 0x0a, 0x98, 0x6f, 0x2a, 0x54, 0xbc, - 0xc2, 0x37, 0x01, 0x55, 0x3d, 0x06, 0xec, 0x08, - 0x7a, 0xa0, 0x0d, 0x19, 0x60, 0xa5, 0xaa, 0x9a, - 0x1a, 0x04, 0x9e, 0x11, 0xe8, 0x67, 0x56, 0x72, - 0x75, 0x71, 0xa9, 0xf8, 0x4d, 0x55, 0x7f, 0x2c, - 0x75, 0x93, 0xa0, 0x04, 0x4a, 0x3e, 0x98, 0x91, - 0xb5, 0x76, 0x20, 0x04, 0x25, 0xd0, 0x55, 0x86, - 0xb3, 0x03, 0xe7, 0xbd, 0x1d, 0x41, 0x09, 0x94, - 0xdc, 0x51, 0xa3, 0x4c, 0x55, 0x5e, 0x20, 0x02, - 0xf9, 0xa6, 0x57, 0xa9, 0x97, 0x3b, 0xe7, 0x8f, - 0x85, 0x81, 0x10, 0x34, 0x02, 0x50, 0x7a, 0x63, - 0x36, 0x53, 0xe2, 0x7a, 0x00, 0xfe, 0x01, 0x3b, - 0x8a, 0x84, 0x37, 0xd0, 0x7c, 0x42, 0x34, 0x00, - 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, - 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, - 0x61, 0x79, 0x29, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x2d, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x2d, - 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, - 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xbc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x39, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xc5, 0x99, 0x5b, - 0x6c, 0x54, 0x45, 0x18, 0xc7, 0x7f, 0x67, 0x2f, - 0x6d, 0x69, 0x55, 0x8a, 0x50, 0xa0, 0xa9, 0x24, - 0x90, 0x82, 0x62, 0x30, 0xf6, 0xab, 0x91, 0x18, - 0x0d, 0xa8, 0x8d, 0x97, 0x78, 0x41, 0x93, 0x26, - 0x5e, 0x48, 0x94, 0x28, 0x86, 0x68, 0x22, 0xfa, - 0xc0, 0x93, 0x0f, 0xbe, 0x68, 0xa2, 0x89, 0x11, - 0x21, 0x1a, 0x2f, 0x41, 0x8d, 0x0f, 0x22, 0x06, - 0x43, 0x8c, 0x37, 0x14, 0x1f, 0x14, 0x7d, 0x90, - 0xd4, 0x80, 0xd8, 0x7c, 0x2a, 0x44, 0xb1, 0x94, - 0x02, 0x01, 0x2b, 0x56, 0x96, 0xb5, 0xed, 0x76, - 0xb7, 0x7b, 0xe9, 0xf1, 0xa1, 0x67, 0xeb, 0xf6, - 0xec, 0x6c, 0x77, 0xcf, 0x9e, 0xb3, 0xf8, 0x7f, - 0x99, 0x99, 0xef, 0x32, 0xf3, 0xfd, 0x77, 0xe6, - 0xcc, 0xcc, 0x37, 0x6b, 0xd9, 0xb6, 0x4d, 0xad, - 0xd0, 0xf9, 0x79, 0x64, 0x4d, 0x28, 0x1a, 0xdd, - 0x14, 0x89, 0xd4, 0x2d, 0xc4, 0x26, 0x95, 0xcb, - 0xa6, 0x8f, 0x4e, 0x24, 0x53, 0x1b, 0x7b, 0xbb, - 0xed, 0xbf, 0x83, 0x1a, 0xc3, 0xaa, 0x15, 0x01, - 0xf9, 0x32, 0xfa, 0x42, 0x7d, 0xf3, 0xc5, 0xeb, - 0x17, 0xb5, 0x76, 0xcc, 0xb7, 0x0f, 0x46, 0x89, - 0xd6, 0x47, 0x08, 0xad, 0xc8, 0x32, 0x70, 0xac, - 0xa7, 0x6f, 0x3c, 0x39, 0xf2, 0x60, 0xef, 0x5d, - 0xd9, 0x03, 0x41, 0x8c, 0x53, 0x13, 0x02, 0x9d, - 0xbb, 0xc3, 0xab, 0x42, 0xf3, 0x9a, 0x3f, 0x6a, - 0x5f, 0xb4, 0xb2, 0x25, 0xb5, 0xdd, 0xe2, 0xe4, - 0xae, 0x41, 0x00, 0x2e, 0x7f, 0xa4, 0x9d, 0x8b, - 0xee, 0x69, 0x40, 0x0f, 0x7d, 0x76, 0x28, 0x93, - 0x18, 0xed, 0xec, 0xed, 0xb6, 0xb3, 0x7e, 0xc7, - 0x0a, 0xf9, 0xed, 0x40, 0x44, 0x36, 0x89, 0xc8, - 0x2e, 0x11, 0xb9, 0x35, 0x2f, 0xb3, 0xeb, 0xc2, - 0x5b, 0xe6, 0xb6, 0xb6, 0xb7, 0xb4, 0x84, 0x17, - 0x10, 0xdb, 0x37, 0x3c, 0x65, 0x7b, 0x66, 0xef, - 0x59, 0x5a, 0xa3, 0x6d, 0xb4, 0x2d, 0xba, 0xf2, - 0x52, 0xab, 0x3e, 0xfa, 0xa4, 0xe3, 0x6f, 0x89, - 0xc8, 0x0a, 0x11, 0x99, 0x73, 0xde, 0x09, 0x88, - 0x48, 0x27, 0xb0, 0x15, 0xb8, 0x17, 0xd8, 0x2d, - 0x22, 0x8b, 0xaf, 0xfa, 0xd8, 0x8a, 0xd8, 0xd1, - 0xf0, 0xbc, 0x0b, 0xc2, 0xb3, 0x69, 0x0e, 0xcf, - 0x21, 0x97, 0xc8, 0x4d, 0xd9, 0x8f, 0x9d, 0x4d, - 0x31, 0x37, 0x3c, 0x8f, 0xd6, 0xe6, 0xa5, 0x75, - 0xa1, 0x50, 0x24, 0x4f, 0x78, 0x33, 0x70, 0x08, - 0x18, 0x14, 0x91, 0xcb, 0xce, 0x2b, 0x01, 0xa0, - 0xad, 0xa0, 0x5e, 0x07, 0xac, 0x01, 0x96, 0x58, - 0xb3, 0xea, 0x1b, 0x1b, 0x42, 0x0d, 0xcc, 0x0a, - 0x35, 0x91, 0x1e, 0xcb, 0x4c, 0x19, 0xa4, 0x46, - 0x53, 0x34, 0x64, 0x66, 0xd1, 0x18, 0x6a, 0x22, - 0x1c, 0x89, 0xce, 0x75, 0xc4, 0xeb, 0x9c, 0xb2, - 0x1e, 0xb8, 0xdf, 0x6b, 0x00, 0x7e, 0x09, 0xb8, - 0xd7, 0xf0, 0x6d, 0xc0, 0xa0, 0x95, 0xce, 0xa6, - 0x2d, 0x2c, 0xec, 0xb4, 0x4d, 0x2e, 0x93, 0x9b, - 0x66, 0x90, 0x8c, 0xa5, 0xb0, 0xb0, 0xb0, 0x73, - 0x13, 0x09, 0x11, 0x69, 0x07, 0xe6, 0x17, 0xa8, - 0x23, 0x5e, 0x03, 0x08, 0x9a, 0x40, 0xd7, 0xc4, - 0xb3, 0x1d, 0xe3, 0xf6, 0x78, 0x66, 0x24, 0x6d, - 0xa7, 0x49, 0x8c, 0x25, 0x8a, 0x1c, 0x86, 0x47, - 0x87, 0x89, 0x27, 0xff, 0x62, 0x62, 0x22, 0xf7, - 0x0b, 0x70, 0xad, 0xdf, 0x78, 0xfc, 0x12, 0x48, - 0xb9, 0xda, 0x8d, 0xc0, 0x72, 0x2b, 0x93, 0xdb, - 0x1e, 0x3b, 0x77, 0x32, 0x19, 0x1f, 0x8b, 0x17, - 0x39, 0xc4, 0xc6, 0x62, 0xf4, 0x1d, 0xef, 0x39, - 0x9e, 0x4b, 0x25, 0x9f, 0x07, 0xae, 0xf6, 0x1b, - 0x8f, 0x5f, 0x02, 0x83, 0x06, 0x59, 0x87, 0x95, - 0xce, 0x6d, 0x8e, 0x9f, 0x3e, 0xb6, 0xff, 0xf4, - 0x50, 0x7f, 0xc6, 0xad, 0x3c, 0xdc, 0xdf, 0x13, - 0x4f, 0x24, 0xe3, 0xaf, 0xf6, 0x76, 0xdb, 0x67, - 0x80, 0x65, 0x2e, 0x75, 0xce, 0x6d, 0x5f, 0x0e, - 0x7e, 0x09, 0x9c, 0x36, 0xc8, 0xa4, 0xb7, 0xdb, - 0xb6, 0xed, 0xe4, 0xf8, 0xcd, 0x83, 0x3f, 0x1f, - 0xf9, 0xc2, 0xad, 0x1c, 0xea, 0x89, 0xbf, 0x76, - 0xe0, 0xf6, 0xc4, 0x56, 0xa7, 0xe9, 0x26, 0x50, - 0x34, 0x65, 0x22, 0x72, 0x83, 0x88, 0x6c, 0x10, - 0x91, 0x0b, 0x4d, 0x01, 0xf8, 0x22, 0xa0, 0xaa, - 0x29, 0xe0, 0xac, 0x4b, 0xdc, 0x01, 0xd0, 0xdb, - 0x6d, 0xe7, 0xb2, 0xef, 0xb6, 0xbd, 0xec, 0xf6, - 0x99, 0x38, 0x38, 0xfb, 0x57, 0x27, 0xb0, 0x08, - 0xb0, 0xc4, 0xa5, 0x3e, 0x57, 0xd8, 0x10, 0x91, - 0x3b, 0x80, 0x6f, 0x81, 0xb7, 0x81, 0x67, 0x4c, - 0x31, 0xf8, 0x3e, 0xc8, 0x28, 0x9e, 0x85, 0x8e, - 0x82, 0x7a, 0x93, 0xc1, 0x3e, 0x2f, 0x5b, 0x4c, - 0xf1, 0xae, 0x73, 0xce, 0xd5, 0xde, 0x04, 0x58, - 0x4e, 0xfd, 0x22, 0xd3, 0xe0, 0xb5, 0x20, 0xd0, - 0x22, 0x22, 0xad, 0x4e, 0xbd, 0xd1, 0x60, 0x9f, - 0x97, 0x2d, 0x35, 0xe8, 0xa6, 0x08, 0x88, 0xc8, - 0x42, 0xa0, 0xab, 0x40, 0xf7, 0xa7, 0x69, 0xf0, - 0x20, 0x08, 0x9c, 0x32, 0xc8, 0xae, 0x70, 0x4a, - 0xd3, 0xba, 0x0d, 0x3b, 0xa5, 0x7b, 0xfd, 0x03, - 0xc4, 0x0a, 0xea, 0x6b, 0x0b, 0x6c, 0xc1, 0xbc, - 0x61, 0x04, 0x42, 0xc0, 0xd4, 0x71, 0xfe, 0x4a, - 0x30, 0x13, 0x81, 0xe5, 0x06, 0x5d, 0xe1, 0x12, - 0x7a, 0xd8, 0xa5, 0xeb, 0x37, 0x0d, 0x1e, 0x04, - 0x81, 0xa4, 0x41, 0x96, 0x0f, 0xce, 0x44, 0x20, - 0x3f, 0xe6, 0x35, 0x2e, 0x79, 0x16, 0xe7, 0xc7, - 0x10, 0x91, 0x0e, 0xa6, 0x7f, 0x4b, 0x69, 0xe0, - 0x3b, 0xd3, 0xe0, 0x41, 0x10, 0x70, 0x1f, 0x66, - 0x30, 0x33, 0x81, 0xb0, 0x88, 0x34, 0x32, 0x3d, - 0x40, 0x80, 0x01, 0x55, 0xcd, 0x9f, 0xec, 0x0f, - 0xb9, 0x74, 0x3d, 0xaa, 0x3a, 0x66, 0x1a, 0xbc, - 0xd6, 0x04, 0x4c, 0x3b, 0x47, 0x18, 0x58, 0x49, - 0xf1, 0x0e, 0x74, 0x14, 0xa6, 0xb6, 0xd7, 0x07, - 0x5c, 0xba, 0xaf, 0x4a, 0x0d, 0x1e, 0x04, 0x81, - 0x71, 0x83, 0xac, 0x4d, 0x44, 0xd6, 0x01, 0x37, - 0x19, 0x74, 0xf3, 0x81, 0x1b, 0x0d, 0xf2, 0x3e, - 0xa7, 0xbc, 0x85, 0xe9, 0x17, 0x3c, 0x98, 0x81, - 0x40, 0xd1, 0xed, 0x4f, 0x44, 0x9a, 0x80, 0xf7, - 0x80, 0xeb, 0x9c, 0x4e, 0x77, 0x00, 0x6f, 0xa9, - 0x6a, 0xa9, 0xd4, 0xcd, 0x34, 0x03, 0x00, 0xdb, - 0x4b, 0xc8, 0x9f, 0x28, 0x21, 0x3f, 0xe1, 0x94, - 0x6b, 0x5d, 0xf2, 0x33, 0xc0, 0x8f, 0x25, 0x7c, - 0x8c, 0x33, 0xb0, 0x06, 0xe8, 0x06, 0x16, 0x00, - 0xab, 0x80, 0x6d, 0xc0, 0x5e, 0x67, 0xdd, 0x9a, - 0x50, 0x8a, 0x80, 0x57, 0x0c, 0x89, 0xc8, 0x52, - 0xe0, 0x3e, 0x97, 0x7c, 0xa7, 0xaa, 0x4e, 0x94, - 0x72, 0x32, 0x11, 0xe8, 0xa5, 0xf8, 0x52, 0xd5, - 0x05, 0xec, 0x14, 0x91, 0xb0, 0xc1, 0xde, 0xb4, - 0x84, 0xaa, 0xc1, 0x8b, 0xc0, 0x4e, 0xa0, 0xc1, - 0x25, 0xdf, 0x31, 0x93, 0x53, 0x11, 0x01, 0x55, - 0xed, 0x03, 0xde, 0x30, 0xd8, 0xde, 0x0d, 0xbc, - 0x62, 0x90, 0x07, 0x35, 0x03, 0x0b, 0x29, 0xbe, - 0x5e, 0xff, 0xa6, 0xaa, 0x25, 0x97, 0x0f, 0x94, - 0xfe, 0x88, 0x9f, 0xc6, 0x7c, 0xc2, 0x6e, 0x14, - 0x91, 0x3b, 0x5d, 0xb2, 0xa0, 0x08, 0x98, 0xb0, - 0xb7, 0x9c, 0x81, 0x91, 0x80, 0xaa, 0x8e, 0x00, - 0x8f, 0x97, 0xf0, 0x79, 0x53, 0x44, 0x66, 0x17, - 0xb4, 0x83, 0x5a, 0x42, 0x26, 0xfc, 0x50, 0xce, - 0xa0, 0xe4, 0x36, 0xaa, 0xaa, 0xbb, 0x81, 0x0f, - 0x0d, 0xaa, 0x36, 0xe0, 0xa5, 0x82, 0xf6, 0x25, - 0xde, 0xe3, 0xaa, 0x18, 0x65, 0x1f, 0xbf, 0xca, - 0x9d, 0x03, 0x4f, 0x01, 0x45, 0x59, 0x15, 0xb0, - 0x41, 0x44, 0x56, 0x3b, 0xf5, 0xd5, 0x06, 0x7d, - 0x10, 0x18, 0x01, 0x8e, 0x94, 0x33, 0x2a, 0xfb, - 0x32, 0x27, 0x22, 0xdb, 0x80, 0xc7, 0x0c, 0xaa, - 0x3e, 0x60, 0x3d, 0xb0, 0x87, 0x12, 0x77, 0x75, - 0x9f, 0xf8, 0x49, 0x55, 0xa5, 0x9c, 0x51, 0x25, - 0x27, 0xf1, 0x73, 0x4c, 0x5e, 0xa6, 0xdc, 0x58, - 0x06, 0xec, 0xa3, 0x36, 0xc1, 0x03, 0xfc, 0x51, - 0x89, 0x51, 0x59, 0x02, 0xaa, 0x7a, 0x0a, 0x78, - 0xdf, 0x77, 0x38, 0xde, 0x11, 0x0c, 0x01, 0x07, - 0x5b, 0x80, 0xda, 0xbd, 0xc3, 0x9b, 0x61, 0x4c, - 0x60, 0xdc, 0xa8, 0x88, 0x80, 0xaa, 0x1e, 0x06, - 0xbe, 0xf6, 0x15, 0x8e, 0x77, 0xcc, 0x78, 0x80, - 0xe5, 0xe1, 0xe5, 0x36, 0xfa, 0x41, 0x95, 0x81, - 0x54, 0x83, 0x2c, 0xf0, 0x4d, 0x25, 0x86, 0x5e, - 0x08, 0x7c, 0x82, 0x79, 0x4b, 0xad, 0x05, 0xbe, - 0x57, 0xd5, 0xe1, 0xf2, 0x66, 0x1e, 0x08, 0xa8, - 0x6a, 0x8c, 0xf3, 0xb7, 0x8c, 0x3e, 0xad, 0xd4, - 0xd0, 0x6b, 0x42, 0xf3, 0x28, 0x30, 0xe0, 0xd1, - 0xc7, 0x2b, 0xfe, 0x61, 0xf2, 0x21, 0xab, 0x22, - 0x78, 0x22, 0xe0, 0x6c, 0xa9, 0x5d, 0xfc, 0x97, - 0x7c, 0xd4, 0x02, 0xaf, 0x57, 0xba, 0x7c, 0xa0, - 0x8a, 0x94, 0x52, 0x55, 0x4f, 0x30, 0x49, 0xc2, - 0x74, 0x5b, 0xf5, 0x8b, 0x24, 0x50, 0xf4, 0x1c, - 0x39, 0x13, 0xaa, 0xca, 0x89, 0x55, 0x75, 0x80, - 0xc9, 0xbc, 0x36, 0xe8, 0x99, 0x78, 0x47, 0x55, - 0x87, 0xbc, 0x38, 0x54, 0x9d, 0xd4, 0xab, 0x6a, - 0x3f, 0x70, 0x3d, 0x70, 0xbc, 0xda, 0x3e, 0x5c, - 0xb0, 0x31, 0x27, 0x4c, 0x33, 0xc2, 0xef, 0xeb, - 0xf4, 0x49, 0x26, 0x93, 0x70, 0xcf, 0xef, 0xfa, - 0x06, 0xec, 0x51, 0xd5, 0xa3, 0x5e, 0x9d, 0x7c, - 0x3f, 0xab, 0xa8, 0xea, 0x7e, 0x40, 0xfd, 0xf6, - 0xc3, 0x64, 0x3e, 0xec, 0x19, 0x41, 0xbc, 0x0b, - 0x01, 0xfc, 0x1e, 0x40, 0x1f, 0xfb, 0xab, 0x71, - 0x0a, 0x8a, 0x80, 0xe7, 0xa9, 0x37, 0xc0, 0xfd, - 0x47, 0x49, 0x45, 0x08, 0x8a, 0xc0, 0x68, 0x00, - 0x7d, 0x54, 0x95, 0x5b, 0x07, 0x45, 0x20, 0x88, - 0x8f, 0xf8, 0x7f, 0x25, 0x50, 0xf2, 0xe5, 0xac, - 0x42, 0x64, 0x55, 0xb5, 0xaa, 0x1f, 0xe1, 0x5f, - 0xe5, 0x5b, 0x98, 0x08, 0x78, 0x31, 0x51, 0x5c, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x2f, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x75, 0x73, 0x65, 0x72, - 0x2d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x88, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, - 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, - 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, - 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x6e, - 0x61, 0x6d, 0x65, 0x2d, 0x6d, 0x6f, 0x64, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, - 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, - 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, - 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, - 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x2d, 0x6d, - 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, - 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, - 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, - 0x61, 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, - 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, - 0x65, 0x20, 0x67, 0x69, 0x6e, 0x74, 0x20, 0x2d, - 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, - 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, - 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x3d, 0x22, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, - 0x72, 0x64, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, - 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x31, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, - 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x78, 0x74, 0x3d, 0x22, 0x41, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x41, 0x64, 0x6d, 0x69, - 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x31, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, - 0x65, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, - 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, 0x72, - 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, - 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, - 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, - 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, - 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, - 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x31, - 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, - 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4f, 0x76, 0x65, 0x72, - 0x6c, 0x61, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2d, 0x76, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x68, 0x62, 0x6f, 0x78, 0x32, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x38, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x6c, 0x69, - 0x73, 0x74, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, - 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, - 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x69, 0x73, 0x74, 0x2d, - 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, - 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x22, 0x3e, 0x6e, 0x65, 0x76, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x73, 0x63, - 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, - 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, - 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, - 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, - 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, - 0x72, 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x69, 0x73, - 0x74, 0x2d, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, - 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, - 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x61, 0x64, 0x64, 0x2d, - 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x2d, 0x74, - 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, - 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, - 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, - 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x22, 0x3e, 0x69, 0x63, 0x6f, 0x6e, - 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x74, - 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x64, 0x64, 0x2d, 0x75, 0x73, - 0x65, 0x72, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, - 0x74, 0x2d, 0x61, 0x64, 0x64, 0x2d, 0x73, 0x79, - 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, 0x20, 0x55, - 0x73, 0x65, 0x72, 0x20, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, - 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, - 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, - 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x2d, 0x75, 0x73, - 0x65, 0x72, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6c, 0x69, 0x73, - 0x74, 0x2d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, - 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x55, 0x73, 0x65, - 0x72, 0x20, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, - 0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, 0x69, - 0x6e, 0x2d, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x76, - 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, - 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, - 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, 0x6d, 0x45, - 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, - 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x55, 0x6d, 0x45, 0x64, 0x69, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x62, 0x6f, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, - 0x70, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, - 0x3e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x2d, 0x74, 0x79, 0x70, 0x65, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, - 0x78, 0x74, 0x2d, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, - 0x79, 0x70, 0x65, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x20, 0x5f, 0x54, 0x79, 0x70, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, - 0x74, 0x79, 0x70, 0x65, 0x2d, 0x63, 0x6f, 0x6d, - 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, - 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x43, 0x63, 0x45, 0x64, 0x69, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, - 0x75, 0x6c, 0x6c, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x31, - 0x2e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x37, 0x30, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, - 0x33, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, - 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x6c, 0x6c, 0x69, 0x70, - 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x50, 0x41, - 0x4e, 0x47, 0x4f, 0x5f, 0x45, 0x4c, 0x4c, 0x49, - 0x50, 0x53, 0x49, 0x5a, 0x45, 0x5f, 0x45, 0x4e, - 0x44, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x2d, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x2d, 0x62, 0x6f, 0x74, 0x74, 0x6f, - 0x6d, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x4f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x6c, - 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, 0x6d, - 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x2d, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, - 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x41, 0x5f, 0x75, 0x74, - 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x20, 0x4c, - 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, 0x75, - 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, - 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, - 0x75, 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x4f, - 0x52, 0x49, 0x45, 0x4e, 0x54, 0x41, 0x54, 0x49, - 0x4f, 0x4e, 0x5f, 0x48, 0x4f, 0x52, 0x49, 0x5a, - 0x4f, 0x4e, 0x54, 0x41, 0x4c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, - 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x73, - 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, - 0x5f, 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, - 0x6e, 0x74, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x46, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, - 0x72, 0x69, 0x6e, 0x74, 0x20, 0x4c, 0x6f, 0x67, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x61, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, - 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x68, 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, - 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, 0x6f, - 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x3e, 0x61, 0x76, 0x61, 0x74, - 0x61, 0x72, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, - 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, - 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x2d, 0x61, 0x31, 0x31, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x55, 0x73, 0x65, - 0x72, 0x20, 0x49, 0x63, 0x6f, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x67, 0x67, 0x6c, - 0x65, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x72, 0x2d, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x6c, 0x69, 0x65, 0x66, - 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, - 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, - 0x63, 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x32, 0x2d, 0x61, 0x31, 0x31, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x55, 0x73, 0x65, - 0x72, 0x20, 0x49, 0x63, 0x6f, 0x6e, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x55, 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6d, - 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, - 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, - 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x2d, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x61, - 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, - 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, - 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, - 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x55, 0x6d, 0x45, 0x64, - 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, - 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x73, 0x74, 0x2d, - 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4c, 0x61, 0x73, 0x74, 0x20, - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, - 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6c, - 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, - 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x48, 0x69, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, - 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, - 0x64, 0x65, 0x22, 0x3e, 0x62, 0x6f, 0x74, 0x68, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, - 0x63, 0x6f, 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, - 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x73, - 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, - 0x62, 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x66, 0x69, - 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, - 0x74, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x2d, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x75, 0x74, - 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x73, - 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, - 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, - 0x64, 0x65, 0x22, 0x3e, 0x62, 0x6f, 0x74, 0x68, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x6c, 0x61, 0x6e, - 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, - 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, - 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x75, 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x2f, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x67, 0x72, 0x69, 0x64, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, - 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, - 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, 0x65, 0x72, - 0x72, 0x6f, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, - 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, - 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x0f, 0xbd, 0x49, - 0x44, 0x41, 0x54, 0x68, 0x81, 0xbd, 0x9a, 0x79, - 0x74, 0x5c, 0xd5, 0x7d, 0xc7, 0x3f, 0xf7, 0xcd, - 0x9b, 0x45, 0xdb, 0xc8, 0xda, 0x25, 0x4b, 0xb6, - 0x64, 0x1b, 0xd9, 0xc2, 0xd8, 0xb1, 0x03, 0x05, - 0xb3, 0x64, 0xa1, 0x71, 0xc9, 0x62, 0x48, 0x4b, - 0x49, 0x49, 0x02, 0x4e, 0xc6, 0xd0, 0x90, 0x23, - 0x38, 0x07, 0x4a, 0x1d, 0x48, 0x70, 0x81, 0x98, - 0x10, 0xd6, 0x10, 0x63, 0x68, 0x9b, 0x06, 0x94, - 0x00, 0x21, 0x53, 0x9b, 0xb2, 0xd3, 0x50, 0xe3, - 0x84, 0xcd, 0xc1, 0xb1, 0xcd, 0x6e, 0x56, 0x19, - 0x6f, 0xd8, 0x42, 0x58, 0xd6, 0x3a, 0x92, 0x66, - 0x34, 0x33, 0x1a, 0xcd, 0xbc, 0xad, 0x7f, 0xfc, - 0xee, 0x68, 0x31, 0x24, 0xd8, 0x40, 0x7b, 0xcf, - 0x79, 0xe7, 0x5a, 0xf3, 0xee, 0xbc, 0xf9, 0x7e, - 0x7f, 0xfb, 0xef, 0xf7, 0xac, 0x3c, 0xcf, 0xe3, - 0xe3, 0xac, 0x68, 0x34, 0xea, 0x07, 0xa6, 0x03, - 0x35, 0xfa, 0xaa, 0x04, 0x12, 0x40, 0x37, 0xd0, - 0x03, 0xf4, 0x44, 0x22, 0x91, 0xdc, 0xc7, 0x7a, - 0xf8, 0x11, 0x2c, 0x75, 0x24, 0x04, 0xa2, 0xd1, - 0x68, 0x35, 0xb0, 0x0c, 0x38, 0x03, 0xf8, 0x32, - 0x50, 0xa2, 0x6f, 0x39, 0x40, 0x5c, 0x5f, 0x2e, - 0x30, 0x0b, 0xf0, 0x01, 0xaf, 0x00, 0x77, 0x01, - 0xf7, 0x47, 0x22, 0x91, 0xe4, 0xa7, 0x07, 0x7b, - 0x62, 0x1d, 0x16, 0x81, 0x68, 0x34, 0x5a, 0x0b, - 0xdc, 0x06, 0x7c, 0x13, 0x30, 0xf4, 0xc7, 0x07, - 0x80, 0x5f, 0x22, 0x12, 0x9f, 0x01, 0x2c, 0x44, - 0x40, 0x6f, 0x07, 0x9e, 0x02, 0x4e, 0x47, 0x08, - 0x7e, 0x0d, 0x21, 0xf4, 0x20, 0x70, 0x4d, 0x24, - 0x12, 0x39, 0xf0, 0xff, 0x46, 0x20, 0x1a, 0x8d, - 0x1a, 0xc0, 0x85, 0x88, 0xc4, 0x9f, 0x02, 0xbe, - 0x01, 0x7c, 0x4e, 0x83, 0x79, 0x10, 0xb8, 0x05, - 0x98, 0x0d, 0xec, 0x01, 0x9e, 0x03, 0xfc, 0x1a, - 0x74, 0x2f, 0x70, 0x03, 0x70, 0x3b, 0x90, 0x04, - 0x36, 0x6b, 0x82, 0x5f, 0x01, 0x2e, 0x8a, 0x44, - 0x22, 0x2f, 0x7c, 0x5a, 0x04, 0x8c, 0x3f, 0x77, - 0x23, 0x1a, 0x8d, 0x06, 0x34, 0xe8, 0x1a, 0x44, - 0xfa, 0xa7, 0x68, 0xf0, 0x0f, 0x00, 0xaf, 0x03, - 0x0f, 0x6b, 0xa0, 0x67, 0x01, 0x6d, 0x40, 0x03, - 0x70, 0x2a, 0xa2, 0x8d, 0x06, 0xe0, 0xfb, 0xc0, - 0xb5, 0xc0, 0x36, 0x44, 0x53, 0x15, 0xc0, 0x09, - 0xc0, 0x9c, 0x68, 0x34, 0xda, 0xfc, 0x7f, 0x4e, - 0x00, 0xf8, 0x57, 0x0d, 0x76, 0x3e, 0xf0, 0x55, - 0xe0, 0x1f, 0x80, 0x3f, 0x01, 0x1d, 0xc0, 0x4d, - 0x88, 0x84, 0x1f, 0xd7, 0x67, 0x2e, 0x43, 0xec, - 0xff, 0x4e, 0xe0, 0x7f, 0xf4, 0xf7, 0x5b, 0x81, - 0x77, 0x80, 0x0b, 0x80, 0xe5, 0xc0, 0x67, 0x80, - 0xff, 0x06, 0x5e, 0x06, 0xb6, 0x44, 0xa3, 0xd1, - 0x53, 0x3e, 0x0d, 0x02, 0x1f, 0x6a, 0x42, 0xd1, - 0x68, 0xb4, 0x15, 0x38, 0x1a, 0xf8, 0xbc, 0x06, - 0x78, 0x25, 0xd0, 0x07, 0xfc, 0x1b, 0xf0, 0x0b, - 0x44, 0xa2, 0x4d, 0x88, 0x43, 0x8f, 0x22, 0xce, - 0x5a, 0x05, 0xd4, 0xe9, 0x73, 0x6f, 0xe9, 0xcf, - 0x5e, 0x02, 0xd6, 0x22, 0xe6, 0xf3, 0x5d, 0xe0, - 0x7c, 0xc0, 0x03, 0x9e, 0x07, 0xfe, 0x11, 0x58, - 0x14, 0x89, 0x44, 0x52, 0x9f, 0x84, 0x80, 0xf9, - 0x21, 0xe0, 0x97, 0x00, 0x97, 0x00, 0x0f, 0x21, - 0x4e, 0x59, 0x0e, 0x94, 0x02, 0xab, 0x81, 0x9f, - 0x01, 0xbf, 0xd7, 0x9f, 0x2d, 0xd3, 0x5f, 0xe9, - 0x46, 0x34, 0xb1, 0x1b, 0x38, 0x49, 0x03, 0xec, - 0x04, 0x2e, 0x42, 0x34, 0x73, 0x15, 0xe2, 0x3b, - 0xf7, 0x02, 0x67, 0x03, 0xf7, 0x03, 0xf7, 0xe9, - 0xdf, 0x5e, 0x05, 0x5c, 0x9d, 0xff, 0xed, 0xd6, - 0xd6, 0x56, 0x1f, 0xe2, 0x6f, 0x8f, 0xb7, 0xb5, - 0xb5, 0x1d, 0x56, 0x78, 0xfc, 0x00, 0x01, 0xe0, - 0x3a, 0x60, 0x0d, 0xf0, 0x1f, 0xc0, 0x0a, 0x0d, - 0xe2, 0x0d, 0x44, 0x23, 0x71, 0xc4, 0x8c, 0x6e, - 0x02, 0xda, 0x81, 0x6b, 0x80, 0x16, 0xc4, 0xbc, - 0x96, 0x30, 0x61, 0x92, 0xef, 0x6b, 0x70, 0x55, - 0xc0, 0xaf, 0x10, 0x69, 0xcf, 0x46, 0x02, 0xc2, - 0x95, 0xc0, 0x8d, 0x88, 0x16, 0xcf, 0x8d, 0x46, - 0xa3, 0xd7, 0x47, 0x22, 0x91, 0xb1, 0xd6, 0xd6, - 0xd6, 0x62, 0xc4, 0x67, 0x8e, 0xd5, 0xdf, 0xbb, - 0xeb, 0x70, 0x08, 0x4c, 0xf1, 0x81, 0x68, 0x34, - 0xda, 0x02, 0x14, 0x23, 0xd1, 0x22, 0x06, 0x6c, - 0x04, 0x3e, 0x8b, 0x44, 0x9c, 0x08, 0x22, 0xbd, - 0x9f, 0x20, 0x66, 0x73, 0x3e, 0x70, 0x29, 0xe2, - 0x0b, 0x0b, 0x80, 0x3f, 0x22, 0xd2, 0xbc, 0x02, - 0x18, 0x06, 0xfe, 0x13, 0x71, 0xf2, 0xeb, 0x11, - 0x7f, 0xfa, 0x39, 0x22, 0xdd, 0x57, 0x81, 0x5a, - 0x7d, 0xe6, 0x68, 0xe0, 0xac, 0x5b, 0x6e, 0xb9, - 0xe5, 0x4b, 0x9a, 0xd0, 0xb1, 0x40, 0xbf, 0x7e, - 0xd6, 0x61, 0xad, 0x43, 0x35, 0xb0, 0x0c, 0x89, - 0x28, 0xbf, 0x00, 0x7e, 0x03, 0xcc, 0x03, 0x82, - 0x48, 0x28, 0x2c, 0x44, 0x42, 0x64, 0x10, 0xf8, - 0x17, 0xc4, 0x1f, 0x4e, 0xd2, 0xdf, 0xdb, 0x0d, - 0xe4, 0x10, 0xe9, 0x06, 0x10, 0x53, 0xdb, 0x07, - 0xac, 0x03, 0xbe, 0xa8, 0x9f, 0x6b, 0x21, 0xbe, - 0xf1, 0x7d, 0x44, 0x8b, 0x47, 0x01, 0x8f, 0xf7, - 0xf6, 0xf6, 0xd6, 0xf6, 0xf7, 0xf7, 0xff, 0x1c, - 0x09, 0xc5, 0xbb, 0x80, 0xab, 0xda, 0xda, 0xda, - 0x86, 0x0e, 0x97, 0xc0, 0xa1, 0x51, 0x68, 0x0c, - 0x18, 0xd0, 0xc4, 0x76, 0x03, 0x27, 0xea, 0xcf, - 0xf3, 0x25, 0xc1, 0x57, 0x11, 0xad, 0x84, 0x35, - 0xf8, 0x04, 0x12, 0x1a, 0xcf, 0x02, 0x7e, 0x8c, - 0x98, 0xc9, 0x36, 0xc4, 0xee, 0x5f, 0xd1, 0xcf, - 0xba, 0x0a, 0x31, 0xa3, 0xd3, 0x81, 0x67, 0x80, - 0xc5, 0xc0, 0x93, 0xc0, 0x29, 0xbb, 0x76, 0xed, - 0x7a, 0xa6, 0xa3, 0xa3, 0xe3, 0x6f, 0x0d, 0xc3, - 0xa8, 0x0b, 0x85, 0x42, 0xef, 0x00, 0xff, 0x7c, - 0x24, 0xe0, 0xa7, 0x10, 0xd0, 0xb5, 0xcd, 0x56, - 0xa4, 0x44, 0x78, 0x82, 0x89, 0xa8, 0x02, 0x10, - 0xd2, 0xfb, 0x4c, 0xe0, 0x47, 0x48, 0x68, 0xf4, - 0x10, 0xe7, 0xbc, 0x0c, 0x71, 0xda, 0x57, 0x91, - 0x2c, 0xdc, 0x8a, 0x38, 0xf6, 0xc5, 0x48, 0x04, - 0x3a, 0x5d, 0x0b, 0xe3, 0xaf, 0x81, 0x9d, 0xc0, - 0x2c, 0xcf, 0xf3, 0x3a, 0x7b, 0x7b, 0x7b, 0x4f, - 0x18, 0x1c, 0x1c, 0x3c, 0x07, 0xf0, 0x57, 0x54, - 0x54, 0xf4, 0x1f, 0x77, 0xdc, 0x71, 0x5d, 0x6d, - 0x6d, 0x6d, 0xd9, 0x23, 0x01, 0x3f, 0x85, 0x00, - 0xf0, 0x77, 0x88, 0x34, 0xbf, 0x82, 0xc4, 0xfa, - 0xa3, 0x99, 0x30, 0xb1, 0x11, 0xbd, 0x1f, 0x00, - 0x8e, 0xd3, 0xe4, 0x7e, 0x87, 0x38, 0xee, 0xb7, - 0x90, 0x78, 0x7f, 0x3f, 0x50, 0x0d, 0x5c, 0x8e, - 0x38, 0x60, 0x3d, 0x12, 0x52, 0x41, 0x7c, 0x64, - 0x0f, 0xb0, 0xdf, 0x75, 0xdd, 0xb2, 0xf6, 0xf6, - 0xf6, 0xb3, 0x62, 0xb1, 0x98, 0xe9, 0xf3, 0xf9, - 0x8c, 0xd9, 0xb3, 0x67, 0x8f, 0xd4, 0xd5, 0xd5, - 0x3d, 0x87, 0xe4, 0x89, 0x23, 0x5e, 0x93, 0x09, - 0xac, 0x00, 0x6c, 0xc4, 0x36, 0x7b, 0x90, 0xe8, - 0x92, 0x27, 0x30, 0xa8, 0xf7, 0xcd, 0x4c, 0xd8, - 0xfd, 0x1a, 0x24, 0xfa, 0xa4, 0x81, 0x33, 0x91, - 0xb0, 0xfb, 0xb0, 0x7e, 0xce, 0x53, 0xfa, 0x8c, - 0x05, 0x1c, 0x04, 0x8e, 0x01, 0xb6, 0xa5, 0xd3, - 0xe9, 0xe6, 0xfd, 0xfb, 0xf7, 0xdb, 0xa3, 0xa3, - 0xa3, 0x2d, 0x3e, 0x9f, 0x8f, 0x8a, 0x8a, 0x8a, - 0x9b, 0x6a, 0x6a, 0x6a, 0xe6, 0x23, 0x9a, 0xf9, - 0xc4, 0x04, 0xe6, 0x23, 0x92, 0x35, 0x35, 0xa8, - 0xb2, 0x49, 0xf7, 0xfb, 0xf5, 0xbe, 0x05, 0x29, - 0xa1, 0x53, 0x40, 0x17, 0x12, 0xa1, 0x7e, 0x0f, - 0x2c, 0x02, 0x6e, 0x46, 0x42, 0xab, 0x1f, 0x31, - 0x2f, 0x10, 0xc7, 0x4f, 0x00, 0x8d, 0x3b, 0x77, - 0xee, 0x7c, 0xa8, 0xb3, 0xb3, 0xf3, 0xe6, 0x74, - 0x3a, 0x3d, 0x62, 0x9a, 0xe6, 0xe0, 0x9c, 0x39, - 0x73, 0x68, 0x6e, 0x6e, 0xde, 0x8d, 0xe4, 0x94, - 0x83, 0xc0, 0xdc, 0x68, 0x34, 0x1a, 0xfc, 0x58, - 0x04, 0x74, 0xd1, 0x36, 0x43, 0x03, 0x03, 0x29, - 0x89, 0xfd, 0x93, 0x08, 0x14, 0xe9, 0xbd, 0x1b, - 0xf1, 0x8b, 0x57, 0x90, 0xe8, 0x02, 0xf0, 0x18, - 0x62, 0xe7, 0xa3, 0x48, 0x78, 0x04, 0x28, 0xd0, - 0x7b, 0x0e, 0xc8, 0x0e, 0x0d, 0x0d, 0x15, 0x24, - 0x93, 0xc9, 0x7f, 0x77, 0x5d, 0xb7, 0xcc, 0x34, - 0xcd, 0xb7, 0x16, 0x2c, 0x58, 0xf0, 0x60, 0x20, - 0x10, 0xc8, 0x9f, 0x2b, 0x46, 0xea, 0x24, 0x93, - 0x09, 0x5f, 0x3b, 0xec, 0x95, 0x37, 0x91, 0x3a, - 0x0d, 0x78, 0x3f, 0x22, 0x3d, 0x57, 0xdf, 0xcb, - 0x13, 0x28, 0xd3, 0xbb, 0xa5, 0xcf, 0x6e, 0x44, - 0x7c, 0xc4, 0x46, 0x42, 0xe2, 0x9d, 0x48, 0xd8, - 0xad, 0x3f, 0xe4, 0xfc, 0xce, 0x81, 0x81, 0x81, - 0xb9, 0x5d, 0x5d, 0x5d, 0x23, 0x7e, 0xbf, 0x5f, - 0x4d, 0x9b, 0x36, 0x6d, 0xb4, 0xbe, 0xbe, 0x7e, - 0xb3, 0x52, 0x6a, 0x9a, 0xbe, 0x5f, 0xad, 0xf7, - 0x72, 0xa0, 0x2b, 0x12, 0x89, 0x24, 0x8e, 0x94, - 0x40, 0x1e, 0x60, 0x93, 0xde, 0xc7, 0x10, 0x73, - 0x71, 0x99, 0x88, 0xff, 0x00, 0xf9, 0x1f, 0xb4, - 0x11, 0x29, 0xf7, 0x21, 0x39, 0x62, 0x33, 0x52, - 0x76, 0x94, 0x20, 0xe5, 0xf4, 0x69, 0x88, 0xa3, - 0xcf, 0xf6, 0x3c, 0xcf, 0xdb, 0xbe, 0x7d, 0xfb, - 0x59, 0x7d, 0x7d, 0x7d, 0x45, 0xae, 0xeb, 0xa6, - 0x1a, 0x1a, 0x1a, 0xc2, 0x0d, 0x0d, 0x0d, 0x6b, - 0x95, 0x52, 0xc7, 0x4f, 0x7a, 0x5e, 0xa9, 0xde, - 0xbf, 0x0c, 0xbc, 0x1e, 0x8d, 0x46, 0xf3, 0x02, - 0x38, 0xec, 0x95, 0xd7, 0x40, 0xa3, 0xde, 0x17, - 0x69, 0x00, 0x15, 0x1a, 0xd4, 0xa8, 0xfe, 0x3c, - 0x2f, 0xd1, 0x12, 0xfd, 0x9d, 0x18, 0xf0, 0x57, - 0x80, 0x02, 0x96, 0x02, 0xff, 0x05, 0xfc, 0x3d, - 0x92, 0x1f, 0x6e, 0xb5, 0x6d, 0x7b, 0x69, 0x67, - 0x67, 0x67, 0x02, 0xf8, 0x96, 0x61, 0x18, 0x54, - 0x55, 0x55, 0xfd, 0xb2, 0xaa, 0xaa, 0xea, 0x36, - 0xc4, 0x87, 0x4e, 0x65, 0x6c, 0xac, 0x56, 0xbd, - 0xfd, 0x76, 0x8f, 0xda, 0xb4, 0x69, 0x25, 0x45, - 0x45, 0x10, 0x8f, 0x2f, 0x56, 0x89, 0x44, 0xb5, - 0x17, 0x0a, 0xfd, 0x61, 0xfd, 0x8a, 0x15, 0x4f, - 0x03, 0x4f, 0x03, 0x9b, 0x96, 0x7b, 0xde, 0x47, - 0x86, 0xd5, 0x3c, 0x81, 0xbc, 0xf3, 0x9c, 0x82, - 0x54, 0x90, 0xf9, 0x2f, 0x66, 0xf4, 0x9e, 0xb7, - 0xe9, 0x42, 0xbd, 0x7f, 0x09, 0xf1, 0x19, 0x90, - 0x32, 0xe3, 0x01, 0xc4, 0x17, 0xc6, 0x06, 0x07, - 0x07, 0xdf, 0x1e, 0x1a, 0x1a, 0xba, 0x36, 0x99, - 0x4c, 0x76, 0x16, 0x16, 0x16, 0x4e, 0x6f, 0x6c, - 0x6c, 0x7c, 0xb3, 0xb0, 0xb0, 0x30, 0x01, 0xec, - 0x22, 0x93, 0x69, 0x31, 0xee, 0xbd, 0xb7, 0x58, - 0x6d, 0xdf, 0xbe, 0x02, 0xcb, 0x32, 0x80, 0x3a, - 0xc3, 0x30, 0x08, 0x05, 0x4c, 0x14, 0x4c, 0xcf, - 0x0c, 0x58, 0x75, 0xae, 0x84, 0xdc, 0x95, 0x40, - 0x7a, 0xbd, 0x52, 0xb7, 0x01, 0x3f, 0x5d, 0xee, - 0x79, 0xd6, 0x47, 0x11, 0x48, 0x22, 0x66, 0x71, - 0x32, 0xd2, 0x36, 0x9e, 0x08, 0x0c, 0x21, 0xce, - 0xbb, 0x73, 0xd2, 0xb9, 0xbc, 0x93, 0x9f, 0x8e, - 0x64, 0xd9, 0xd5, 0x48, 0xf6, 0x7d, 0x14, 0xe8, - 0xef, 0xe9, 0xe9, 0xb9, 0x7e, 0x70, 0x70, 0xf0, - 0x57, 0x80, 0xeb, 0xf7, 0xfb, 0x7b, 0x9a, 0x9b, - 0x9b, 0x1b, 0x4d, 0xd3, 0xbc, 0x0f, 0x38, 0x47, - 0xbd, 0xfe, 0xfa, 0x16, 0x63, 0xfd, 0xfa, 0x1b, - 0x19, 0x18, 0x28, 0x2a, 0x2b, 0x0a, 0x51, 0x5e, - 0x5a, 0x48, 0x71, 0x30, 0x80, 0x3f, 0xe8, 0x47, - 0x19, 0x62, 0xc9, 0x9e, 0xeb, 0x2a, 0x2b, 0x67, - 0x91, 0x1a, 0xb3, 0x18, 0xca, 0x64, 0x8b, 0x86, - 0xd3, 0x99, 0xab, 0x81, 0x33, 0xd6, 0x2b, 0xf5, - 0x9d, 0xe5, 0x9e, 0xb7, 0xe3, 0x2f, 0x11, 0x48, - 0x21, 0xce, 0x78, 0x36, 0x52, 0xc3, 0x5c, 0x00, - 0xfc, 0x01, 0xc9, 0x9e, 0xcf, 0x21, 0x13, 0x87, - 0x1e, 0x26, 0xa2, 0x51, 0x0f, 0x52, 0xdf, 0xaf, - 0x41, 0x4c, 0x69, 0xeb, 0xae, 0x5d, 0xbb, 0xd6, - 0xe5, 0x72, 0xb9, 0x5b, 0x0c, 0xc3, 0x08, 0x9b, - 0xa6, 0xf9, 0xec, 0xdc, 0xb9, 0x73, 0xeb, 0x0c, - 0xc3, 0x80, 0x5c, 0x6e, 0xb7, 0x7a, 0xf2, 0xc9, - 0x9b, 0x8d, 0x47, 0x1e, 0x71, 0x4c, 0x9f, 0x61, - 0x36, 0xd5, 0x96, 0x53, 0x16, 0x2e, 0xc6, 0xac, - 0x9d, 0x8e, 0x59, 0x37, 0x1d, 0xa3, 0xb4, 0x0c, - 0x15, 0x16, 0x57, 0xf0, 0x46, 0x12, 0xb8, 0x89, - 0x61, 0x0a, 0x7b, 0xba, 0x29, 0xef, 0xed, 0x66, - 0x78, 0x24, 0xc5, 0x7b, 0x03, 0xf1, 0x45, 0xb6, - 0xe3, 0xbe, 0xb6, 0x5e, 0xa9, 0x2b, 0x81, 0xdb, - 0x96, 0x7b, 0x9e, 0xfb, 0xe7, 0x08, 0xec, 0x43, - 0x4c, 0xe7, 0x58, 0x24, 0xdb, 0xde, 0x8a, 0x64, - 0xd4, 0x5f, 0x23, 0x65, 0xc1, 0x5e, 0xa0, 0x19, - 0x49, 0x6a, 0xdf, 0x01, 0xee, 0x01, 0xe6, 0x00, - 0xb7, 0xbf, 0xf9, 0xe6, 0x9b, 0x83, 0x4a, 0xa9, - 0xb5, 0x86, 0x61, 0x14, 0x86, 0xc3, 0xe1, 0xe7, - 0x67, 0xce, 0x9c, 0xb9, 0x15, 0x29, 0xb5, 0x1f, - 0x30, 0xee, 0xbe, 0xfb, 0x0e, 0xf5, 0xe2, 0x8b, - 0xaa, 0xac, 0x28, 0xe4, 0x6b, 0xac, 0x9c, 0x46, - 0xc1, 0x8c, 0x19, 0x98, 0x73, 0x8f, 0x81, 0x90, - 0x58, 0xa3, 0x1b, 0x0c, 0x12, 0x38, 0x66, 0x21, - 0x4e, 0x32, 0x89, 0xbb, 0x7b, 0x37, 0x54, 0xd4, - 0x62, 0x56, 0xd4, 0x62, 0x1e, 0xd5, 0x42, 0xe5, - 0x9e, 0x1d, 0x14, 0x87, 0x0e, 0xa8, 0xce, 0x81, - 0x84, 0x7f, 0x38, 0x9d, 0x59, 0x83, 0xb4, 0xaa, - 0x2b, 0x27, 0x13, 0xc8, 0x47, 0xa1, 0x24, 0x12, - 0x19, 0xfa, 0xf5, 0xa1, 0xf9, 0x48, 0x0c, 0x0f, - 0x20, 0xfd, 0xef, 0x89, 0x48, 0x3d, 0xf3, 0x39, - 0xa4, 0xbe, 0xf9, 0x31, 0xd0, 0x60, 0xdb, 0xf6, - 0x05, 0xed, 0xed, 0xed, 0x33, 0x0c, 0xc3, 0xf8, - 0x89, 0xcf, 0xe7, 0x2b, 0x28, 0x2f, 0x2f, 0x8f, - 0xce, 0x9c, 0x39, 0xf3, 0x31, 0x0d, 0xbe, 0x4f, - 0x6d, 0xda, 0x34, 0xa6, 0x5e, 0x7c, 0xb1, 0xae, - 0x3a, 0x5c, 0xc4, 0x9c, 0x9a, 0x72, 0x15, 0xa8, - 0x9f, 0x81, 0x31, 0x6b, 0x1e, 0xae, 0xe5, 0xe0, - 0x26, 0x93, 0x38, 0x89, 0x04, 0xe6, 0xf1, 0xc7, - 0x53, 0x7b, 0xde, 0x79, 0xd4, 0x5f, 0x72, 0x09, - 0xb9, 0x9a, 0x1a, 0xdc, 0x64, 0x52, 0x2e, 0xcb, - 0xc1, 0x6c, 0x9a, 0x47, 0xb0, 0xae, 0x81, 0x39, - 0x35, 0x65, 0xaa, 0x3a, 0x5c, 0x04, 0x70, 0xe9, - 0x7a, 0xa5, 0x4e, 0xfe, 0x4b, 0x04, 0x62, 0x48, - 0x32, 0xd9, 0x87, 0xc4, 0xf9, 0xbc, 0xd4, 0x4d, - 0xa4, 0x0d, 0x5c, 0x0c, 0xbc, 0x09, 0x2c, 0x4d, - 0xa5, 0x52, 0xe7, 0xef, 0xdd, 0xbb, 0xf7, 0x72, - 0xe0, 0x1b, 0x86, 0x61, 0x64, 0xab, 0xaa, 0xaa, - 0x56, 0x4f, 0x9f, 0x3e, 0xbd, 0x0e, 0xa9, 0xfb, - 0x07, 0x19, 0x1a, 0xba, 0xca, 0x78, 0xe2, 0x89, - 0x48, 0x30, 0xe0, 0xa7, 0xbe, 0x22, 0x8c, 0x93, - 0x73, 0x31, 0xaa, 0xeb, 0x71, 0x92, 0x29, 0x9c, - 0x64, 0x12, 0x27, 0x99, 0x24, 0xd5, 0xdd, 0xcd, - 0xb4, 0x25, 0x4b, 0xc6, 0xc1, 0x84, 0x1a, 0x1b, - 0xb1, 0x86, 0x87, 0xc7, 0xef, 0xdb, 0xa9, 0x14, - 0xaa, 0xa6, 0x01, 0x27, 0xeb, 0x50, 0x5f, 0x11, - 0x26, 0xe8, 0x37, 0x3d, 0xe0, 0xde, 0xf5, 0x4a, - 0x8d, 0x27, 0xbc, 0xbc, 0x09, 0x75, 0x22, 0x51, - 0xe5, 0x80, 0x26, 0xb3, 0x5b, 0x9b, 0xd1, 0x1b, - 0xc0, 0x5c, 0x24, 0xb9, 0x25, 0x11, 0x67, 0x6d, - 0x4d, 0xa5, 0x52, 0x0f, 0x75, 0x74, 0x74, 0xdc, - 0xa4, 0x94, 0x6a, 0x04, 0xf6, 0x36, 0x35, 0x35, - 0x3d, 0x56, 0x54, 0x54, 0xb4, 0x0a, 0xf1, 0x91, - 0xd7, 0x80, 0x4b, 0x8d, 0x47, 0x1f, 0x7d, 0x84, - 0x58, 0x4c, 0x35, 0x4d, 0xaf, 0x44, 0xd9, 0x0e, - 0x8e, 0x59, 0x88, 0x93, 0x9c, 0x3a, 0xdb, 0x1a, - 0x8b, 0xc7, 0x71, 0xad, 0x89, 0x00, 0x63, 0x16, - 0x17, 0x33, 0x36, 0x34, 0x44, 0xb0, 0xa0, 0x60, - 0xca, 0x39, 0xc7, 0x1f, 0xc2, 0xb4, 0x46, 0x69, - 0xaa, 0x9a, 0x66, 0xec, 0xee, 0x8e, 0x35, 0x23, - 0x9d, 0xdb, 0x15, 0xe3, 0x1a, 0x88, 0x44, 0x22, - 0x0e, 0x32, 0x5d, 0xdb, 0x88, 0x24, 0xab, 0xb0, - 0xfe, 0x7b, 0x27, 0x32, 0x94, 0x8a, 0x23, 0xe1, - 0xed, 0xb9, 0x91, 0x91, 0x91, 0xcf, 0xef, 0xd9, - 0xb3, 0x67, 0xb1, 0x52, 0xaa, 0xd1, 0xf3, 0xbc, - 0xa7, 0x5b, 0x5a, 0x5a, 0x5e, 0x29, 0x2a, 0x2a, - 0xfa, 0x11, 0x12, 0xb5, 0x22, 0xc0, 0xad, 0xaa, - 0xab, 0xeb, 0x31, 0xb5, 0x75, 0x6b, 0x75, 0x75, - 0xb8, 0x88, 0x92, 0x50, 0x80, 0xb1, 0xfe, 0x38, - 0x76, 0x22, 0x81, 0x3b, 0x32, 0x32, 0xe5, 0x52, - 0x99, 0x0c, 0x6e, 0x3a, 0x3d, 0x0e, 0xd4, 0x4e, - 0x26, 0x71, 0x53, 0xa9, 0x0f, 0x9c, 0x73, 0x12, - 0x23, 0x64, 0xfb, 0xe3, 0x94, 0x84, 0x02, 0x54, - 0x85, 0x8b, 0x3c, 0xe0, 0xf2, 0xf5, 0x4a, 0xcd, - 0x9e, 0x6c, 0x42, 0x68, 0xc9, 0x0d, 0x20, 0xb1, - 0x7f, 0x01, 0xd2, 0xd7, 0x16, 0x20, 0x6d, 0xa1, - 0x03, 0x6c, 0xee, 0xed, 0xed, 0x5d, 0xb5, 0x77, - 0xef, 0xde, 0x98, 0xdf, 0xef, 0x9f, 0x15, 0x0a, - 0x85, 0x36, 0x2d, 0x58, 0xb0, 0xe0, 0x65, 0xd3, - 0x34, 0xcf, 0x05, 0x76, 0x20, 0xe5, 0xf8, 0x25, - 0xc0, 0x3a, 0xf5, 0xc4, 0x13, 0xed, 0x78, 0x1e, - 0xd5, 0xe1, 0x42, 0xec, 0xe4, 0x28, 0x6e, 0x36, - 0x87, 0x13, 0x8f, 0x63, 0xc7, 0xe3, 0xe3, 0xe6, - 0xe1, 0x24, 0x93, 0x78, 0x99, 0x0c, 0x56, 0x3c, - 0x3e, 0x0e, 0x20, 0xdb, 0xdb, 0x8b, 0x37, 0x3a, - 0x3a, 0xe5, 0x8c, 0x1d, 0x8f, 0xe3, 0xc4, 0xe3, - 0x38, 0x39, 0x0b, 0x6b, 0x24, 0x4d, 0x4d, 0xb8, - 0x50, 0x69, 0xdc, 0x67, 0x1e, 0x4a, 0xe0, 0x65, - 0xc4, 0x7e, 0x9f, 0x47, 0x9c, 0xf7, 0x34, 0xa4, - 0xc4, 0xd8, 0xea, 0x79, 0x9e, 0xd1, 0xd1, 0xd1, - 0xb1, 0xb6, 0xbf, 0xbf, 0x7f, 0x0e, 0x40, 0x6d, - 0x6d, 0xad, 0x73, 0xd4, 0x51, 0x47, 0xdd, 0xa7, - 0x94, 0xba, 0x4a, 0x9b, 0xd9, 0x45, 0x48, 0x7f, - 0x30, 0x17, 0x38, 0x43, 0xed, 0xd9, 0xd3, 0x6c, - 0x1a, 0x06, 0xa1, 0x80, 0x1f, 0x3b, 0xa3, 0x73, - 0xa2, 0xe7, 0x91, 0xeb, 0xe8, 0x10, 0x30, 0x93, - 0x09, 0x0c, 0x0e, 0x8e, 0x03, 0xc8, 0x76, 0x77, - 0xa3, 0x26, 0x13, 0x88, 0xc7, 0xc9, 0x75, 0x74, - 0x80, 0x1e, 0xfd, 0x38, 0x99, 0x1c, 0xc1, 0x80, - 0x1f, 0x53, 0x29, 0x17, 0xf8, 0x3a, 0x4c, 0xed, - 0x89, 0x5f, 0x41, 0x92, 0xd2, 0x75, 0xc0, 0xdd, - 0xc0, 0x0f, 0x80, 0xd9, 0x89, 0x44, 0xe2, 0xa7, - 0x43, 0x43, 0x43, 0xa5, 0xc9, 0x64, 0x72, 0xee, - 0xd8, 0xd8, 0xd8, 0x8e, 0x79, 0xf3, 0xe6, 0xcd, - 0x29, 0x2d, 0x2d, 0x7d, 0x0f, 0x99, 0xd6, 0xbd, - 0x0a, 0xfc, 0x10, 0xe9, 0x03, 0x02, 0x48, 0xcb, - 0x79, 0x0e, 0x89, 0x44, 0x7d, 0xd8, 0xef, 0x03, - 0xc0, 0xcd, 0x4e, 0xd8, 0xb8, 0x67, 0xdb, 0x58, - 0x7d, 0x7d, 0xa8, 0x40, 0x00, 0x23, 0x10, 0x10, - 0x52, 0x93, 0x08, 0x8c, 0x75, 0x75, 0x61, 0xa4, - 0x52, 0x78, 0x9e, 0x87, 0x9b, 0xcb, 0xe1, 0xe5, - 0x72, 0xe3, 0xe0, 0x01, 0x9c, 0x9c, 0x85, 0x02, - 0xc2, 0x01, 0xd3, 0x18, 0xca, 0x5a, 0x8b, 0xa7, - 0x68, 0x20, 0x12, 0x89, 0xbc, 0x8b, 0xb4, 0x87, - 0xf3, 0x91, 0x62, 0xee, 0xbb, 0xd9, 0x6c, 0xf6, - 0x60, 0x67, 0x67, 0xe7, 0x6f, 0xfb, 0xfb, 0xfb, - 0xdf, 0xb0, 0x6d, 0xbb, 0x7d, 0xe1, 0xc2, 0x85, - 0x4d, 0xa5, 0xa5, 0xa5, 0x15, 0x5a, 0x33, 0xeb, - 0x90, 0x49, 0xc2, 0x23, 0x48, 0xc7, 0x76, 0x32, - 0xf0, 0x3d, 0x32, 0x99, 0x7f, 0xc2, 0xb2, 0x08, - 0x05, 0xfc, 0x02, 0xc4, 0xb2, 0x99, 0xb2, 0x3c, - 0x0f, 0x2f, 0x9b, 0x15, 0x0d, 0xa4, 0x52, 0x58, - 0xb1, 0xd8, 0x84, 0x06, 0xba, 0xba, 0x70, 0x46, - 0x46, 0xe4, 0x5e, 0x36, 0x3b, 0x05, 0x3c, 0x80, - 0x67, 0xd9, 0xe0, 0x79, 0x84, 0x82, 0x01, 0x80, - 0x69, 0xeb, 0x95, 0x0a, 0x1e, 0x3a, 0x95, 0xa8, - 0x06, 0x9e, 0x05, 0xde, 0xed, 0xeb, 0xeb, 0xab, - 0xeb, 0xea, 0xea, 0x1a, 0x74, 0x5d, 0x37, 0xe4, - 0xf7, 0xfb, 0xdf, 0x6f, 0x69, 0x69, 0xd9, 0x58, - 0x50, 0x50, 0xe0, 0xd3, 0xa4, 0x73, 0xc0, 0xb7, - 0x11, 0xd3, 0xd9, 0x84, 0x64, 0xf0, 0xd5, 0xc0, - 0xf7, 0x54, 0x47, 0xc7, 0xcd, 0xc0, 0xaa, 0x40, - 0xc0, 0x94, 0x1f, 0xfc, 0x90, 0xa5, 0x14, 0x28, - 0x03, 0x4c, 0x05, 0xd6, 0xf0, 0x44, 0x0f, 0xef, - 0xf6, 0xf7, 0x60, 0xfa, 0x05, 0xb7, 0xe7, 0x81, - 0xe7, 0x7e, 0x80, 0x03, 0xae, 0x65, 0x13, 0x08, - 0x8c, 0xc3, 0xae, 0x3c, 0x94, 0xc0, 0x3a, 0xe0, - 0x9a, 0xa1, 0xa1, 0xa1, 0x8b, 0x62, 0xb1, 0x58, - 0x65, 0x30, 0x18, 0x24, 0x1c, 0x0e, 0xd3, 0xd0, - 0xd0, 0xb0, 0xc0, 0x30, 0x8c, 0x65, 0x4c, 0x24, - 0xb7, 0x1c, 0xf0, 0x02, 0xd2, 0xe0, 0x6f, 0x45, - 0x0a, 0x3a, 0x1b, 0x38, 0xd9, 0x2b, 0x2f, 0x3f, - 0x15, 0xc0, 0xb2, 0x1c, 0x8c, 0x92, 0xa9, 0x8f, - 0x57, 0x0a, 0x0c, 0x1f, 0x18, 0x86, 0x5c, 0x9e, - 0x01, 0x99, 0x7d, 0x7b, 0x00, 0x70, 0x52, 0x29, - 0xbc, 0xfe, 0x6e, 0xfc, 0x81, 0x09, 0xf0, 0x6e, - 0xfe, 0x72, 0x26, 0x88, 0x18, 0xa6, 0x89, 0x65, - 0xe5, 0x8b, 0x64, 0x86, 0xa7, 0xfc, 0xc2, 0xb6, - 0x6d, 0xdb, 0x76, 0x94, 0x95, 0x95, 0xbd, 0x37, - 0x3a, 0x3a, 0x1a, 0x03, 0x86, 0x4a, 0x4a, 0x4a, - 0x36, 0xcf, 0x98, 0x31, 0xe3, 0x11, 0xa5, 0xd4, - 0x22, 0xa4, 0x59, 0xaf, 0x42, 0x66, 0x37, 0x37, - 0x20, 0x2d, 0x65, 0x19, 0x32, 0x04, 0x58, 0x87, - 0x44, 0xac, 0xb5, 0xd4, 0xd6, 0x9e, 0x84, 0xcf, - 0xc7, 0x58, 0x36, 0x07, 0x86, 0xc2, 0xf0, 0x9b, - 0xb8, 0x96, 0x8d, 0xcf, 0x27, 0xe0, 0xf3, 0xbb, - 0x61, 0x08, 0xa1, 0xc4, 0x4b, 0xdb, 0xc8, 0x1e, - 0xec, 0x62, 0x78, 0xd3, 0x33, 0x04, 0x0d, 0x07, - 0xbf, 0x7f, 0x42, 0xf2, 0xae, 0x23, 0x04, 0x1c, - 0x03, 0x1c, 0x07, 0x50, 0x3e, 0x30, 0x14, 0x19, - 0xf1, 0xab, 0xd4, 0x72, 0xcf, 0x1b, 0x1d, 0x27, - 0xd0, 0xda, 0xda, 0x1a, 0x04, 0x56, 0x8d, 0x8e, - 0x8e, 0x9e, 0x11, 0x08, 0x04, 0xaa, 0x6b, 0x6a, - 0x6a, 0x5e, 0xaa, 0xa9, 0xa9, 0xc9, 0x20, 0xe5, - 0xc3, 0xe3, 0x88, 0xbd, 0x5f, 0x8c, 0xd4, 0xfd, - 0xb7, 0x23, 0x3d, 0xc3, 0xa1, 0xab, 0x1d, 0x58, - 0x49, 0x20, 0xb0, 0x32, 0x99, 0xcd, 0xce, 0x04, - 0x30, 0x82, 0x7e, 0x94, 0x27, 0x04, 0x7c, 0xe6, - 0x54, 0x02, 0x86, 0x01, 0xa1, 0x4c, 0x9c, 0x97, - 0x16, 0xce, 0xc1, 0xcd, 0xe5, 0xa8, 0x29, 0x00, - 0xbf, 0x6f, 0x92, 0xf4, 0x7d, 0x42, 0x42, 0x69, - 0xb2, 0x04, 0xfd, 0x00, 0x24, 0xb3, 0x96, 0x8b, - 0x24, 0x5b, 0x89, 0x42, 0xad, 0xad, 0xad, 0xe5, - 0x5a, 0xaa, 0x2d, 0xd9, 0x6c, 0x76, 0x6f, 0x53, - 0x53, 0xd3, 0x86, 0xca, 0xca, 0xca, 0xb0, 0x96, - 0xf8, 0x2c, 0x4d, 0xa2, 0x18, 0x69, 0xd0, 0xdb, - 0x91, 0x84, 0x97, 0x60, 0xa2, 0x81, 0xcf, 0x6a, - 0x13, 0x5a, 0x04, 0xfc, 0xd0, 0x5b, 0xba, 0x74, - 0x7a, 0x6e, 0xc3, 0x06, 0x72, 0x39, 0x0b, 0x7f, - 0x61, 0x00, 0xc7, 0xca, 0xe0, 0x33, 0xc1, 0x9c, - 0x44, 0x20, 0xbf, 0xd7, 0x05, 0x21, 0x6d, 0xe7, - 0x08, 0x14, 0x42, 0xc0, 0x98, 0x6a, 0x3e, 0x8e, - 0x03, 0xae, 0xd2, 0xe0, 0x01, 0x5f, 0x61, 0x90, - 0x9c, 0x65, 0x63, 0x79, 0x9e, 0x81, 0x1e, 0xe3, - 0x9b, 0xad, 0xad, 0xad, 0x0a, 0x99, 0x28, 0x34, - 0x6b, 0xb3, 0x58, 0x55, 0x59, 0x59, 0xb9, 0x08, - 0xf8, 0x02, 0xf0, 0x2e, 0x52, 0x7d, 0x5a, 0xfa, - 0x0a, 0x22, 0x6d, 0x60, 0xad, 0xbe, 0xdf, 0x82, - 0x74, 0x73, 0xf9, 0x46, 0x07, 0x00, 0xef, 0xd8, - 0x63, 0x51, 0x1b, 0x36, 0x10, 0x4b, 0x67, 0x98, - 0x51, 0x19, 0xc6, 0xce, 0x8e, 0xa2, 0x3c, 0x6b, - 0x42, 0x0b, 0x93, 0x88, 0x78, 0x9f, 0x59, 0xc2, - 0xf4, 0x2b, 0x7e, 0x86, 0x33, 0xd0, 0xcb, 0xe8, - 0xf5, 0x97, 0x62, 0x0e, 0xf5, 0x8d, 0xdb, 0xbd, - 0x32, 0xc0, 0xd1, 0xe0, 0xf1, 0x99, 0x98, 0xa5, - 0x45, 0x74, 0x0f, 0xe4, 0x47, 0x54, 0xfc, 0x0e, - 0xf4, 0xfb, 0x81, 0xd6, 0xd6, 0xd6, 0x85, 0xc8, - 0x4b, 0x88, 0x1b, 0xda, 0xda, 0xda, 0x92, 0x00, - 0xd1, 0x68, 0xf4, 0x06, 0xa4, 0xb9, 0xa9, 0x43, - 0x6a, 0x1c, 0x0f, 0xc9, 0xd4, 0x07, 0x0e, 0xb9, - 0xde, 0x47, 0x86, 0x01, 0xbd, 0x5a, 0x23, 0x41, - 0xa0, 0xdb, 0x77, 0xe1, 0x85, 0x0f, 0x93, 0xc9, - 0xfc, 0xcd, 0xc2, 0xc6, 0x2a, 0x8a, 0xfc, 0xe0, - 0x0d, 0x0d, 0xe0, 0xf3, 0x69, 0x2d, 0xe8, 0xcb, - 0x55, 0x50, 0xf8, 0x9b, 0x67, 0x28, 0xfd, 0xc2, - 0x52, 0x00, 0xba, 0x6f, 0xbd, 0x8e, 0xd0, 0xaf, - 0x57, 0xe3, 0x3a, 0x22, 0x7d, 0xc7, 0x96, 0xcb, - 0xb6, 0x81, 0xb2, 0x4a, 0x52, 0x96, 0xe2, 0xad, - 0x8e, 0x01, 0x80, 0x07, 0x96, 0x7b, 0xde, 0xb7, - 0xc7, 0x4d, 0xa8, 0xad, 0xad, 0xed, 0x6d, 0x64, - 0x1c, 0x3e, 0x79, 0xdd, 0x89, 0xd4, 0x42, 0x47, - 0x23, 0xf6, 0x9e, 0xd2, 0x92, 0x77, 0x90, 0xe6, - 0xdf, 0x43, 0x4a, 0x8e, 0x4b, 0x90, 0x42, 0xd0, - 0xd3, 0x64, 0x76, 0x01, 0x7b, 0x9d, 0x6b, 0xaf, - 0x1d, 0xf6, 0xad, 0x5e, 0x6d, 0xef, 0xeb, 0x8b, - 0x9b, 0x8b, 0x66, 0x55, 0x61, 0x94, 0x14, 0x63, - 0x8c, 0xa5, 0xc6, 0xcd, 0xc7, 0xe7, 0x83, 0x74, - 0x0e, 0xd4, 0xee, 0x1d, 0xe3, 0x04, 0x46, 0xf7, - 0xee, 0xc4, 0xe7, 0xc1, 0x78, 0x70, 0xd7, 0xe1, - 0xd4, 0x0c, 0x15, 0x63, 0x07, 0x02, 0xbc, 0xdb, - 0xd9, 0xef, 0x22, 0x35, 0xd7, 0xc5, 0x79, 0x90, - 0x1f, 0xf5, 0x92, 0xef, 0x6b, 0x88, 0xad, 0xf9, - 0x90, 0xf1, 0xe1, 0x4e, 0xc4, 0xa4, 0xf2, 0xd3, - 0xea, 0x0c, 0x32, 0x3a, 0x0f, 0x22, 0x73, 0xa2, - 0xf9, 0xc8, 0xb4, 0x62, 0x2e, 0x30, 0x53, 0x6d, - 0xd9, 0x92, 0x35, 0xee, 0xba, 0xab, 0xa4, 0xb1, - 0xaa, 0x98, 0x99, 0xb5, 0x61, 0x54, 0x36, 0x85, - 0x6f, 0x2c, 0x89, 0x69, 0x7a, 0x98, 0x7e, 0xd1, - 0xc0, 0x7b, 0xe9, 0x10, 0xd3, 0x4e, 0x5b, 0x86, - 0x33, 0x32, 0x4c, 0xfa, 0xf9, 0xe7, 0x98, 0x57, - 0xe9, 0xe1, 0x38, 0x60, 0x5b, 0x60, 0x3b, 0x0a, - 0xdb, 0x5f, 0x82, 0x1b, 0x2c, 0xe6, 0xbd, 0x9e, - 0x11, 0x3a, 0xfb, 0x53, 0x00, 0x67, 0x2f, 0xf7, - 0xbc, 0x87, 0x0f, 0x8b, 0x80, 0x26, 0xf1, 0x79, - 0x2d, 0xf5, 0x13, 0x90, 0xfa, 0x63, 0x26, 0x62, - 0x56, 0x0a, 0xe9, 0x1f, 0x62, 0x9a, 0x54, 0x0c, - 0xa9, 0x5a, 0x93, 0x48, 0x66, 0x4e, 0x02, 0x23, - 0xc6, 0xaa, 0x55, 0x97, 0xa9, 0x9e, 0x9e, 0x05, - 0x0d, 0x15, 0x85, 0x34, 0xd5, 0x97, 0x12, 0xc0, - 0xc1, 0x97, 0x19, 0xc6, 0x34, 0x2c, 0x4c, 0x13, - 0xd2, 0x36, 0xc4, 0xc7, 0x20, 0x60, 0x42, 0x79, - 0x21, 0x04, 0x7d, 0x02, 0xde, 0xf2, 0x4c, 0xac, - 0x60, 0x19, 0xb6, 0x67, 0xb2, 0xff, 0xe0, 0x08, - 0x07, 0x06, 0xd2, 0x00, 0x0f, 0x2d, 0xf7, 0xbc, - 0x6f, 0x4e, 0xc6, 0x77, 0xb8, 0xef, 0x89, 0xcf, - 0x45, 0xc2, 0xe8, 0x20, 0xe2, 0xe8, 0x07, 0xf5, - 0x2d, 0x03, 0x19, 0xb5, 0xd4, 0x21, 0x7d, 0x73, - 0x15, 0x93, 0xa6, 0x6b, 0x9e, 0xe7, 0xe1, 0x24, - 0x93, 0x7d, 0xbe, 0x3b, 0xee, 0xc8, 0x9a, 0xef, - 0xbc, 0x33, 0xb3, 0x30, 0xe8, 0xf3, 0x16, 0x34, - 0x95, 0xa9, 0x92, 0xe2, 0x00, 0xa6, 0x9b, 0xc5, - 0xc0, 0xc2, 0x4f, 0x0e, 0x43, 0x49, 0x8d, 0xe3, - 0x28, 0x3f, 0x2e, 0x7e, 0x6c, 0x02, 0xb8, 0x46, - 0x80, 0x44, 0xda, 0xa2, 0x7d, 0x7f, 0xdc, 0x4d, - 0x8f, 0xd9, 0x86, 0x05, 0xd1, 0xb7, 0xe1, 0x07, - 0x6b, 0x61, 0xc8, 0x9b, 0x04, 0xfa, 0xb0, 0xdf, - 0xd4, 0x47, 0xa3, 0xd1, 0xc5, 0xc0, 0x6f, 0x99, - 0x18, 0xc2, 0x26, 0x11, 0xe7, 0x5d, 0x89, 0x38, - 0xf9, 0x99, 0xfa, 0xef, 0x34, 0x7a, 0x36, 0x6a, - 0x59, 0xd6, 0x60, 0x2c, 0x16, 0xab, 0x1b, 0x19, - 0x19, 0x99, 0x16, 0xbc, 0xe7, 0x1e, 0x6f, 0x56, - 0x6f, 0xef, 0xa5, 0x06, 0x94, 0xcc, 0xae, 0x29, - 0xa4, 0xb6, 0x2c, 0x48, 0x71, 0xb1, 0x1f, 0xe5, - 0x33, 0xc7, 0xc3, 0x24, 0x80, 0xe7, 0x3a, 0x24, - 0x53, 0x39, 0x7a, 0x86, 0x73, 0x74, 0xf4, 0xa4, - 0x71, 0x21, 0xbe, 0x13, 0xae, 0xbe, 0x09, 0x36, - 0x20, 0x9a, 0x1d, 0xf1, 0x3c, 0xcf, 0x39, 0x62, - 0x02, 0x9a, 0x84, 0x1f, 0x71, 0xd8, 0xcf, 0x22, - 0xce, 0xed, 0x6a, 0xb0, 0xf9, 0x61, 0xd8, 0x32, - 0xe4, 0xcd, 0x66, 0x01, 0x60, 0xd9, 0xb6, 0xfd, - 0xc7, 0x7d, 0xfb, 0xf6, 0x3d, 0xbe, 0x66, 0xcd, - 0x9a, 0x3f, 0xe5, 0x72, 0xb9, 0xe0, 0x12, 0xa8, - 0x39, 0x0f, 0xae, 0x2a, 0xd1, 0x13, 0x6e, 0xbf, - 0x0f, 0xb7, 0x38, 0x68, 0x18, 0xc5, 0x05, 0x7e, - 0x14, 0x90, 0xcc, 0x58, 0xa4, 0xc6, 0x5c, 0xcf, - 0x72, 0x51, 0x08, 0xda, 0x2d, 0x77, 0xc1, 0x8d, - 0xaf, 0x89, 0x79, 0x66, 0x10, 0x07, 0x8e, 0x79, - 0x93, 0xe6, 0x44, 0x47, 0x44, 0xe0, 0x10, 0x32, - 0xcd, 0xc8, 0x9b, 0x99, 0x19, 0x48, 0x6e, 0x30, - 0x91, 0xe1, 0xd6, 0x46, 0x24, 0xa1, 0xed, 0x5c, - 0xb1, 0x62, 0x45, 0x02, 0x29, 0x37, 0x4a, 0x35, - 0x29, 0x1f, 0xe0, 0xfb, 0x3a, 0x34, 0x9e, 0x04, - 0x4b, 0x2b, 0xe0, 0xa4, 0x00, 0xd4, 0x98, 0x62, - 0x7e, 0xd8, 0x10, 0xcb, 0x41, 0x6f, 0x0c, 0x5e, - 0xd8, 0x06, 0xcf, 0x6e, 0x94, 0x56, 0xd7, 0x45, - 0x7c, 0x30, 0x83, 0xfe, 0xff, 0x18, 0x1f, 0x5b, - 0x03, 0x47, 0xba, 0x94, 0x92, 0x02, 0x00, 0xf1, - 0x8b, 0x20, 0x92, 0x27, 0xf2, 0x15, 0xad, 0x71, - 0xc8, 0xbf, 0x99, 0x04, 0x76, 0xf2, 0xee, 0x22, - 0x49, 0x34, 0x8b, 0x84, 0xef, 0xec, 0xc7, 0xf2, - 0x81, 0x4f, 0x40, 0x62, 0x32, 0xd8, 0x3c, 0x60, - 0xf5, 0x21, 0x7b, 0x9e, 0x80, 0xc7, 0xc4, 0x84, - 0x3c, 0xff, 0x77, 0xbe, 0x67, 0x77, 0xbd, 0x43, - 0x06, 0x5b, 0xff, 0x0b, 0xc0, 0xbf, 0xa6, 0x42, - 0x9c, 0xfa, 0x3c, 0xe7, 0x00, 0x00, 0x00, 0x00, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x5f, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x59, + 0x6c, 0x54, 0x55, 0x18, 0xc7, 0x7f, 0xb3, 0xb4, + 0x74, 0xa3, 0xa5, 0x2c, 0x6d, 0x91, 0x22, 0xb2, + 0xa9, 0x51, 0x92, 0x7e, 0x44, 0x0c, 0xd1, 0x08, + 0x48, 0x8c, 0x2f, 0x60, 0x5c, 0x12, 0x50, 0x0c, + 0x41, 0x21, 0x01, 0x8d, 0xcb, 0x8b, 0x4f, 0x3c, + 0x10, 0x12, 0x43, 0x8c, 0xc6, 0x2d, 0xd1, 0x07, + 0x0c, 0x62, 0x7c, 0x50, 0x30, 0x18, 0xe5, 0x41, + 0x25, 0x41, 0x83, 0x22, 0x11, 0x8c, 0x86, 0xb2, + 0xe4, 0x23, 0x62, 0x28, 0x94, 0xb6, 0x54, 0xa1, + 0xb5, 0xec, 0x30, 0xb5, 0x9d, 0xb6, 0xd3, 0xb9, + 0x3e, 0xf4, 0x0e, 0xde, 0xb9, 0x73, 0x66, 0xb9, + 0x77, 0x6e, 0x31, 0xfe, 0x5f, 0xee, 0x99, 0x6f, + 0x3b, 0xdf, 0x7f, 0xee, 0x37, 0xe7, 0x9c, 0xef, + 0xb4, 0x21, 0xcb, 0xb2, 0xf8, 0x3f, 0x23, 0x5a, + 0x8c, 0x73, 0xd3, 0xae, 0xd0, 0xf4, 0x48, 0xa4, + 0x74, 0x5d, 0x38, 0x1c, 0xbd, 0x07, 0x2b, 0xd9, + 0x69, 0x0d, 0x26, 0xb6, 0x1d, 0x79, 0x6c, 0xe8, + 0x80, 0xd3, 0x46, 0x44, 0x4a, 0x81, 0xa5, 0x40, + 0x1c, 0xd8, 0xa3, 0xaa, 0xc3, 0xc5, 0xcc, 0xe9, + 0x86, 0x6f, 0x02, 0xb2, 0x3b, 0xba, 0xa6, 0xb4, + 0x6a, 0xec, 0xa6, 0xfa, 0xa9, 0x77, 0x37, 0xd6, + 0x96, 0xd7, 0x93, 0x4c, 0x24, 0x38, 0xdf, 0xd3, + 0xb2, 0x6c, 0xde, 0xb7, 0xe5, 0x3b, 0x67, 0xf4, + 0xc6, 0x5f, 0xf8, 0x62, 0xb9, 0x95, 0x4a, 0x74, + 0x13, 0xb0, 0xde, 0x1e, 0x6f, 0x00, 0x5e, 0x2f, + 0x36, 0x69, 0x27, 0x7c, 0x11, 0x90, 0x6f, 0x43, + 0x73, 0xc3, 0x55, 0xd5, 0x6f, 0xdc, 0x3a, 0x63, + 0x7e, 0xbd, 0xf5, 0x4d, 0x29, 0x97, 0x5a, 0xfa, + 0x98, 0xb6, 0xa4, 0x91, 0x86, 0xb9, 0x8d, 0xb5, + 0x6d, 0x55, 0xc7, 0x9e, 0x69, 0x3f, 0x73, 0xb4, + 0x07, 0xd8, 0x68, 0x9b, 0x2f, 0x73, 0xb8, 0xae, + 0xc4, 0x45, 0x40, 0x44, 0x42, 0xc0, 0x5d, 0x40, + 0x97, 0xaa, 0x5e, 0xf1, 0x9a, 0x4b, 0xd8, 0x0f, + 0x01, 0x2b, 0x14, 0xdd, 0x3c, 0x61, 0xea, 0xed, + 0xf5, 0x55, 0x67, 0x6a, 0x68, 0xdf, 0x7a, 0x96, + 0xae, 0xfd, 0xe7, 0x69, 0xde, 0xa8, 0x8c, 0xbb, + 0x38, 0x91, 0x99, 0x13, 0x9a, 0xc6, 0x94, 0x55, + 0xd4, 0x3c, 0x3d, 0xe7, 0xcb, 0xd0, 0x78, 0xdb, + 0xbc, 0xc6, 0xe1, 0x7a, 0x8b, 0x21, 0xdc, 0xdb, + 0xc0, 0x71, 0xa0, 0x5b, 0x44, 0xee, 0xf0, 0x9a, + 0x8b, 0x67, 0x02, 0x4d, 0x7b, 0x42, 0x95, 0xa1, + 0xf2, 0x92, 0xc9, 0x35, 0x25, 0xe3, 0x29, 0xbd, + 0x52, 0x7e, 0x43, 0x3e, 0x3c, 0x94, 0x24, 0x76, + 0xa8, 0x8f, 0x09, 0x91, 0x49, 0xd4, 0xd5, 0xcd, + 0x9e, 0x36, 0xa6, 0x34, 0xb2, 0xc8, 0x56, 0x55, + 0x3b, 0xdc, 0xc7, 0x89, 0x48, 0x39, 0xe9, 0x58, + 0x65, 0x3f, 0xc7, 0x00, 0x4f, 0x79, 0xcd, 0xc7, + 0x33, 0x81, 0x92, 0x7e, 0xe6, 0x84, 0xcb, 0x2b, + 0x6b, 0xcb, 0x43, 0xe5, 0x54, 0x44, 0x2b, 0xd3, + 0x74, 0x7f, 0x36, 0x77, 0x31, 0x36, 0x5c, 0x4d, + 0x6d, 0x65, 0x43, 0x94, 0xd2, 0xe8, 0x42, 0x11, + 0x29, 0x03, 0x4a, 0x5d, 0x21, 0x1a, 0x52, 0x03, + 0x11, 0x99, 0x09, 0xd4, 0x39, 0x74, 0x9e, 0x4b, + 0xda, 0x33, 0x81, 0x64, 0x92, 0x78, 0x08, 0x86, + 0x22, 0xa1, 0x08, 0xd1, 0x68, 0xfa, 0x7c, 0x6d, + 0x47, 0xdb, 0x09, 0x0f, 0x87, 0xc1, 0x82, 0x70, + 0x32, 0xd4, 0x07, 0x54, 0x19, 0x42, 0x38, 0x4b, + 0xea, 0xbe, 0x62, 0xf3, 0xf1, 0xec, 0x30, 0x98, + 0xe0, 0x44, 0xb2, 0x3f, 0x7e, 0x3d, 0x61, 0x25, + 0xa0, 0x24, 0x99, 0xae, 0x8b, 0x0f, 0x72, 0xa1, + 0xf3, 0x22, 0xb1, 0xbf, 0xcf, 0xc7, 0x87, 0xe2, + 0xf1, 0xfd, 0x40, 0xa5, 0x21, 0x44, 0x85, 0x63, + 0x3c, 0xaf, 0xd8, 0x7c, 0x3c, 0x3b, 0x1c, 0x5f, + 0x6e, 0x0d, 0xd2, 0x17, 0x3f, 0x19, 0x1b, 0xbc, + 0x4a, 0x62, 0xdc, 0x50, 0x86, 0xfe, 0xdc, 0xe9, + 0x2e, 0xba, 0xbb, 0x5b, 0x3a, 0x6a, 0x63, 0xfc, + 0x84, 0x99, 0x80, 0x53, 0x36, 0xdb, 0xa5, 0xf3, + 0xbc, 0x47, 0xf8, 0x5b, 0x85, 0x7a, 0x13, 0xeb, + 0x7a, 0x3a, 0x8e, 0x75, 0xc6, 0x6a, 0xae, 0x66, + 0xe8, 0x4e, 0x1d, 0xfe, 0x6d, 0xa0, 0x7f, 0xa0, + 0xf7, 0xcd, 0x7d, 0xab, 0xad, 0x38, 0xe9, 0xdf, + 0x76, 0x0a, 0xb9, 0x08, 0x64, 0x04, 0x14, 0x91, + 0x45, 0x22, 0xb2, 0x56, 0x44, 0xc6, 0x9a, 0x72, + 0xf1, 0x45, 0x40, 0x97, 0x5b, 0xe7, 0x92, 0xf1, + 0x6b, 0x8f, 0x9f, 0x68, 0xfd, 0xae, 0x25, 0x52, + 0x15, 0x4a, 0x3b, 0x8b, 0x5c, 0x3f, 0x32, 0xd0, + 0x7e, 0x78, 0x69, 0xff, 0x27, 0x86, 0x64, 0x53, + 0xa8, 0xb0, 0x13, 0x8b, 0x02, 0xd3, 0x5d, 0xba, + 0xb4, 0x7d, 0x40, 0x44, 0x96, 0x00, 0xfb, 0x80, + 0x8f, 0x80, 0x57, 0x4d, 0xb9, 0xf8, 0x22, 0x00, + 0xd0, 0xbc, 0xc4, 0xd2, 0xb2, 0xae, 0xd8, 0xdc, + 0xe1, 0xa1, 0xe1, 0x0e, 0xa7, 0xdc, 0xba, 0x52, + 0x32, 0xd1, 0xf1, 0x31, 0x57, 0x09, 0xdd, 0x46, + 0xe6, 0xaa, 0xe3, 0xde, 0xc8, 0x5e, 0x01, 0x42, + 0xf6, 0xb8, 0x1a, 0x03, 0x7c, 0x13, 0x00, 0xd8, + 0xb7, 0xda, 0x8a, 0x33, 0x10, 0x3e, 0xe9, 0x12, + 0x4f, 0x12, 0x91, 0xc9, 0xf6, 0xd8, 0x54, 0x42, + 0x29, 0xd9, 0x2c, 0x83, 0xee, 0x06, 0x01, 0x11, + 0x69, 0x00, 0x16, 0x3b, 0x74, 0x7f, 0x99, 0x72, + 0x28, 0x8a, 0x80, 0x8d, 0xb3, 0x06, 0xd9, 0x1c, + 0xfb, 0x69, 0xaa, 0xdb, 0x88, 0xfd, 0x74, 0xd7, + 0x3f, 0xc0, 0x65, 0xc7, 0x78, 0x85, 0xc3, 0x16, + 0xa0, 0xdb, 0x34, 0x79, 0x10, 0x04, 0x4c, 0x81, + 0x53, 0x47, 0x82, 0x5c, 0x04, 0xee, 0x34, 0xe8, + 0x9c, 0x25, 0xb4, 0xda, 0xa5, 0x6b, 0x33, 0x4d, + 0x1e, 0x04, 0x81, 0x7e, 0x83, 0x2c, 0x95, 0x9c, + 0x89, 0x40, 0x6a, 0xce, 0xf9, 0x2e, 0x79, 0x02, + 0xfb, 0xcb, 0x10, 0x91, 0x26, 0xa0, 0xc9, 0xa1, + 0x1b, 0x04, 0x0e, 0x60, 0x40, 0x10, 0x04, 0xe2, + 0x06, 0x59, 0x2e, 0x02, 0x11, 0x11, 0xa9, 0x20, + 0x3d, 0x41, 0x80, 0x0e, 0x55, 0x4d, 0xd8, 0xe3, + 0x67, 0x5d, 0xba, 0x5f, 0x54, 0xb5, 0xcf, 0x34, + 0xf9, 0x68, 0x13, 0x30, 0xad, 0x1c, 0x11, 0xe0, + 0x5e, 0x32, 0x57, 0xa0, 0xd3, 0x70, 0x63, 0x79, + 0x5d, 0xe9, 0xd2, 0x7d, 0x9f, 0x6d, 0xf2, 0x20, + 0x08, 0x0c, 0x18, 0x64, 0x53, 0x44, 0x64, 0x15, + 0xf0, 0x90, 0x41, 0x57, 0x07, 0x3c, 0x68, 0x90, + 0xb7, 0xda, 0xcf, 0x87, 0x49, 0x3f, 0xe0, 0x41, + 0x0e, 0x02, 0x19, 0xa7, 0x3f, 0x11, 0xa9, 0x04, + 0xb6, 0x01, 0xf7, 0xdb, 0x41, 0xb7, 0x03, 0x5b, + 0x55, 0x35, 0x5b, 0xf3, 0x6c, 0x7a, 0x03, 0x00, + 0x9f, 0x66, 0x91, 0xbf, 0x9c, 0x45, 0xde, 0x69, + 0x3f, 0x57, 0xb8, 0xe4, 0x3d, 0xc0, 0x91, 0x2c, + 0x3e, 0xc6, 0x37, 0xf0, 0x08, 0xf0, 0x04, 0x50, + 0x0f, 0x3c, 0x00, 0x6c, 0x01, 0xf6, 0xda, 0x75, + 0x6b, 0x42, 0x36, 0x02, 0x5e, 0x71, 0x41, 0x44, + 0x66, 0x01, 0x4f, 0xba, 0xe4, 0x3b, 0x54, 0x35, + 0x69, 0x72, 0x00, 0x33, 0x81, 0xa3, 0x64, 0x1e, + 0xaa, 0x16, 0x03, 0x3b, 0x44, 0x24, 0x62, 0xb0, + 0x37, 0x95, 0x90, 0x1f, 0xbc, 0x05, 0xec, 0x00, + 0xca, 0x5c, 0xf2, 0xed, 0xb9, 0x9c, 0x32, 0x08, + 0xa8, 0x6a, 0x2b, 0xf0, 0x81, 0xc1, 0xf6, 0x51, + 0xe0, 0x7d, 0x83, 0x3c, 0xa8, 0x37, 0xd0, 0x40, + 0xe6, 0xf1, 0xba, 0x45, 0x55, 0xb3, 0x96, 0x0f, + 0x64, 0xff, 0x11, 0x6f, 0xc0, 0xbc, 0xc3, 0xbe, + 0x24, 0x22, 0x4b, 0x5d, 0xb2, 0xa0, 0x08, 0x98, + 0xb0, 0x37, 0x9f, 0x81, 0x91, 0x80, 0xaa, 0xc6, + 0x80, 0x17, 0xb3, 0xf8, 0x7c, 0x28, 0x22, 0xce, + 0xae, 0x2a, 0xa8, 0x12, 0x32, 0xe1, 0x50, 0x3e, + 0x83, 0xac, 0xcb, 0xa8, 0xaa, 0xee, 0x02, 0x76, + 0x1a, 0x54, 0x53, 0x80, 0x77, 0x1c, 0x9f, 0x1b, + 0xbd, 0xe7, 0x55, 0x30, 0x9a, 0xf3, 0x19, 0xe4, + 0xdb, 0x07, 0xd6, 0x03, 0x99, 0x6d, 0x17, 0xac, + 0x15, 0x91, 0x05, 0xf6, 0x78, 0x81, 0x41, 0x1f, + 0x04, 0x62, 0x80, 0xfb, 0xa4, 0x9b, 0x81, 0x50, + 0xbe, 0xbb, 0x51, 0x11, 0xd9, 0x02, 0x3c, 0x6f, + 0x50, 0xb5, 0x02, 0x6b, 0x80, 0xdd, 0x64, 0x39, + 0xab, 0x17, 0x89, 0x63, 0xaa, 0x2a, 0xf9, 0x8c, + 0x0a, 0xd9, 0x89, 0x5f, 0x63, 0xe4, 0x30, 0xe5, + 0xc6, 0x6c, 0xe0, 0x67, 0x46, 0x27, 0x79, 0x80, + 0xae, 0x42, 0x8c, 0xf2, 0x12, 0x50, 0xd5, 0xb3, + 0xc0, 0x67, 0x45, 0xa7, 0xe3, 0x1d, 0xc1, 0x10, + 0xb0, 0xf1, 0x2e, 0x70, 0xb3, 0xef, 0xe1, 0x8d, + 0x0d, 0x8c, 0x1b, 0x05, 0x11, 0x50, 0xd5, 0xdf, + 0x81, 0x1f, 0x8a, 0x4a, 0xc7, 0x3b, 0x72, 0x6e, + 0x60, 0x29, 0x78, 0x39, 0x8d, 0x7e, 0xee, 0x33, + 0x11, 0x3f, 0x48, 0x00, 0x3f, 0x16, 0x62, 0xe8, + 0x85, 0xc0, 0x57, 0x98, 0x97, 0xd4, 0xd1, 0xc0, + 0xaf, 0xaa, 0x7a, 0xbd, 0x10, 0xc3, 0x82, 0x09, + 0xa8, 0xea, 0x65, 0x6e, 0x5e, 0x19, 0x7d, 0x5d, + 0xa8, 0xa1, 0xd7, 0x86, 0xe6, 0x39, 0xa0, 0x23, + 0xaf, 0x55, 0x71, 0xb8, 0xc6, 0xc8, 0x45, 0x56, + 0x41, 0xf0, 0x44, 0xc0, 0x5e, 0x52, 0x17, 0xf3, + 0x6f, 0xf3, 0x31, 0x1a, 0xd8, 0x5c, 0x68, 0xf9, + 0x80, 0x8f, 0x96, 0x52, 0x55, 0x3b, 0x19, 0x21, + 0x61, 0x3a, 0xad, 0x16, 0x8b, 0x7e, 0xe0, 0x3d, + 0x2f, 0x0e, 0xfe, 0xee, 0x46, 0x55, 0x3b, 0x18, + 0xe9, 0x6b, 0x83, 0x7e, 0x13, 0x1f, 0xab, 0xea, + 0x05, 0x2f, 0x0e, 0xbe, 0x9b, 0x7a, 0x55, 0x6d, + 0x03, 0x16, 0x02, 0x67, 0xfc, 0xc6, 0x70, 0xc1, + 0xc2, 0xdc, 0x30, 0xe5, 0x44, 0x51, 0xb7, 0x12, + 0xaa, 0xfa, 0x07, 0x23, 0x4d, 0x78, 0x10, 0x7f, + 0xfb, 0xdd, 0xad, 0xaa, 0xa7, 0xbd, 0x3a, 0x15, + 0x7d, 0xad, 0xa2, 0xaa, 0x07, 0x01, 0x2d, 0x36, + 0x0e, 0x23, 0xfd, 0xb0, 0x67, 0x04, 0x71, 0x2f, + 0x04, 0x70, 0x2a, 0x80, 0x18, 0x07, 0xfd, 0x38, + 0x05, 0x45, 0xc0, 0xf3, 0xab, 0x37, 0xe0, 0x92, + 0x1f, 0xa7, 0xa0, 0x08, 0xf4, 0x06, 0x10, 0xc3, + 0x57, 0x6f, 0x1d, 0x14, 0x81, 0x20, 0x7e, 0xc4, + 0xff, 0x29, 0x81, 0xac, 0x37, 0x67, 0x05, 0x22, + 0xe1, 0xf7, 0xbf, 0x58, 0xfe, 0x01, 0x7b, 0x8d, + 0x8d, 0x79, 0x60, 0x61, 0xa9, 0x26, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, + 0x79, 0x29, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, 0x64, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, + 0x57, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, + 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, + 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, + 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x65, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x5f, 0x77, + 0x69, 0x74, 0x68, 0x5f, 0x70, 0x61, 0x72, 0x65, + 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, + 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x41, 0x64, 0x64, 0x20, 0x55, 0x73, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x2d, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x31, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, + 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x3d, 0x22, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x3a, 0x20, + 0x54, 0x68, 0x69, 0x73, 0x20, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x20, 0x65, 0x6e, 0x72, 0x6f, + 0x6c, 0x6c, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, + 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x20, 0x69, + 0x6e, 0x20, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, + 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x20, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x73, + 0x2e, 0x22, 0x3e, 0x5f, 0x45, 0x6e, 0x72, 0x6f, + 0x6c, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x65, 0x61, + 0x72, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x67, + 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x2d, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, + 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, + 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x37, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x20, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x69, 0x73, 0x74, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x4c, 0x6f, + 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x31, 0x2e, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x31, 0x32, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x49, 0x6e, 0x20, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, + 0x75, 0x73, 0x65, 0x20, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x20, 0x6c, + 0x6f, 0x67, 0x69, 0x6e, 0x73, 0x2c, 0x20, 0x74, + 0x68, 0x69, 0x73, 0x20, 0x63, 0x6f, 0x6d, 0x70, + 0x75, 0x74, 0x65, 0x72, 0x20, 0x6e, 0x65, 0x65, + 0x64, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, + 0x0a, 0x65, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2e, + 0x20, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, + 0x68, 0x61, 0x76, 0x65, 0x20, 0x79, 0x6f, 0x75, + 0x72, 0x20, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, + 0x6b, 0x20, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x69, + 0x73, 0x74, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x0a, + 0x74, 0x79, 0x70, 0x65, 0x20, 0x74, 0x68, 0x65, + 0x69, 0x72, 0x20, 0x64, 0x6f, 0x6d, 0x61, 0x69, + 0x6e, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x20, 0x68, 0x65, 0x72, 0x65, 0x2e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, + 0x64, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x44, + 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6a, + 0x6f, 0x69, 0x6e, 0x2d, 0x64, 0x6f, 0x6d, 0x61, + 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6a, 0x6f, 0x69, + 0x6e, 0x2d, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x20, 0x5f, 0x4e, 0x61, 0x6d, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, + 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6a, + 0x6f, 0x69, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, + 0x61, 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, + 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x20, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6a, 0x6f, + 0x69, 0x6e, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6a, 0x6f, + 0x69, 0x6e, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, + 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, + 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, + 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, + 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, + 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, + 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, + 0x22, 0x2d, 0x36, 0x22, 0x3e, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x31, 0x3c, 0x2f, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x3e, 0x3c, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x3d, 0x22, 0x2d, 0x35, 0x22, + 0x3e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, + 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, + 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x2d, 0x74, 0x68, 0x75, + 0x6d, 0x62, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, + 0xce, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x4b, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x4b, + 0x6c, 0x54, 0x65, 0x14, 0xc7, 0x7f, 0x77, 0xe6, + 0xf6, 0x35, 0x2d, 0x6d, 0x69, 0x6d, 0xad, 0x7d, + 0x10, 0x50, 0x10, 0x44, 0x0c, 0x07, 0x10, 0x95, + 0x05, 0x60, 0x83, 0x24, 0xa6, 0x18, 0x35, 0xd1, + 0x2a, 0x91, 0x34, 0x82, 0x1a, 0x57, 0x6e, 0xd8, + 0xe8, 0xca, 0xc4, 0x28, 0xb8, 0x10, 0x35, 0xba, + 0x70, 0x23, 0xba, 0x51, 0xb4, 0x1a, 0x13, 0x03, + 0x92, 0x40, 0x82, 0x0f, 0x8c, 0x26, 0x20, 0x08, + 0x72, 0x14, 0x0c, 0xf2, 0xa8, 0xb5, 0x05, 0x4a, + 0x6d, 0xd3, 0x07, 0x02, 0x6d, 0x29, 0x9d, 0x19, + 0x17, 0x33, 0x2d, 0xb7, 0x77, 0xbe, 0x61, 0xe6, + 0xce, 0xbd, 0xc5, 0xf8, 0xdf, 0xdc, 0xef, 0x9e, + 0x73, 0xbe, 0xf3, 0x9d, 0x7f, 0xbf, 0x73, 0xbf, + 0xc7, 0x99, 0x5a, 0xf1, 0x78, 0x9c, 0xff, 0x33, + 0xec, 0xa9, 0x1e, 0x40, 0x44, 0xf2, 0x81, 0x35, + 0xc0, 0x08, 0xb0, 0x47, 0x55, 0xa3, 0x41, 0xfa, + 0x0f, 0x05, 0xe9, 0x2c, 0x0d, 0x5e, 0x05, 0xbe, + 0x04, 0x76, 0x01, 0x2f, 0x05, 0xed, 0xdc, 0xf7, + 0x0c, 0x88, 0xc8, 0x46, 0x60, 0x19, 0xf0, 0x81, + 0xaa, 0xee, 0x31, 0x98, 0x3c, 0xee, 0x68, 0xaf, + 0x03, 0x5e, 0x77, 0xf5, 0xb7, 0x80, 0xf9, 0x40, + 0x97, 0xaa, 0x0e, 0x78, 0x1d, 0xdf, 0xd7, 0x0c, + 0x88, 0xc8, 0x22, 0xe0, 0x6d, 0xa0, 0x19, 0xd8, + 0x29, 0x22, 0x33, 0x0d, 0x66, 0x65, 0x8e, 0x76, + 0xad, 0x41, 0xbf, 0x05, 0x38, 0x06, 0x9c, 0x17, + 0x91, 0xb9, 0x5e, 0x63, 0xf0, 0x9b, 0x42, 0x75, + 0x8e, 0x76, 0x3e, 0xf0, 0x90, 0xc1, 0xa6, 0xd4, + 0xd1, 0x2e, 0x17, 0x91, 0x22, 0x97, 0xbe, 0x25, + 0xf9, 0x2c, 0x00, 0x9e, 0xf4, 0x1a, 0x80, 0x5f, + 0x02, 0x63, 0xae, 0xf7, 0x07, 0x9d, 0x2f, 0x22, + 0x52, 0x48, 0x82, 0x98, 0x13, 0x35, 0x0e, 0xfd, + 0x6d, 0x40, 0xb5, 0x43, 0xe7, 0x39, 0xa5, 0x83, + 0x26, 0xd0, 0x28, 0x22, 0x79, 0x8e, 0xf7, 0x12, + 0x43, 0x1f, 0x67, 0x4a, 0x2d, 0xf3, 0x1b, 0x8f, + 0x5f, 0x02, 0x23, 0xae, 0xf7, 0x08, 0x30, 0xcf, + 0xf1, 0x5e, 0x6c, 0xe8, 0x13, 0x71, 0xb4, 0xef, + 0xf6, 0x1b, 0x8f, 0x5f, 0x02, 0xe7, 0x0d, 0xb2, + 0x85, 0x8e, 0xb6, 0x89, 0x80, 0x53, 0x36, 0xc7, + 0xa5, 0xf3, 0xbc, 0x47, 0xf8, 0x5d, 0x46, 0xcf, + 0x19, 0x64, 0x02, 0x6c, 0x4b, 0xb6, 0x23, 0x06, + 0xfd, 0xf5, 0x08, 0x0c, 0xa6, 0x38, 0x13, 0x59, + 0x99, 0xb4, 0xfb, 0x5c, 0x55, 0x2f, 0xba, 0xf5, + 0xbe, 0x66, 0x40, 0x55, 0x47, 0x80, 0x3e, 0x97, + 0x38, 0xd3, 0x0c, 0x44, 0x92, 0x81, 0xd9, 0xc0, + 0x2c, 0x97, 0x6e, 0xd2, 0x3e, 0x20, 0x22, 0x4d, + 0xc0, 0x5e, 0x60, 0x2b, 0xf0, 0x8a, 0x29, 0x86, + 0x20, 0x76, 0x62, 0xf7, 0x2c, 0x64, 0x9b, 0x42, + 0x33, 0x49, 0xcd, 0x00, 0xf7, 0x46, 0xb6, 0x11, + 0xb0, 0x92, 0xed, 0x52, 0x0c, 0x98, 0x0a, 0x02, + 0x55, 0x22, 0x72, 0x4b, 0xb2, 0x6d, 0x4a, 0xa1, + 0x71, 0xd9, 0x6c, 0x83, 0x6e, 0x82, 0x80, 0x88, + 0xd4, 0x00, 0x8d, 0x0e, 0x5d, 0xb7, 0x69, 0xf0, + 0x20, 0x08, 0x9c, 0x35, 0xc8, 0x16, 0x24, 0x9f, + 0xd3, 0x0c, 0xba, 0x70, 0xf2, 0xe9, 0xce, 0x7f, + 0x80, 0x7e, 0x47, 0x7b, 0xad, 0xc3, 0x16, 0xcc, + 0x0b, 0x46, 0x20, 0x04, 0x4c, 0x8e, 0xc7, 0x8f, + 0x04, 0xd7, 0x23, 0x30, 0xcf, 0xa0, 0x73, 0xa6, + 0xd0, 0x7a, 0x97, 0xae, 0xcd, 0x34, 0x78, 0x10, + 0x04, 0x86, 0x0d, 0xb2, 0xf1, 0xe0, 0x4c, 0x04, + 0xc6, 0xc7, 0xbc, 0xd7, 0x25, 0x1f, 0x23, 0xf9, + 0xc7, 0x10, 0x91, 0x85, 0x4c, 0xfe, 0x96, 0x46, + 0x81, 0x1f, 0x4d, 0x83, 0x1b, 0x97, 0xd1, 0x45, + 0x3b, 0xed, 0xf5, 0x21, 0xdb, 0x6e, 0x09, 0x87, + 0xed, 0xaa, 0x78, 0x2c, 0xda, 0x17, 0x8b, 0x46, + 0x5b, 0x0f, 0xaf, 0x19, 0x7d, 0x3f, 0x0d, 0x01, + 0xf7, 0x66, 0x96, 0x89, 0x40, 0x58, 0x44, 0x22, + 0xae, 0x00, 0x01, 0xda, 0x55, 0x75, 0x7c, 0x67, + 0x7f, 0xda, 0xa5, 0xdb, 0xa7, 0xaa, 0x43, 0x19, + 0x09, 0x34, 0x7e, 0x6f, 0xd9, 0x83, 0x97, 0xc3, + 0xad, 0x91, 0x9a, 0xda, 0x07, 0xea, 0x6a, 0xe6, + 0x97, 0x97, 0x84, 0x4b, 0x21, 0x1e, 0xe3, 0x7c, + 0xcf, 0xc9, 0xc5, 0x4b, 0x77, 0x17, 0xae, 0x19, + 0xbe, 0x74, 0xa5, 0xf9, 0x58, 0x73, 0x7c, 0xd4, + 0x03, 0x01, 0xd3, 0xca, 0x11, 0x06, 0x96, 0xba, + 0xc7, 0x06, 0x4e, 0xc3, 0xc4, 0xf2, 0xba, 0xce, + 0xa5, 0xfb, 0xda, 0x14, 0x7c, 0x0a, 0x81, 0x81, + 0xcb, 0xf6, 0xcb, 0x45, 0x0d, 0xf5, 0x0f, 0xcf, + 0xac, 0xbc, 0x2b, 0xbf, 0xc6, 0xae, 0xa5, 0x34, + 0x54, 0x06, 0x58, 0x54, 0xd4, 0x56, 0x95, 0xb6, + 0x15, 0x4e, 0x6b, 0xea, 0x6c, 0x3f, 0xb4, 0x09, + 0x78, 0xd1, 0xe5, 0xe3, 0x8a, 0xc1, 0x6f, 0x9d, + 0x88, 0xb4, 0x00, 0xab, 0x0c, 0xba, 0x6a, 0xe0, + 0x7e, 0x83, 0xfc, 0x54, 0xf2, 0xb9, 0x9a, 0xc9, + 0x07, 0xbc, 0xec, 0x08, 0x2c, 0xda, 0x6e, 0x95, + 0x53, 0x52, 0xf0, 0xd4, 0x4d, 0x45, 0x33, 0xf2, + 0x7b, 0x36, 0x5f, 0xa4, 0xed, 0xb8, 0x52, 0x51, + 0x5f, 0xce, 0x1d, 0xab, 0xe7, 0x52, 0xdf, 0xd4, + 0x40, 0xac, 0x22, 0x66, 0xf7, 0x76, 0x9f, 0x7a, + 0x6c, 0xf1, 0x17, 0xd6, 0x96, 0x5f, 0x9a, 0xe3, + 0xbd, 0x0e, 0x1f, 0xa6, 0x19, 0x00, 0xf8, 0x28, + 0x8d, 0xfc, 0x85, 0x34, 0xf2, 0x8e, 0xe4, 0x73, + 0xad, 0x4b, 0xfe, 0x37, 0x70, 0x38, 0x23, 0x81, + 0x50, 0x9c, 0xfb, 0xac, 0xca, 0xe9, 0xf5, 0xd6, + 0xa1, 0x7c, 0x7a, 0xf7, 0x25, 0xe2, 0xeb, 0x1a, + 0xe8, 0xa6, 0xeb, 0x68, 0x37, 0x33, 0xf6, 0x36, + 0xb0, 0x64, 0xd3, 0x9d, 0x54, 0x55, 0xcf, 0x6e, + 0xe8, 0x1c, 0xec, 0x5f, 0x4e, 0xe2, 0x8a, 0x98, + 0x89, 0x80, 0x57, 0xf4, 0x8a, 0xc8, 0x6c, 0xe0, + 0x09, 0x97, 0xbc, 0x55, 0x55, 0x63, 0xe9, 0x3a, + 0x4d, 0xac, 0x42, 0xb1, 0x3c, 0x7b, 0x45, 0x41, + 0x64, 0x5a, 0x61, 0xf9, 0x9c, 0x32, 0xac, 0x90, + 0x35, 0xc9, 0xa8, 0xf3, 0xc8, 0x19, 0x0e, 0x6f, + 0x3e, 0x4a, 0x59, 0xe4, 0xe6, 0x3c, 0xab, 0xc0, + 0x5e, 0xe9, 0xf2, 0x61, 0x4a, 0xa1, 0x5c, 0xf0, + 0x06, 0xd0, 0x0a, 0x14, 0xba, 0xe4, 0xdb, 0x0c, + 0xb6, 0x13, 0x98, 0xb4, 0x8c, 0x5a, 0x84, 0x28, + 0xae, 0x2b, 0x62, 0xfe, 0x23, 0xb7, 0xa7, 0x18, + 0x76, 0xee, 0x3b, 0x47, 0xd7, 0xd6, 0xfe, 0x14, + 0x39, 0xc1, 0xcd, 0x40, 0x0d, 0xa9, 0xc7, 0xeb, + 0x3f, 0x54, 0x35, 0x6d, 0xfa, 0x80, 0x83, 0x40, + 0xe8, 0xea, 0xd8, 0x0f, 0xd1, 0x91, 0xa1, 0x91, + 0x28, 0x51, 0x16, 0x3e, 0xb3, 0x80, 0xb2, 0xea, + 0xd4, 0x05, 0xa4, 0x67, 0xd7, 0x05, 0xa2, 0x3b, + 0xaa, 0x2e, 0xb9, 0xc4, 0x41, 0x11, 0x30, 0xe1, + 0xdb, 0x4c, 0x06, 0xd7, 0x52, 0xc8, 0xe2, 0xa7, + 0xd1, 0xbe, 0xbe, 0xb3, 0xc3, 0xb1, 0x21, 0xae, + 0x14, 0x0e, 0xb1, 0x6a, 0xa3, 0x3b, 0x53, 0x12, + 0x88, 0x1f, 0xac, 0xdc, 0x20, 0x22, 0xce, 0x5b, + 0x55, 0x50, 0x29, 0x64, 0xc2, 0xcf, 0x99, 0x0c, + 0x26, 0x08, 0x1c, 0x79, 0x34, 0x3e, 0x18, 0x1d, + 0x1e, 0xfd, 0xb4, 0x67, 0xe0, 0xcf, 0xd1, 0xfe, + 0x68, 0x1f, 0x25, 0xf7, 0x14, 0x32, 0x67, 0xe5, + 0xad, 0xa9, 0x3d, 0xe2, 0xdc, 0x02, 0xbc, 0xe9, + 0x90, 0xd4, 0x07, 0x11, 0x69, 0x1a, 0x1c, 0xcc, + 0x64, 0x30, 0xe9, 0x1b, 0x98, 0x5e, 0x3c, 0xf6, + 0x5a, 0x5f, 0xc7, 0x89, 0xaf, 0x8e, 0x77, 0xed, + 0x1f, 0x3c, 0x73, 0xb5, 0x83, 0x59, 0xcf, 0xd6, + 0x13, 0xb2, 0x2d, 0x53, 0xbf, 0xe7, 0x44, 0x64, + 0x79, 0xb2, 0xbd, 0xdc, 0x64, 0x10, 0x00, 0x2e, + 0x02, 0x27, 0x32, 0x19, 0x59, 0xa6, 0xda, 0xe8, + 0x92, 0x9d, 0xf9, 0xeb, 0xf3, 0xec, 0x82, 0x96, + 0x3c, 0x3b, 0xbf, 0x6a, 0xe8, 0xe3, 0x8a, 0xca, + 0xe8, 0x6f, 0xc5, 0xa6, 0x7a, 0xce, 0x29, 0x60, + 0x03, 0x89, 0x8a, 0x9b, 0xf1, 0xac, 0xee, 0x13, + 0xbf, 0xaa, 0xaa, 0x64, 0x32, 0x32, 0x12, 0x70, + 0x42, 0x44, 0xea, 0x49, 0x9c, 0x04, 0xdd, 0xe5, + 0x91, 0xa9, 0xc6, 0x6e, 0x55, 0x6d, 0xca, 0x64, + 0x94, 0xf1, 0x34, 0xaa, 0xaa, 0x67, 0x81, 0x4f, + 0x02, 0x09, 0xc9, 0x1b, 0xba, 0xb2, 0x31, 0xca, + 0xf6, 0x38, 0xfd, 0x16, 0x70, 0xa3, 0xeb, 0xf0, + 0xc6, 0x0b, 0x8c, 0x1b, 0x59, 0x11, 0x50, 0xd5, + 0xdf, 0x81, 0x6f, 0x7c, 0x85, 0xe3, 0x1d, 0xd7, + 0xdd, 0xc0, 0xc6, 0xe1, 0xe5, 0x42, 0xf3, 0x59, + 0x8e, 0x81, 0xe4, 0x82, 0x31, 0xe0, 0xbb, 0x6c, + 0x0c, 0xbd, 0x10, 0xd8, 0x0e, 0x5c, 0xcd, 0x29, + 0x1c, 0xef, 0xd8, 0xaf, 0xaa, 0xff, 0x64, 0x63, + 0x98, 0x35, 0x01, 0x55, 0xed, 0xe7, 0xc6, 0xa5, + 0xd1, 0x8e, 0x6c, 0x0d, 0xbd, 0xde, 0x89, 0x9f, + 0x07, 0xda, 0x3d, 0xf6, 0xf1, 0x8a, 0x0b, 0x24, + 0x0a, 0x59, 0x59, 0xc1, 0x13, 0x81, 0xe4, 0x92, + 0xda, 0xc8, 0xb5, 0xcb, 0xc7, 0x54, 0xe0, 0xbd, + 0x6c, 0xd3, 0x07, 0x72, 0xa8, 0x4a, 0xa8, 0x6a, + 0x07, 0x09, 0x12, 0xa6, 0x7a, 0x90, 0x5f, 0x0c, + 0x03, 0xef, 0x78, 0xe9, 0x90, 0x53, 0x59, 0x45, + 0x55, 0xdb, 0x49, 0xdc, 0x6b, 0x83, 0x9e, 0x89, + 0x0f, 0x55, 0xb5, 0x37, 0xb3, 0xd9, 0x35, 0xe4, + 0x5c, 0x17, 0x52, 0xd5, 0x36, 0x60, 0x05, 0xf0, + 0x57, 0xae, 0x3e, 0x5c, 0x88, 0x03, 0xef, 0x7a, + 0xed, 0xe4, 0xb7, 0x3a, 0xdd, 0x49, 0xe2, 0x12, + 0x1e, 0xc4, 0x6f, 0xbf, 0xbb, 0x54, 0xf5, 0xb4, + 0xd7, 0x4e, 0xbe, 0x2b, 0x73, 0xaa, 0x7a, 0x00, + 0x50, 0xbf, 0x7e, 0x48, 0xdc, 0x87, 0x3d, 0x23, + 0xa8, 0x1f, 0xba, 0x4f, 0x06, 0xe0, 0xe3, 0x40, + 0x2e, 0x9d, 0x82, 0x22, 0xe0, 0x79, 0xea, 0x0d, + 0x70, 0xff, 0x50, 0x92, 0x15, 0x82, 0x22, 0xe0, + 0xbe, 0xe8, 0xe7, 0x82, 0x9c, 0xee, 0xd6, 0x41, + 0x11, 0x08, 0xe2, 0x23, 0xfe, 0x4f, 0x09, 0xa4, + 0xad, 0x9c, 0x65, 0x89, 0xb1, 0x5c, 0xff, 0x8b, + 0xe5, 0x5f, 0x56, 0x8c, 0x71, 0x3c, 0x97, 0xb1, + 0xa1, 0x76, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, + 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, + 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6c, 0x65, + 0x66, 0x74, 0x2d, 0x72, 0x69, 0x6e, 0x67, 0x2d, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, + 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x65, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x99, 0x5b, + 0x6c, 0x54, 0x55, 0x14, 0x86, 0xbf, 0x33, 0x97, + 0xb6, 0x4c, 0x5b, 0x4a, 0x0d, 0xe5, 0x56, 0x08, + 0x84, 0xa6, 0x20, 0xa0, 0xb2, 0x40, 0x79, 0xd0, + 0x80, 0x06, 0x48, 0x54, 0xc0, 0x10, 0x51, 0x24, + 0x10, 0x50, 0x12, 0x22, 0x6a, 0xc2, 0x9b, 0x26, + 0xc6, 0x27, 0xf5, 0xc1, 0x17, 0x8c, 0x31, 0x68, + 0x62, 0x22, 0x51, 0x7c, 0x51, 0x03, 0xc6, 0x80, + 0x68, 0xc0, 0x17, 0xac, 0x11, 0x91, 0x4b, 0xb8, + 0x6e, 0x13, 0x48, 0x8a, 0xdc, 0x2b, 0xa5, 0xb4, + 0xdc, 0x99, 0x42, 0xdb, 0xb9, 0x1d, 0x1f, 0xe6, + 0x4c, 0x73, 0xe6, 0xb0, 0xcf, 0xcc, 0xb9, 0x0c, + 0x1a, 0xff, 0x97, 0xd9, 0x7b, 0xaf, 0x7f, 0xed, + 0xbd, 0xfe, 0xb3, 0xf6, 0xb9, 0xac, 0x3d, 0x86, + 0x69, 0x9a, 0xfc, 0x9f, 0x11, 0xf3, 0x43, 0x5e, + 0xf6, 0xbd, 0x11, 0x3d, 0x95, 0x88, 0xae, 0x8a, + 0x44, 0x63, 0x8b, 0x23, 0x18, 0x89, 0x6c, 0x36, + 0xf3, 0x8b, 0x99, 0xce, 0x6c, 0x3a, 0xf6, 0xbc, + 0x79, 0xb3, 0xc0, 0x11, 0x91, 0x28, 0xf0, 0x34, + 0x50, 0x03, 0xec, 0x54, 0x4a, 0xa5, 0x2a, 0x1c, + 0x73, 0x11, 0x3c, 0x0b, 0x98, 0xf9, 0x93, 0x31, + 0xc6, 0xac, 0x8b, 0x6f, 0x6f, 0x18, 0x33, 0x41, + 0x46, 0x0c, 0x9b, 0x10, 0xaf, 0x89, 0xd6, 0x92, + 0xec, 0xed, 0x79, 0xb6, 0xab, 0xe3, 0xf8, 0xeb, + 0x33, 0x7f, 0x88, 0xaf, 0x3e, 0xba, 0x24, 0xbd, + 0xdf, 0xa2, 0xbe, 0x09, 0x7c, 0x68, 0xb5, 0xd7, + 0x03, 0xef, 0x54, 0x3a, 0x68, 0x3b, 0x22, 0x5e, + 0x89, 0xb9, 0xea, 0xd8, 0xb6, 0xe1, 0x93, 0x1f, + 0x99, 0xd5, 0xd2, 0x34, 0x23, 0x3e, 0x2e, 0xd3, + 0x42, 0x53, 0xd7, 0x68, 0xa6, 0x34, 0xce, 0x62, + 0xfa, 0x43, 0x8b, 0x5a, 0x6b, 0x86, 0xd6, 0x7f, + 0x3d, 0x63, 0xbb, 0x31, 0xcc, 0xa2, 0xae, 0xb0, + 0xb9, 0x2d, 0xd5, 0xcd, 0x25, 0x22, 0xf3, 0x44, + 0xe4, 0x3b, 0x11, 0x79, 0x3b, 0x4c, 0xf0, 0xe0, + 0x51, 0xc0, 0x8c, 0x1d, 0xb1, 0xb5, 0xf1, 0x91, + 0x4d, 0xd3, 0x46, 0x54, 0x37, 0x53, 0x7f, 0xb9, + 0x91, 0xdf, 0x96, 0x1f, 0xa4, 0x6d, 0xed, 0x3e, + 0x3a, 0x37, 0x5d, 0x65, 0x6c, 0x7c, 0x3c, 0x2d, + 0x13, 0x9f, 0x68, 0x89, 0xd4, 0xd4, 0x7c, 0x6a, + 0xd1, 0xc7, 0xda, 0x5c, 0x1b, 0x34, 0xc1, 0x37, + 0x03, 0x3b, 0x80, 0x65, 0xc0, 0x7a, 0x11, 0x79, + 0xfc, 0xbe, 0x0b, 0x30, 0x63, 0xc6, 0xd2, 0x86, + 0xc6, 0xe6, 0xba, 0xc6, 0x68, 0x23, 0xb7, 0x7e, + 0xbf, 0x43, 0x36, 0x9d, 0x05, 0xe0, 0xcc, 0xae, + 0x73, 0x8c, 0x88, 0x8d, 0x62, 0x64, 0x62, 0x1c, + 0xd5, 0xf1, 0xc4, 0xc3, 0x22, 0x52, 0x0d, 0x0c, + 0xb7, 0xb9, 0x0e, 0xd5, 0x4c, 0xf7, 0x1c, 0x30, + 0xc4, 0xd6, 0x1f, 0x1d, 0x34, 0x78, 0xf0, 0x2c, + 0x20, 0xf2, 0x40, 0x8d, 0x31, 0x84, 0x84, 0x51, + 0x4b, 0x55, 0xae, 0x6a, 0x70, 0xbc, 0xf7, 0xc6, + 0x1d, 0xcc, 0xcb, 0x06, 0xb5, 0x91, 0x3a, 0xaa, + 0xaa, 0x87, 0x34, 0x46, 0x46, 0xf5, 0x4d, 0x04, + 0x0c, 0x9b, 0x6b, 0x95, 0x25, 0xca, 0x8e, 0x45, + 0x8e, 0x7e, 0xa8, 0x9b, 0xdc, 0xdb, 0x3d, 0x60, + 0x92, 0x8d, 0x18, 0x11, 0xa2, 0x46, 0x0c, 0xc3, + 0x2c, 0x76, 0xe9, 0x3e, 0xd1, 0x43, 0x8c, 0x18, + 0xa6, 0x49, 0x36, 0x77, 0x33, 0x9e, 0xd0, 0x78, + 0x0f, 0x66, 0x41, 0x44, 0xe2, 0xc0, 0x7c, 0x87, + 0xfd, 0xfe, 0x0b, 0x88, 0x64, 0x72, 0xd7, 0xb2, + 0xb9, 0x0c, 0x19, 0x33, 0x4d, 0x26, 0x97, 0x2e, + 0xb2, 0x75, 0xb4, 0x5f, 0x24, 0x6d, 0xa6, 0xc8, + 0xa4, 0xfa, 0xaf, 0xd3, 0x1f, 0x8b, 0x6b, 0xdc, + 0xeb, 0x6c, 0xed, 0x07, 0x01, 0xa7, 0xc8, 0xbb, + 0xbe, 0x22, 0x76, 0xc6, 0xe6, 0x89, 0x95, 0x66, + 0xc3, 0xcd, 0xee, 0x0b, 0xd7, 0x7a, 0x73, 0x49, + 0x52, 0xc6, 0x40, 0x91, 0xa9, 0xa7, 0xa3, 0x87, + 0xce, 0xdb, 0x67, 0xd3, 0xe9, 0xd4, 0xdd, 0x36, + 0x4d, 0x70, 0x00, 0xb5, 0xb6, 0xf6, 0x74, 0x8d, + 0xbd, 0xcb, 0x6b, 0xb0, 0x3a, 0x68, 0x05, 0x88, + 0x48, 0xad, 0x88, 0xac, 0x11, 0x91, 0x79, 0x00, + 0xc7, 0x16, 0xa7, 0x77, 0xf5, 0x5f, 0xed, 0x39, + 0xd0, 0x95, 0x3c, 0x9f, 0x49, 0x25, 0xfa, 0x8b, + 0xb8, 0x57, 0x3b, 0xae, 0xd3, 0x7e, 0x76, 0xf7, + 0xc9, 0xbb, 0xbd, 0x7d, 0xef, 0x52, 0x7c, 0x73, + 0x16, 0x60, 0xcf, 0x80, 0x68, 0xec, 0x9d, 0x01, + 0x63, 0x07, 0xdc, 0x33, 0xf0, 0x1e, 0xb0, 0x09, + 0x68, 0x13, 0x91, 0x45, 0x00, 0xb7, 0x8d, 0xd4, + 0x8b, 0x9d, 0xa7, 0x0f, 0x6f, 0xed, 0xec, 0x6d, + 0xef, 0xb5, 0x13, 0xfb, 0xba, 0xfb, 0xcd, 0xe4, + 0x99, 0x81, 0x05, 0xc7, 0x5f, 0x32, 0x53, 0xe8, + 0x33, 0x60, 0x17, 0xe0, 0xcc, 0xc0, 0x35, 0xa5, + 0x54, 0x3f, 0x21, 0xe0, 0x26, 0xc0, 0xfe, 0xfc, + 0x7e, 0x0b, 0xe0, 0xd4, 0x02, 0x73, 0xe0, 0xd0, + 0xc2, 0xbe, 0xe5, 0xc9, 0xbd, 0x99, 0xe2, 0x37, + 0xab, 0x89, 0x11, 0xd9, 0xd8, 0x5a, 0x08, 0xb2, + 0x5c, 0x06, 0x9c, 0x02, 0x42, 0x5d, 0x7d, 0x70, + 0x17, 0x70, 0xc9, 0xd6, 0x7e, 0x4a, 0x44, 0xc6, + 0x0d, 0xf6, 0x2e, 0xd4, 0x9e, 0xd0, 0xf0, 0x27, + 0x59, 0xbf, 0xae, 0x02, 0x44, 0x64, 0x34, 0xd0, + 0xe4, 0xb0, 0x5d, 0xf4, 0x16, 0xa6, 0x3b, 0xdc, + 0x04, 0x74, 0x3a, 0x38, 0x2b, 0x6d, 0xfd, 0xeb, + 0x1a, 0x7e, 0x41, 0x40, 0x54, 0x63, 0x2b, 0x64, + 0x60, 0x5a, 0x99, 0x75, 0x02, 0xc1, 0x4d, 0xc0, + 0x29, 0x47, 0xff, 0x65, 0x5b, 0xfb, 0x86, 0x86, + 0x3f, 0xc5, 0xfa, 0xd5, 0x09, 0x28, 0x3c, 0x85, + 0x26, 0x69, 0x6c, 0xa1, 0x9e, 0x40, 0xe0, 0x2e, + 0xe0, 0x00, 0xd0, 0x67, 0xeb, 0x4f, 0x15, 0x91, + 0x47, 0x6d, 0x8b, 0x66, 0x1c, 0xfc, 0x59, 0x25, + 0xe6, 0x2b, 0x64, 0x60, 0xb2, 0xc6, 0xd6, 0xa7, + 0x19, 0xf3, 0x05, 0xad, 0x00, 0xa5, 0xd4, 0x00, + 0xf0, 0x87, 0x63, 0xf8, 0x15, 0xcb, 0x96, 0x01, + 0xce, 0x39, 0x6c, 0xd3, 0x44, 0xa4, 0x9e, 0xd2, + 0x5b, 0x48, 0x97, 0x81, 0x50, 0x4f, 0x20, 0x28, + 0xfd, 0x22, 0x6b, 0x73, 0xf4, 0x57, 0x88, 0x48, + 0xa1, 0x7e, 0x38, 0xad, 0x99, 0xe7, 0x31, 0x4a, + 0x0b, 0xd0, 0x65, 0xe0, 0x5f, 0x15, 0xd0, 0x04, + 0x3c, 0x63, 0xb5, 0x9d, 0xf7, 0x08, 0xc0, 0x93, + 0xc0, 0x28, 0xcd, 0xf8, 0x7c, 0x11, 0x59, 0x09, + 0x8c, 0xd7, 0xd8, 0x06, 0x34, 0x63, 0xbe, 0x50, + 0xaa, 0x22, 0x3b, 0x0a, 0x74, 0x03, 0x23, 0x6d, + 0x63, 0xab, 0x80, 0x9d, 0xc0, 0x05, 0x0d, 0xff, + 0x7d, 0x97, 0x79, 0x5a, 0x81, 0x6f, 0x5c, 0x6c, + 0xae, 0x19, 0x10, 0x11, 0x03, 0x78, 0xcd, 0x5a, + 0xb3, 0x15, 0xd8, 0x07, 0xac, 0x56, 0x4a, 0x25, + 0xed, 0x3c, 0xd7, 0x0c, 0x28, 0xa5, 0x72, 0xc0, + 0x66, 0xc7, 0xf0, 0x0b, 0x22, 0x32, 0x15, 0xe8, + 0x71, 0xf3, 0xf3, 0x09, 0xad, 0x00, 0x11, 0x49, + 0x90, 0xdf, 0x01, 0x9f, 0x03, 0xb3, 0xc9, 0x5f, + 0xc4, 0x25, 0xc0, 0x62, 0x27, 0xb7, 0xdc, 0xc7, + 0x9c, 0xf3, 0xca, 0x55, 0x01, 0xdf, 0x92, 0xaf, + 0x75, 0x2b, 0x81, 0x7b, 0xb6, 0x90, 0x75, 0x28, + 0xb0, 0x19, 0x98, 0xeb, 0x30, 0xe5, 0x80, 0xc3, + 0x4e, 0x7e, 0x49, 0x01, 0x4a, 0xa9, 0x23, 0x40, + 0xbb, 0x73, 0x0d, 0x60, 0x8c, 0xaf, 0x30, 0xdd, + 0xa1, 0xcb, 0xc0, 0x27, 0x68, 0xae, 0x34, 0xf0, + 0xa5, 0x52, 0xea, 0xa4, 0x73, 0xd0, 0xcb, 0xe7, + 0xb4, 0xf3, 0x66, 0xae, 0x24, 0x8a, 0x04, 0x58, + 0x1f, 0x8e, 0xeb, 0x34, 0xbc, 0x4b, 0x80, 0xf6, + 0x00, 0xc0, 0x8b, 0x80, 0x43, 0xfe, 0xe3, 0xf2, + 0x8c, 0xc1, 0x2d, 0x24, 0x22, 0x0d, 0xc0, 0x46, + 0x17, 0xde, 0x3a, 0xa5, 0xd4, 0x2d, 0x9d, 0xc1, + 0x8b, 0x80, 0x83, 0x01, 0x02, 0xf3, 0x0a, 0xfb, + 0x09, 0xc6, 0x47, 0x40, 0xb3, 0x86, 0xb3, 0x55, + 0x29, 0xb5, 0xdd, 0x6d, 0x02, 0x2f, 0x02, 0x4e, + 0x02, 0xc9, 0xb2, 0xac, 0x60, 0x98, 0x03, 0x20, + 0x22, 0x73, 0x80, 0x57, 0x35, 0xf6, 0x34, 0x2e, + 0x5b, 0xa7, 0x00, 0xc3, 0xcb, 0xd9, 0xa8, 0x88, + 0x28, 0xf4, 0xe5, 0x60, 0x58, 0x24, 0x81, 0x85, + 0xc0, 0x57, 0xe4, 0x9f, 0xf5, 0x4e, 0x6c, 0x54, + 0x4a, 0xbd, 0x51, 0x6a, 0x02, 0xaf, 0x27, 0x73, + 0x97, 0xca, 0x53, 0x02, 0xa1, 0x1e, 0xd8, 0x83, + 0x3e, 0xf8, 0x14, 0xf0, 0x41, 0xb9, 0x09, 0xfe, + 0x6b, 0x01, 0xa5, 0xb0, 0x45, 0x29, 0x55, 0xb6, + 0xe0, 0xf1, 0x2a, 0x20, 0xf4, 0x77, 0x7b, 0x00, + 0x7c, 0xec, 0x85, 0xe4, 0x55, 0xc0, 0x91, 0x10, + 0x81, 0x04, 0xc1, 0x1e, 0xa5, 0xd4, 0x9f, 0x5e, + 0x88, 0x5e, 0x05, 0xfc, 0xca, 0xbd, 0x45, 0xcc, + 0xfd, 0xc4, 0x16, 0xaf, 0x44, 0x4f, 0x02, 0x94, + 0x52, 0xb7, 0x81, 0xfd, 0x65, 0x89, 0x95, 0x41, + 0x0e, 0xd8, 0xe6, 0x95, 0xec, 0xf9, 0xff, 0x01, + 0xe0, 0x47, 0xff, 0xb1, 0x04, 0xc2, 0x6e, 0xa5, + 0xd4, 0x65, 0xaf, 0x64, 0x3f, 0x02, 0xbe, 0x00, + 0xb4, 0xaf, 0xf3, 0x0a, 0xe2, 0x6f, 0x60, 0x8d, + 0x1f, 0x07, 0xcf, 0x02, 0xac, 0x6d, 0xf4, 0x99, + 0xdf, 0x88, 0x7c, 0xa0, 0x13, 0x98, 0xab, 0x94, + 0x3a, 0xef, 0xc7, 0xc9, 0x4f, 0x06, 0x00, 0x36, + 0x50, 0x81, 0x93, 0x04, 0x0d, 0xba, 0x80, 0x79, + 0x4a, 0xa9, 0x33, 0x7e, 0x1d, 0x7d, 0x09, 0x50, + 0x4a, 0x5d, 0x21, 0x7f, 0x66, 0x5a, 0x49, 0x5c, + 0x24, 0x7f, 0xe5, 0xff, 0x0a, 0xe2, 0xec, 0x37, + 0x03, 0x90, 0x2f, 0x38, 0x2a, 0xf5, 0xe7, 0xf2, + 0x79, 0x60, 0xb6, 0xae, 0x50, 0xf1, 0x0a, 0xdf, + 0x02, 0x94, 0x52, 0xa7, 0x81, 0x9f, 0x83, 0x2e, + 0x68, 0x43, 0x0e, 0x58, 0xa5, 0x94, 0xd2, 0x1d, + 0x10, 0x78, 0x46, 0x90, 0x0c, 0x40, 0xbe, 0x2e, + 0x0e, 0x8b, 0x13, 0x4a, 0xa9, 0xbd, 0x61, 0x27, + 0x09, 0x2a, 0x20, 0xf4, 0xc2, 0xdc, 0x5b, 0x6b, + 0x07, 0x42, 0x50, 0x01, 0x57, 0x2a, 0xb0, 0x76, + 0xe0, 0x7d, 0x6f, 0x47, 0x50, 0x01, 0xa1, 0x4f, + 0xd4, 0xa8, 0x50, 0x95, 0x17, 0x48, 0x80, 0x75, + 0xe8, 0x15, 0xf6, 0xe3, 0x2e, 0x1b, 0xd2, 0x1f, + 0x08, 0x9e, 0x01, 0x08, 0x7f, 0x30, 0x9b, 0x0b, + 0xe9, 0x0f, 0xc0, 0x3f, 0x48, 0x26, 0x8d, 0xc1, + 0x5b, 0x1e, 0x56, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x00, 0x00, - 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, - 0x12, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, - 0x0f, 0x00, 0x00, 0x00, 0x72, 0x69, 0x67, 0x68, - 0x74, 0x2d, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x66, - 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, - 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2d, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, + 0xb1, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, + 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, + 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, + 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x74, 0x61, 0x63, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x73, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x6f, 0x63, + 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x5f, 0x6c, 0x6f, 0x63, + 0x6b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x61, 0x64, 0x64, 0x2d, 0x75, + 0x73, 0x65, 0x72, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x64, 0x64, + 0x20, 0x55, 0x73, 0x65, 0x72, 0x26, 0x23, 0x78, + 0x32, 0x30, 0x32, 0x36, 0x3b, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, + 0x74, 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x5f, 0x61, 0x64, + 0x64, 0x75, 0x73, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x72, + 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, + 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, + 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, + 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, + 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, + 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x6e, 0x67, + 0x75, 0x61, 0x67, 0x65, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, + 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, + 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, + 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, + 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, + 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, + 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x31, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, + 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4f, + 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x76, 0x65, 0x72, + 0x6c, 0x61, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, + 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x62, 0x6f, + 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x72, 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x76, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x69, + 0x73, 0x74, 0x2d, 0x73, 0x63, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x64, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x73, 0x63, + 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, + 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, + 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, + 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x6f, 0x6d, + 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, 0x69, + 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x69, 0x73, 0x74, 0x2d, 0x74, 0x72, 0x65, + 0x65, 0x76, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, + 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6d, 0x61, 0x69, 0x6e, 0x2d, 0x75, + 0x73, 0x65, 0x72, 0x2d, 0x76, 0x62, 0x6f, 0x78, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, + 0x64, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, + 0x65, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x2d, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, + 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, + 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, + 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, + 0x65, 0x2d, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, + 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, + 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x2d, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, + 0x65, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x5f, + 0x54, 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, + 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, + 0x70, 0x65, 0x2d, 0x62, 0x6f, 0x78, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x76, 0x62, 0x6f, 0x78, 0x31, 0x30, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x66, 0x75, 0x6c, 0x6c, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x2d, 0x65, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x33, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, + 0x33, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, 0x43, + 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, + 0x47, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x6f, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x41, 0x5f, 0x75, 0x74, 0x6f, + 0x6d, 0x61, 0x74, 0x69, 0x63, 0x20, 0x4c, 0x6f, + 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, 0x75, 0x74, + 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x73, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, + 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x4f, 0x52, + 0x49, 0x45, 0x4e, 0x54, 0x41, 0x54, 0x49, 0x4f, + 0x4e, 0x5f, 0x48, 0x4f, 0x52, 0x49, 0x5a, 0x4f, + 0x4e, 0x54, 0x41, 0x4c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x6f, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x73, 0x77, + 0x69, 0x74, 0x63, 0x68, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, + 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, + 0x43, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, 0x6f, + 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x66, 0x69, + 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, + 0x74, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x46, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x20, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, + 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, 0x6d, + 0x55, 0x73, 0x65, 0x72, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, 0x6f, 0x6e, + 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, + 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x2d, 0x61, 0x31, 0x31, 0x79, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x55, 0x73, 0x65, 0x72, + 0x20, 0x49, 0x63, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, + 0x2d, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x6c, 0x69, 0x65, 0x66, 0x22, + 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x41, 0x74, 0x6b, 0x4f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x32, 0x2d, 0x61, 0x31, 0x31, 0x79, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x55, 0x73, 0x65, 0x72, + 0x20, 0x49, 0x63, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, + 0x6d, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, 0x6f, + 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x32, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x61, 0x76, 0x61, + 0x74, 0x61, 0x72, 0x2d, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x61, 0x6e, + 0x67, 0x75, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x6c, + 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x2d, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, + 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x2d, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, + 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x47, 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, 0x47, + 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x73, 0x74, 0x2d, + 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x4c, 0x61, 0x73, 0x74, 0x20, + 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, + 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6c, + 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, + 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x73, 0x74, + 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, + 0x69, 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x47, 0x54, 0x4b, 0x5f, 0x41, 0x4c, 0x49, + 0x47, 0x4e, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, + 0x2d, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x74, 0x6f, + 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, 0x45, + 0x4e, 0x44, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x47, 0x54, 0x4b, + 0x5f, 0x41, 0x4c, 0x49, 0x47, 0x4e, 0x5f, 0x45, + 0x4e, 0x44, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, + 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x41, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x73, 0x74, + 0x72, 0x75, 0x63, 0x74, 0x69, 0x76, 0x65, 0x2d, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, 0x6f, 0x6e, + 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, + 0x22, 0x3e, 0x62, 0x6f, 0x74, 0x68, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, 0x6f, + 0x6e, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x2d, 0x73, 0x69, 0x7a, + 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x62, 0x6f, + 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, + 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x75, 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, + 0x6e, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, + 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x62, 0x6f, + 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x67, + 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x6c, + 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, + 0x79, 0x70, 0x65, 0x2d, 0x62, 0x6f, 0x78, 0x22, + 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x75, 0x74, 0x6f, 0x6c, 0x6f, 0x67, 0x69, + 0x6e, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x2f, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x73, 0x74, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, + 0x62, 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, + 0x70, 0x65, 0x2d, 0x73, 0x74, 0x61, 0x6e, 0x64, + 0x61, 0x72, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x2d, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, + 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, + 0x29, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0d, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, + 0x11, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x0b, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x6d, 0x69, + 0x64, 0x64, 0x6c, 0x65, 0x2d, 0x66, 0x69, 0x6e, + 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, + 0xbc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x39, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xc5, 0x99, 0x5b, + 0x6c, 0x54, 0x45, 0x18, 0xc7, 0x7f, 0x67, 0x2f, + 0x6d, 0x69, 0x55, 0x8a, 0x50, 0xa0, 0xa9, 0x24, + 0x90, 0x82, 0x62, 0x30, 0xf6, 0xab, 0x91, 0x18, + 0x0d, 0xa8, 0x8d, 0x97, 0x78, 0x41, 0x93, 0x26, + 0x5e, 0x48, 0x94, 0x28, 0x86, 0x68, 0x22, 0xfa, + 0xc0, 0x93, 0x0f, 0xbe, 0x68, 0xa2, 0x89, 0x11, + 0x21, 0x1a, 0x2f, 0x41, 0x8d, 0x0f, 0x22, 0x06, + 0x43, 0x8c, 0x37, 0x14, 0x1f, 0x14, 0x7d, 0x90, + 0xd4, 0x80, 0xd8, 0x7c, 0x2a, 0x44, 0xb1, 0x94, + 0x02, 0x01, 0x2b, 0x56, 0x96, 0xb5, 0xed, 0x76, + 0xb7, 0x7b, 0xe9, 0xf1, 0xa1, 0x67, 0xeb, 0xf6, + 0xec, 0x6c, 0x77, 0xcf, 0x9e, 0xb3, 0xf8, 0x7f, + 0x99, 0x99, 0xef, 0x32, 0xf3, 0xfd, 0x77, 0xe6, + 0xcc, 0xcc, 0x37, 0x6b, 0xd9, 0xb6, 0x4d, 0xad, + 0xd0, 0xf9, 0x79, 0x64, 0x4d, 0x28, 0x1a, 0xdd, + 0x14, 0x89, 0xd4, 0x2d, 0xc4, 0x26, 0x95, 0xcb, + 0xa6, 0x8f, 0x4e, 0x24, 0x53, 0x1b, 0x7b, 0xbb, + 0xed, 0xbf, 0x83, 0x1a, 0xc3, 0xaa, 0x15, 0x01, + 0xf9, 0x32, 0xfa, 0x42, 0x7d, 0xf3, 0xc5, 0xeb, + 0x17, 0xb5, 0x76, 0xcc, 0xb7, 0x0f, 0x46, 0x89, + 0xd6, 0x47, 0x08, 0xad, 0xc8, 0x32, 0x70, 0xac, + 0xa7, 0x6f, 0x3c, 0x39, 0xf2, 0x60, 0xef, 0x5d, + 0xd9, 0x03, 0x41, 0x8c, 0x53, 0x13, 0x02, 0x9d, + 0xbb, 0xc3, 0xab, 0x42, 0xf3, 0x9a, 0x3f, 0x6a, + 0x5f, 0xb4, 0xb2, 0x25, 0xb5, 0xdd, 0xe2, 0xe4, + 0xae, 0x41, 0x00, 0x2e, 0x7f, 0xa4, 0x9d, 0x8b, + 0xee, 0x69, 0x40, 0x0f, 0x7d, 0x76, 0x28, 0x93, + 0x18, 0xed, 0xec, 0xed, 0xb6, 0xb3, 0x7e, 0xc7, + 0x0a, 0xf9, 0xed, 0x40, 0x44, 0x36, 0x89, 0xc8, + 0x2e, 0x11, 0xb9, 0x35, 0x2f, 0xb3, 0xeb, 0xc2, + 0x5b, 0xe6, 0xb6, 0xb6, 0xb7, 0xb4, 0x84, 0x17, + 0x10, 0xdb, 0x37, 0x3c, 0x65, 0x7b, 0x66, 0xef, + 0x59, 0x5a, 0xa3, 0x6d, 0xb4, 0x2d, 0xba, 0xf2, + 0x52, 0xab, 0x3e, 0xfa, 0xa4, 0xe3, 0x6f, 0x89, + 0xc8, 0x0a, 0x11, 0x99, 0x73, 0xde, 0x09, 0x88, + 0x48, 0x27, 0xb0, 0x15, 0xb8, 0x17, 0xd8, 0x2d, + 0x22, 0x8b, 0xaf, 0xfa, 0xd8, 0x8a, 0xd8, 0xd1, + 0xf0, 0xbc, 0x0b, 0xc2, 0xb3, 0x69, 0x0e, 0xcf, + 0x21, 0x97, 0xc8, 0x4d, 0xd9, 0x8f, 0x9d, 0x4d, + 0x31, 0x37, 0x3c, 0x8f, 0xd6, 0xe6, 0xa5, 0x75, + 0xa1, 0x50, 0x24, 0x4f, 0x78, 0x33, 0x70, 0x08, + 0x18, 0x14, 0x91, 0xcb, 0xce, 0x2b, 0x01, 0xa0, + 0xad, 0xa0, 0x5e, 0x07, 0xac, 0x01, 0x96, 0x58, + 0xb3, 0xea, 0x1b, 0x1b, 0x42, 0x0d, 0xcc, 0x0a, + 0x35, 0x91, 0x1e, 0xcb, 0x4c, 0x19, 0xa4, 0x46, + 0x53, 0x34, 0x64, 0x66, 0xd1, 0x18, 0x6a, 0x22, + 0x1c, 0x89, 0xce, 0x75, 0xc4, 0xeb, 0x9c, 0xb2, + 0x1e, 0xb8, 0xdf, 0x6b, 0x00, 0x7e, 0x09, 0xb8, + 0xd7, 0xf0, 0x6d, 0xc0, 0xa0, 0x95, 0xce, 0xa6, + 0x2d, 0x2c, 0xec, 0xb4, 0x4d, 0x2e, 0x93, 0x9b, + 0x66, 0x90, 0x8c, 0xa5, 0xb0, 0xb0, 0xb0, 0x73, + 0x13, 0x09, 0x11, 0x69, 0x07, 0xe6, 0x17, 0xa8, + 0x23, 0x5e, 0x03, 0x08, 0x9a, 0x40, 0xd7, 0xc4, + 0xb3, 0x1d, 0xe3, 0xf6, 0x78, 0x66, 0x24, 0x6d, + 0xa7, 0x49, 0x8c, 0x25, 0x8a, 0x1c, 0x86, 0x47, + 0x87, 0x89, 0x27, 0xff, 0x62, 0x62, 0x22, 0xf7, + 0x0b, 0x70, 0xad, 0xdf, 0x78, 0xfc, 0x12, 0x48, + 0xb9, 0xda, 0x8d, 0xc0, 0x72, 0x2b, 0x93, 0xdb, + 0x1e, 0x3b, 0x77, 0x32, 0x19, 0x1f, 0x8b, 0x17, + 0x39, 0xc4, 0xc6, 0x62, 0xf4, 0x1d, 0xef, 0x39, + 0x9e, 0x4b, 0x25, 0x9f, 0x07, 0xae, 0xf6, 0x1b, + 0x8f, 0x5f, 0x02, 0x83, 0x06, 0x59, 0x87, 0x95, + 0xce, 0x6d, 0x8e, 0x9f, 0x3e, 0xb6, 0xff, 0xf4, + 0x50, 0x7f, 0xc6, 0xad, 0x3c, 0xdc, 0xdf, 0x13, + 0x4f, 0x24, 0xe3, 0xaf, 0xf6, 0x76, 0xdb, 0x67, + 0x80, 0x65, 0x2e, 0x75, 0xce, 0x6d, 0x5f, 0x0e, + 0x7e, 0x09, 0x9c, 0x36, 0xc8, 0xa4, 0xb7, 0xdb, + 0xb6, 0xed, 0xe4, 0xf8, 0xcd, 0x83, 0x3f, 0x1f, + 0xf9, 0xc2, 0xad, 0x1c, 0xea, 0x89, 0xbf, 0x76, + 0xe0, 0xf6, 0xc4, 0x56, 0xa7, 0xe9, 0x26, 0x50, + 0x34, 0x65, 0x22, 0x72, 0x83, 0x88, 0x6c, 0x10, + 0x91, 0x0b, 0x4d, 0x01, 0xf8, 0x22, 0xa0, 0xaa, + 0x29, 0xe0, 0xac, 0x4b, 0xdc, 0x01, 0xd0, 0xdb, + 0x6d, 0xe7, 0xb2, 0xef, 0xb6, 0xbd, 0xec, 0xf6, + 0x99, 0x38, 0x38, 0xfb, 0x57, 0x27, 0xb0, 0x08, + 0xb0, 0xc4, 0xa5, 0x3e, 0x57, 0xd8, 0x10, 0x91, + 0x3b, 0x80, 0x6f, 0x81, 0xb7, 0x81, 0x67, 0x4c, + 0x31, 0xf8, 0x3e, 0xc8, 0x28, 0x9e, 0x85, 0x8e, + 0x82, 0x7a, 0x93, 0xc1, 0x3e, 0x2f, 0x5b, 0x4c, + 0xf1, 0xae, 0x73, 0xce, 0xd5, 0xde, 0x04, 0x58, + 0x4e, 0xfd, 0x22, 0xd3, 0xe0, 0xb5, 0x20, 0xd0, + 0x22, 0x22, 0xad, 0x4e, 0xbd, 0xd1, 0x60, 0x9f, + 0x97, 0x2d, 0x35, 0xe8, 0xa6, 0x08, 0x88, 0xc8, + 0x42, 0xa0, 0xab, 0x40, 0xf7, 0xa7, 0x69, 0xf0, + 0x20, 0x08, 0x9c, 0x32, 0xc8, 0xae, 0x70, 0x4a, + 0xd3, 0xba, 0x0d, 0x3b, 0xa5, 0x7b, 0xfd, 0x03, + 0xc4, 0x0a, 0xea, 0x6b, 0x0b, 0x6c, 0xc1, 0xbc, + 0x61, 0x04, 0x42, 0xc0, 0xd4, 0x71, 0xfe, 0x4a, + 0x30, 0x13, 0x81, 0xe5, 0x06, 0x5d, 0xe1, 0x12, + 0x7a, 0xd8, 0xa5, 0xeb, 0x37, 0x0d, 0x1e, 0x04, + 0x81, 0xa4, 0x41, 0x96, 0x0f, 0xce, 0x44, 0x20, + 0x3f, 0xe6, 0x35, 0x2e, 0x79, 0x16, 0xe7, 0xc7, + 0x10, 0x91, 0x0e, 0xa6, 0x7f, 0x4b, 0x69, 0xe0, + 0x3b, 0xd3, 0xe0, 0x41, 0x10, 0x70, 0x1f, 0x66, + 0x30, 0x33, 0x81, 0xb0, 0x88, 0x34, 0x32, 0x3d, + 0x40, 0x80, 0x01, 0x55, 0xcd, 0x9f, 0xec, 0x0f, + 0xb9, 0x74, 0x3d, 0xaa, 0x3a, 0x66, 0x1a, 0xbc, + 0xd6, 0x04, 0x4c, 0x3b, 0x47, 0x18, 0x58, 0x49, + 0xf1, 0x0e, 0x74, 0x14, 0xa6, 0xb6, 0xd7, 0x07, + 0x5c, 0xba, 0xaf, 0x4a, 0x0d, 0x1e, 0x04, 0x81, + 0x71, 0x83, 0xac, 0x4d, 0x44, 0xd6, 0x01, 0x37, + 0x19, 0x74, 0xf3, 0x81, 0x1b, 0x0d, 0xf2, 0x3e, + 0xa7, 0xbc, 0x85, 0xe9, 0x17, 0x3c, 0x98, 0x81, + 0x40, 0xd1, 0xed, 0x4f, 0x44, 0x9a, 0x80, 0xf7, + 0x80, 0xeb, 0x9c, 0x4e, 0x77, 0x00, 0x6f, 0xa9, + 0x6a, 0xa9, 0xd4, 0xcd, 0x34, 0x03, 0x00, 0xdb, + 0x4b, 0xc8, 0x9f, 0x28, 0x21, 0x3f, 0xe1, 0x94, + 0x6b, 0x5d, 0xf2, 0x33, 0xc0, 0x8f, 0x25, 0x7c, + 0x8c, 0x33, 0xb0, 0x06, 0xe8, 0x06, 0x16, 0x00, + 0xab, 0x80, 0x6d, 0xc0, 0x5e, 0x67, 0xdd, 0x9a, + 0x50, 0x8a, 0x80, 0x57, 0x0c, 0x89, 0xc8, 0x52, + 0xe0, 0x3e, 0x97, 0x7c, 0xa7, 0xaa, 0x4e, 0x94, + 0x72, 0x32, 0x11, 0xe8, 0xa5, 0xf8, 0x52, 0xd5, + 0x05, 0xec, 0x14, 0x91, 0xb0, 0xc1, 0xde, 0xb4, + 0x84, 0xaa, 0xc1, 0x8b, 0xc0, 0x4e, 0xa0, 0xc1, + 0x25, 0xdf, 0x31, 0x93, 0x53, 0x11, 0x01, 0x55, + 0xed, 0x03, 0xde, 0x30, 0xd8, 0xde, 0x0d, 0xbc, + 0x62, 0x90, 0x07, 0x35, 0x03, 0x0b, 0x29, 0xbe, + 0x5e, 0xff, 0xa6, 0xaa, 0x25, 0x97, 0x0f, 0x94, + 0xfe, 0x88, 0x9f, 0xc6, 0x7c, 0xc2, 0x6e, 0x14, + 0x91, 0x3b, 0x5d, 0xb2, 0xa0, 0x08, 0x98, 0xb0, + 0xb7, 0x9c, 0x81, 0x91, 0x80, 0xaa, 0x8e, 0x00, + 0x8f, 0x97, 0xf0, 0x79, 0x53, 0x44, 0x66, 0x17, + 0xb4, 0x83, 0x5a, 0x42, 0x26, 0xfc, 0x50, 0xce, + 0xa0, 0xe4, 0x36, 0xaa, 0xaa, 0xbb, 0x81, 0x0f, + 0x0d, 0xaa, 0x36, 0xe0, 0xa5, 0x82, 0xf6, 0x25, + 0xde, 0xe3, 0xaa, 0x18, 0x65, 0x1f, 0xbf, 0xca, + 0x9d, 0x03, 0x4f, 0x01, 0x45, 0x59, 0x15, 0xb0, + 0x41, 0x44, 0x56, 0x3b, 0xf5, 0xd5, 0x06, 0x7d, + 0x10, 0x18, 0x01, 0x8e, 0x94, 0x33, 0x2a, 0xfb, + 0x32, 0x27, 0x22, 0xdb, 0x80, 0xc7, 0x0c, 0xaa, + 0x3e, 0x60, 0x3d, 0xb0, 0x87, 0x12, 0x77, 0x75, + 0x9f, 0xf8, 0x49, 0x55, 0xa5, 0x9c, 0x51, 0x25, + 0x27, 0xf1, 0x73, 0x4c, 0x5e, 0xa6, 0xdc, 0x58, + 0x06, 0xec, 0xa3, 0x36, 0xc1, 0x03, 0xfc, 0x51, + 0x89, 0x51, 0x59, 0x02, 0xaa, 0x7a, 0x0a, 0x78, + 0xdf, 0x77, 0x38, 0xde, 0x11, 0x0c, 0x01, 0x07, + 0x5b, 0x80, 0xda, 0xbd, 0xc3, 0x9b, 0x61, 0x4c, + 0x60, 0xdc, 0xa8, 0x88, 0x80, 0xaa, 0x1e, 0x06, + 0xbe, 0xf6, 0x15, 0x8e, 0x77, 0xcc, 0x78, 0x80, + 0xe5, 0xe1, 0xe5, 0x36, 0xfa, 0x41, 0x95, 0x81, + 0x54, 0x83, 0x2c, 0xf0, 0x4d, 0x25, 0x86, 0x5e, + 0x08, 0x7c, 0x82, 0x79, 0x4b, 0xad, 0x05, 0xbe, + 0x57, 0xd5, 0xe1, 0xf2, 0x66, 0x1e, 0x08, 0xa8, + 0x6a, 0x8c, 0xf3, 0xb7, 0x8c, 0x3e, 0xad, 0xd4, + 0xd0, 0x6b, 0x42, 0xf3, 0x28, 0x30, 0xe0, 0xd1, + 0xc7, 0x2b, 0xfe, 0x61, 0xf2, 0x21, 0xab, 0x22, + 0x78, 0x22, 0xe0, 0x6c, 0xa9, 0x5d, 0xfc, 0x97, + 0x7c, 0xd4, 0x02, 0xaf, 0x57, 0xba, 0x7c, 0xa0, + 0x8a, 0x94, 0x52, 0x55, 0x4f, 0x30, 0x49, 0xc2, + 0x74, 0x5b, 0xf5, 0x8b, 0x24, 0x50, 0xf4, 0x1c, + 0x39, 0x13, 0xaa, 0xca, 0x89, 0x55, 0x75, 0x80, + 0xc9, 0xbc, 0x36, 0xe8, 0x99, 0x78, 0x47, 0x55, + 0x87, 0xbc, 0x38, 0x54, 0x9d, 0xd4, 0xab, 0x6a, + 0x3f, 0x70, 0x3d, 0x70, 0xbc, 0xda, 0x3e, 0x5c, + 0xb0, 0x31, 0x27, 0x4c, 0x33, 0xc2, 0xef, 0xeb, + 0xf4, 0x49, 0x26, 0x93, 0x70, 0xcf, 0xef, 0xfa, + 0x06, 0xec, 0x51, 0xd5, 0xa3, 0x5e, 0x9d, 0x7c, + 0x3f, 0xab, 0xa8, 0xea, 0x7e, 0x40, 0xfd, 0xf6, + 0xc3, 0x64, 0x3e, 0xec, 0x19, 0x41, 0xbc, 0x0b, + 0x01, 0xfc, 0x1e, 0x40, 0x1f, 0xfb, 0xab, 0x71, + 0x0a, 0x8a, 0x80, 0xe7, 0xa9, 0x37, 0xc0, 0xfd, + 0x47, 0x49, 0x45, 0x08, 0x8a, 0xc0, 0x68, 0x00, + 0x7d, 0x54, 0x95, 0x5b, 0x07, 0x45, 0x20, 0x88, + 0x8f, 0xf8, 0x7f, 0x25, 0x50, 0xf2, 0xe5, 0xac, + 0x42, 0x64, 0x55, 0xb5, 0xaa, 0x1f, 0xe1, 0x5f, + 0xe5, 0x5b, 0x98, 0x08, 0x78, 0x31, 0x51, 0x5c, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, + 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x2d, 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, + 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, + 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xc7, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x44, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x7f, + 0x68, 0x55, 0x65, 0x18, 0xc7, 0x3f, 0xe7, 0x9e, + 0x7b, 0xaf, 0x77, 0x77, 0x6e, 0xe5, 0xe6, 0x9c, + 0xdb, 0x74, 0x68, 0x2a, 0x0d, 0x0b, 0x7c, 0x34, + 0x25, 0x94, 0x8c, 0x24, 0x82, 0x50, 0x51, 0x8a, + 0xca, 0x40, 0x0c, 0x8a, 0xa8, 0xa8, 0x08, 0xca, + 0x3f, 0xfc, 0x23, 0xfa, 0x47, 0xc4, 0xa0, 0x32, + 0xf2, 0x8f, 0xc2, 0xca, 0x20, 0xca, 0x30, 0x24, + 0xac, 0x14, 0x06, 0x69, 0x2a, 0x61, 0x21, 0x9a, + 0xae, 0x47, 0x2c, 0xb2, 0xd4, 0xf9, 0xdb, 0xe9, + 0x46, 0xde, 0xa5, 0xe9, 0x7e, 0xdd, 0xed, 0xf6, + 0xc7, 0xce, 0xdd, 0xce, 0xce, 0xde, 0xbb, 0x7b, + 0xcf, 0x3d, 0x67, 0x46, 0xdf, 0x7f, 0xce, 0xfb, + 0x3e, 0x3f, 0xde, 0xf3, 0x7c, 0x79, 0x9f, 0xf7, + 0xc7, 0x73, 0xee, 0xb5, 0x32, 0x99, 0x0c, 0xff, + 0x67, 0x44, 0x47, 0xfb, 0x05, 0x22, 0x12, 0x07, + 0x96, 0x00, 0x9d, 0xc0, 0x2e, 0x55, 0xed, 0x0d, + 0x73, 0xfc, 0x48, 0x98, 0x83, 0xe5, 0xc0, 0x5a, + 0x60, 0x3b, 0xd0, 0x08, 0xac, 0x09, 0x7b, 0xf0, + 0xc0, 0x33, 0x20, 0x22, 0xaf, 0x02, 0xf3, 0x81, + 0xcd, 0xaa, 0xba, 0xcb, 0x60, 0xf2, 0x98, 0xab, + 0xbd, 0x12, 0x58, 0xef, 0xf1, 0xb7, 0x80, 0x99, + 0xc0, 0x25, 0x55, 0x4d, 0xf9, 0x7d, 0x7f, 0xa0, + 0x19, 0x10, 0x91, 0xd9, 0xc0, 0xbb, 0xc0, 0xe3, + 0xc0, 0x4e, 0x11, 0x99, 0x62, 0x30, 0xbb, 0xcd, + 0xd5, 0xae, 0x35, 0xe8, 0xdf, 0x06, 0x7e, 0x05, + 0x5a, 0x44, 0xe4, 0x4e, 0xbf, 0x31, 0x04, 0x4d, + 0xa1, 0x3a, 0x57, 0x3b, 0x0e, 0x2c, 0x35, 0xd8, + 0x94, 0xbb, 0xda, 0xb7, 0x8b, 0x48, 0x89, 0x47, + 0xbf, 0xca, 0x79, 0x8e, 0x01, 0x56, 0xf8, 0x0d, + 0x20, 0x28, 0x81, 0xb4, 0xa7, 0xff, 0xb0, 0xbb, + 0x23, 0x22, 0x09, 0xfa, 0x89, 0xb9, 0x31, 0xd1, + 0xa5, 0x9f, 0x06, 0x4c, 0x70, 0xe9, 0x7c, 0xa7, + 0x74, 0xd8, 0x04, 0x16, 0x89, 0x48, 0xcc, 0xd5, + 0x1f, 0x6b, 0xf0, 0x71, 0xa7, 0xd4, 0xfc, 0x7c, + 0xf1, 0xcc, 0xdd, 0x6e, 0xd5, 0xcc, 0xda, 0x69, + 0x4d, 0xcd, 0x15, 0x40, 0xd0, 0x45, 0xdc, 0xe9, + 0xe9, 0x27, 0x81, 0x06, 0xe0, 0x98, 0xd3, 0x2f, + 0x35, 0xf8, 0x24, 0x5d, 0xed, 0xb9, 0x1e, 0xdd, + 0x00, 0x81, 0xd9, 0x8d, 0xd1, 0xe5, 0x76, 0x3c, + 0xb1, 0x2e, 0x59, 0x3b, 0xb9, 0x22, 0x6a, 0xc7, + 0xed, 0xf9, 0xfb, 0x2a, 0x53, 0x5d, 0x1d, 0x37, + 0x36, 0x36, 0x2d, 0xee, 0xdc, 0xe4, 0x76, 0x08, + 0x4a, 0xa0, 0xc5, 0x20, 0x9b, 0xc5, 0xc8, 0x04, + 0xdc, 0xb2, 0x19, 0x1e, 0x5d, 0x2f, 0xc0, 0x9c, + 0x46, 0xfb, 0x85, 0xe8, 0xb8, 0xca, 0xb5, 0x53, + 0x27, 0xdf, 0x53, 0x55, 0x65, 0x4f, 0x20, 0x11, + 0x29, 0xa1, 0x2b, 0xd3, 0x55, 0xdd, 0x7c, 0xb9, + 0x69, 0xfd, 0xdc, 0xc6, 0x92, 0xba, 0xc3, 0x8b, + 0x3b, 0xde, 0xc8, 0x3a, 0x04, 0x4d, 0xa1, 0x8b, + 0x06, 0x99, 0xb8, 0xda, 0x49, 0x83, 0x7e, 0x24, + 0x02, 0xed, 0x0d, 0x3b, 0xac, 0xb2, 0xbe, 0x58, + 0x6c, 0x75, 0xed, 0xa4, 0xbb, 0xaa, 0xea, 0xa2, + 0x93, 0x49, 0xfe, 0x5e, 0x4e, 0xf7, 0x2e, 0x8b, + 0xba, 0x9e, 0x7a, 0x66, 0xd6, 0x2c, 0x18, 0x57, + 0x5a, 0x5e, 0xf9, 0xd4, 0x9c, 0x1d, 0xd6, 0xc0, + 0x6e, 0x16, 0x88, 0x80, 0xaa, 0x76, 0x02, 0x7f, + 0x79, 0xc4, 0xb3, 0x72, 0x04, 0x9b, 0x45, 0x12, + 0x40, 0x44, 0xa2, 0x80, 0x37, 0xb7, 0x53, 0x25, + 0x11, 0x7b, 0x45, 0xbc, 0xa6, 0x7a, 0x5a, 0x85, + 0x3d, 0x9e, 0xde, 0x23, 0x11, 0x76, 0xaf, 0xde, + 0xcf, 0xfe, 0x0d, 0x07, 0x38, 0xb3, 0xe5, 0x22, + 0x13, 0xa3, 0xb5, 0xdc, 0x51, 0x3f, 0xaf, 0x3e, + 0x12, 0x1b, 0xf3, 0x5a, 0x28, 0x04, 0x1c, 0x78, + 0x67, 0x21, 0x1f, 0x81, 0xac, 0x6c, 0x0a, 0xc3, + 0x53, 0x38, 0x85, 0xcd, 0xc2, 0x64, 0xe9, 0x38, + 0xab, 0x2c, 0x52, 0x46, 0xf3, 0xf6, 0x73, 0xe0, + 0x5c, 0xd5, 0xa2, 0x1d, 0x31, 0x2a, 0xec, 0xf1, + 0x54, 0x8c, 0xa9, 0xc6, 0x8e, 0xc5, 0x07, 0xce, + 0x8b, 0xd1, 0x20, 0x50, 0x25, 0x22, 0x35, 0x4e, + 0xdb, 0x94, 0x42, 0x59, 0xd9, 0x74, 0x83, 0x2e, + 0x85, 0x15, 0x29, 0x89, 0x59, 0x31, 0x32, 0xed, + 0x16, 0x17, 0x7f, 0x19, 0x5c, 0x62, 0x55, 0x95, + 0x55, 0x24, 0xac, 0x04, 0x31, 0x2b, 0x86, 0x45, + 0x64, 0x60, 0xa7, 0x0b, 0x83, 0xc0, 0x05, 0x83, + 0xec, 0x6e, 0xe7, 0x59, 0x66, 0xd0, 0xd9, 0xce, + 0xd3, 0x9b, 0xff, 0x00, 0x57, 0x33, 0xbd, 0xbd, + 0x07, 0xbb, 0x3b, 0x6f, 0xd0, 0xb2, 0xaf, 0x95, + 0x4c, 0xdf, 0xe0, 0x4d, 0x39, 0x59, 0x99, 0xa4, + 0x27, 0xd3, 0x4d, 0x77, 0xba, 0x93, 0x4c, 0x5f, + 0xef, 0x99, 0xac, 0x3c, 0x0c, 0x02, 0xa6, 0x9d, + 0x28, 0x3b, 0xc5, 0x23, 0x11, 0x68, 0x30, 0xe8, + 0x52, 0xf1, 0x74, 0xdf, 0xb6, 0x9b, 0x6d, 0x97, + 0xcf, 0x5f, 0xda, 0xdd, 0x36, 0x44, 0x11, 0xad, + 0xb1, 0x68, 0xef, 0x4b, 0xd1, 0x7c, 0xf9, 0x48, + 0x6b, 0x4f, 0x67, 0xd7, 0xe6, 0xac, 0x3c, 0x0c, + 0x02, 0x1d, 0x06, 0x59, 0x36, 0x38, 0x13, 0x81, + 0xec, 0x3b, 0xef, 0xf5, 0xc8, 0xd3, 0x40, 0xcb, + 0xa1, 0xe5, 0x99, 0xf3, 0xe9, 0x26, 0x7e, 0xba, + 0xd9, 0x3c, 0x78, 0xc4, 0xd8, 0xd1, 0x08, 0xd6, + 0xcc, 0x3e, 0x4e, 0xb6, 0x1f, 0x4b, 0x5f, 0x69, + 0x3d, 0xb5, 0xb7, 0x69, 0x59, 0xf7, 0xe1, 0xac, + 0x2e, 0x8c, 0x7a, 0xc0, 0x7b, 0x98, 0xc1, 0xc8, + 0x04, 0x6c, 0x11, 0x49, 0x32, 0x74, 0xb1, 0x03, + 0x9c, 0x56, 0xd5, 0x34, 0x40, 0xe6, 0xd3, 0xfa, + 0x21, 0xb3, 0x3a, 0xb6, 0x21, 0xc1, 0x0f, 0xe7, + 0xb7, 0xb5, 0xb6, 0xa6, 0x9a, 0xbf, 0x4b, 0x24, + 0xae, 0x3d, 0xe3, 0xd6, 0x8d, 0x36, 0x81, 0x72, + 0x83, 0xce, 0x06, 0xe6, 0x19, 0xde, 0x7d, 0x12, + 0x06, 0xb6, 0xd7, 0x95, 0x6e, 0xc5, 0xb5, 0x74, + 0xeb, 0xd7, 0xed, 0x17, 0x4e, 0xbd, 0x72, 0xf4, + 0xd1, 0xcc, 0xb0, 0xf5, 0x16, 0x46, 0x0a, 0x75, + 0x19, 0x64, 0x75, 0x22, 0xb2, 0x0a, 0x78, 0xd0, + 0xa0, 0x9b, 0x00, 0x3c, 0x60, 0x90, 0x9f, 0x70, + 0x9e, 0x0f, 0x31, 0xf4, 0x82, 0x47, 0xe6, 0xf8, + 0xd8, 0x37, 0x4d, 0xc1, 0x83, 0x61, 0x06, 0x44, + 0xa4, 0x14, 0xf8, 0x1c, 0x58, 0xe0, 0x0c, 0xba, + 0x05, 0xf8, 0x48, 0x55, 0x73, 0x15, 0xcf, 0xa6, + 0x19, 0x00, 0xf8, 0x2c, 0x87, 0xfc, 0xe5, 0x1c, + 0xf2, 0xb3, 0xce, 0xf3, 0x49, 0x8f, 0xfc, 0x0a, + 0x70, 0x24, 0x87, 0x8f, 0x71, 0x06, 0x96, 0x02, + 0x8f, 0x00, 0xd5, 0xc0, 0x7d, 0xc0, 0x26, 0x60, + 0x8f, 0x93, 0xb7, 0x26, 0xe4, 0x22, 0xe0, 0x17, + 0x6d, 0x22, 0x32, 0x1d, 0x78, 0xc2, 0x23, 0xdf, + 0xaa, 0xaa, 0x7d, 0xb9, 0x9c, 0x4c, 0x04, 0x9a, + 0x70, 0x2e, 0x55, 0x2e, 0x2c, 0x02, 0xb6, 0x8a, + 0x88, 0x6d, 0xb0, 0x37, 0xa5, 0x50, 0x31, 0x78, + 0x0b, 0xd8, 0x0a, 0x24, 0x3c, 0xf2, 0x2d, 0x23, + 0x39, 0x0d, 0x23, 0xa0, 0xaa, 0x27, 0x80, 0x0f, + 0x0c, 0xb6, 0xcb, 0x80, 0x8d, 0x06, 0x79, 0x58, + 0x33, 0x30, 0x91, 0xe1, 0xd7, 0xeb, 0xe3, 0xaa, + 0x9a, 0x33, 0x7d, 0x20, 0xf7, 0x22, 0x7e, 0x1d, + 0xf3, 0x09, 0xfb, 0x92, 0x88, 0x2c, 0xf1, 0xc8, + 0xc2, 0x22, 0x60, 0xc2, 0x9e, 0x7c, 0x06, 0x46, + 0x02, 0xaa, 0x7a, 0x1d, 0x78, 0x31, 0x87, 0xcf, + 0x87, 0x22, 0xe2, 0xae, 0xaa, 0xc2, 0x4a, 0x21, + 0x13, 0x7e, 0xce, 0x67, 0x90, 0x73, 0x1b, 0x55, + 0xd5, 0x9d, 0xc0, 0x57, 0x06, 0x55, 0x1d, 0xf0, + 0x8e, 0xab, 0x3f, 0xc9, 0x7f, 0x5c, 0x05, 0xe3, + 0x50, 0x3e, 0x83, 0x7c, 0xe7, 0xc0, 0x1a, 0xa0, + 0xc7, 0x20, 0x7f, 0x56, 0x44, 0x16, 0x3a, 0xed, + 0x85, 0x06, 0x7d, 0x18, 0xb8, 0x0e, 0xfc, 0x91, + 0xcf, 0xc8, 0xca, 0xf7, 0x6d, 0x54, 0x44, 0x36, + 0x01, 0xcf, 0x1b, 0x54, 0x27, 0x80, 0xa7, 0xe9, + 0xff, 0xe2, 0x66, 0x3a, 0x71, 0x83, 0xe2, 0xa8, + 0xaa, 0x4a, 0x3e, 0xa3, 0x42, 0x4e, 0xe2, 0x75, + 0x40, 0xb7, 0x41, 0x3e, 0x03, 0xf8, 0x91, 0xd1, + 0x09, 0x1e, 0xe0, 0x52, 0x21, 0x46, 0x79, 0x09, + 0xa8, 0xea, 0x05, 0xe0, 0x8b, 0xc0, 0xe1, 0xf8, + 0x47, 0x38, 0x04, 0x1c, 0x6c, 0x60, 0xa0, 0xb8, + 0xbb, 0x65, 0x30, 0xd5, 0x19, 0xc3, 0x50, 0x10, + 0x01, 0x55, 0xfd, 0x0d, 0xf8, 0x3e, 0x50, 0x38, + 0xfe, 0x31, 0xe2, 0x01, 0x96, 0x85, 0x9f, 0xdb, + 0xe8, 0x97, 0x45, 0x06, 0x52, 0x0c, 0xd2, 0xc0, + 0xde, 0x42, 0x0c, 0xfd, 0x10, 0xf8, 0x06, 0xf3, + 0x96, 0x3a, 0x1a, 0x38, 0xa0, 0xaa, 0xd7, 0x0a, + 0x31, 0x2c, 0x98, 0x80, 0xaa, 0x5e, 0xe5, 0xd6, + 0xa5, 0xd1, 0xb7, 0x85, 0x1a, 0xfa, 0x2d, 0x68, + 0x9e, 0x03, 0x4e, 0xfb, 0xf4, 0xf1, 0x8b, 0xbf, + 0x81, 0x8f, 0x0b, 0x35, 0xf6, 0x45, 0xc0, 0xd9, + 0x52, 0x17, 0x31, 0x58, 0x7c, 0x8c, 0x06, 0xde, + 0x2f, 0x34, 0x7d, 0xa0, 0x88, 0x92, 0x52, 0x55, + 0xcf, 0xd2, 0x4f, 0xc2, 0x58, 0xe2, 0x05, 0x44, + 0x07, 0xf0, 0x9e, 0x1f, 0x87, 0xa2, 0x6a, 0x62, + 0x55, 0x3d, 0x4d, 0x7f, 0x5d, 0x1b, 0xf6, 0x4c, + 0x7c, 0xa2, 0xaa, 0x6d, 0xf9, 0xcd, 0x06, 0x51, + 0x74, 0x51, 0xaf, 0xaa, 0xa7, 0x80, 0xfb, 0x81, + 0x33, 0xc5, 0x8e, 0xe1, 0x41, 0x06, 0x73, 0xc1, + 0x34, 0x22, 0x82, 0x7e, 0x9d, 0x3e, 0x47, 0x7f, + 0x11, 0x1e, 0xc6, 0x6f, 0xbf, 0x8d, 0xaa, 0x7a, + 0xd2, 0xaf, 0x53, 0xe0, 0xcf, 0x2a, 0xaa, 0x7a, + 0x10, 0xd0, 0xa0, 0xe3, 0xd0, 0x5f, 0x0f, 0xfb, + 0x46, 0x58, 0x3f, 0x74, 0xff, 0x19, 0xc2, 0x18, + 0x07, 0x8b, 0x71, 0x0a, 0x8b, 0x80, 0xef, 0xa9, + 0x37, 0xc0, 0xfb, 0x43, 0x49, 0x41, 0x08, 0x8b, + 0xc0, 0x3f, 0x21, 0x8c, 0x51, 0x54, 0x6d, 0x1d, + 0x16, 0x81, 0x30, 0x16, 0xf1, 0x7f, 0x4a, 0x20, + 0xe7, 0x97, 0xb3, 0x02, 0x91, 0x2e, 0xf6, 0x5f, + 0x2c, 0xff, 0x02, 0xf3, 0xd4, 0x74, 0x76, 0x23, + 0xdb, 0xd9, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x49, + 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, + 0x6e, 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0x93, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, + 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, + 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, + 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, + 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x31, + 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, + 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, + 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, + 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, + 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, + 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4c, 0x65, 0x66, 0x74, 0x20, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, + 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, 0x74, 0x20, + 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, + 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, + 0x74, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, + 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4c, 0x65, 0x66, + 0x74, 0x20, 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, + 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, + 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, + 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, + 0x69, 0x67, 0x68, 0x74, 0x20, 0x74, 0x68, 0x75, + 0x6d, 0x62, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, + 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, + 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x52, 0x69, 0x67, 0x68, 0x74, 0x20, + 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, + 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, + 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x69, 0x67, + 0x68, 0x74, 0x20, 0x72, 0x69, 0x6e, 0x67, 0x20, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, + 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, + 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x30, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x52, 0x69, + 0x67, 0x68, 0x74, 0x20, 0x6c, 0x69, 0x74, 0x74, + 0x6c, 0x65, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, + 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, + 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, + 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x73, + 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x20, 0x46, 0x69, 0x6e, + 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, + 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2d, 0x75, 0x73, 0x65, 0x72, 0x73, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, + 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, + 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, + 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, + 0x62, 0x6f, 0x78, 0x37, 0x34, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, + 0x6b, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2d, 0x69, 0x6e, 0x66, 0x6f, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6e, 0x74, + 0x72, 0x6f, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x3e, 0x54, 0x6f, 0x20, 0x65, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x20, 0x6c, + 0x6f, 0x67, 0x69, 0x6e, 0x2c, 0x20, 0x79, 0x6f, + 0x75, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x74, + 0x6f, 0x20, 0x73, 0x61, 0x76, 0x65, 0x20, 0x6f, + 0x6e, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x79, 0x6f, + 0x75, 0x72, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x73, 0x2c, + 0x20, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x41, 0x63, 0x6d, 0x65, 0x20, + 0x46, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x20, 0x35, + 0x30, 0x30, 0x30, 0x2e, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, + 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x37, 0x30, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x31, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x52, 0x69, 0x67, 0x68, + 0x74, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x66, 0x74, + 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, + 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x33, 0x2d, 0x68, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, + 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x33, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4f, 0x74, 0x68, + 0x65, 0x72, 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x72, 0x61, 0x64, + 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x69, 0x6e, + 0x67, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, + 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, + 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x32, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, + 0x72, 0x6f, 0x6c, 0x6c, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x49, 0x6e, 0x20, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x73, + 0x61, 0x76, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x72, + 0x20, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x79, + 0x6f, 0x75, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, + 0x74, 0x6f, 0x20, 0x73, 0x77, 0x69, 0x70, 0x65, + 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x20, 0x6f, 0x6e, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x22, 0x41, 0x63, 0x6d, 0x65, + 0x20, 0x66, 0x6f, 0x6f, 0x62, 0x61, 0x72, 0x22, + 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x48, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x72, 0x6f, 0x6c, + 0x6c, 0x5f, 0x68, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, 0x74, + 0x6f, 0x70, 0x22, 0x3e, 0x32, 0x34, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x2d, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x32, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x31, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, + 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x32, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, + 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, + 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, + 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x6f, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x2d, + 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x34, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, + 0x74, 0x6b, 0x2d, 0x6e, 0x6f, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, + 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, + 0x6e, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, + 0x6e, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x33, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x59, 0x6f, 0x75, 0x72, 0x20, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x20, 0x77, 0x61, 0x73, 0x20, + 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, + 0x75, 0x6c, 0x6c, 0x79, 0x20, 0x73, 0x61, 0x76, + 0x65, 0x64, 0x2e, 0x20, 0x59, 0x6f, 0x75, 0x20, + 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x6e, + 0x6f, 0x77, 0x20, 0x62, 0x65, 0x20, 0x61, 0x62, + 0x6c, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x6f, + 0x67, 0x20, 0x69, 0x6e, 0x20, 0x75, 0x73, 0x69, + 0x6e, 0x67, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, + 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x20, 0x72, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, + 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, + 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x69, + 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x62, + 0x6f, 0x74, 0x68, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x61, 0x64, + 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x61, 0x64, 0x69, 0x6f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x33, 0x2d, 0x68, 0x62, 0x6f, 0x78, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x72, 0x69, 0x67, 0x68, 0x74, + 0x2d, 0x72, 0x69, 0x6e, 0x67, 0x2d, 0x66, 0x69, + 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0xe2, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, @@ -6903,13 +4933,1491 @@ 0x8b, 0x30, 0x09, 0x68, 0xb8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x2d, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x2f, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, - 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2d, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, - 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xcd, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x79, 0x29, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0xfc, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, + 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x32, 0x2e, + 0x31, 0x32, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, + 0x2d, 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x66, 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, + 0x69, 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, + 0x63, 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, + 0x2d, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x43, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2d, 0x6f, + 0x6e, 0x2d, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x2d, 0x75, 0x73, 0x65, + 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, + 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, + 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x2d, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x63, 0x65, 0x6c, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6f, 0x6b, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x68, + 0x5f, 0x61, 0x6e, 0x67, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x67, + 0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x2d, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, + 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x34, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x76, 0x65, 0x72, 0x69, 0x66, + 0x79, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, + 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x68, 0x69, 0x6e, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, + 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, + 0x2d, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, + 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, + 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, + 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, + 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, + 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x2d, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x2d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x56, 0x65, + 0x72, 0x69, 0x66, 0x79, 0x20, 0x4e, 0x65, 0x77, + 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x69, 0x66, + 0x79, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, + 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x2d, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x4e, 0x65, 0x77, + 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, + 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, + 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x42, 0x61, 0x72, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, + 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x2d, 0x69, + 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, + 0x64, 0x69, 0x73, 0x63, 0x72, 0x65, 0x74, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x34, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, + 0x74, 0x73, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x22, 0x2f, + 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x69, 0x67, 0x68, 0x22, 0x20, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3d, 0x22, 0x33, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6f, 0x6c, 0x64, 0x2d, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x43, 0x75, 0x72, + 0x72, 0x65, 0x6e, 0x74, 0x20, 0x5f, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x6f, 0x6c, 0x64, 0x2d, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, + 0x74, 0x22, 0x3e, 0x32, 0x35, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x6c, 0x64, + 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, + 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, + 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x72, 0x61, 0x64, + 0x69, 0x6f, 0x2d, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x72, + 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x75, 0x73, + 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, + 0x69, 0x72, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x6e, + 0x65, 0x78, 0x74, 0x20, 0x6c, 0x6f, 0x67, 0x69, + 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, + 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x6e, 0x6f, 0x77, 0x2d, 0x72, 0x61, 0x64, + 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, + 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x20, 0x6e, 0x6f, 0x77, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x6c, 0x65, 0x66, 0x74, + 0x2d, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x2e, 0x70, + 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe8, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x65, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x5b, + 0x6c, 0x94, 0x45, 0x14, 0xc7, 0x7f, 0xdb, 0x6d, + 0xb7, 0x94, 0xb6, 0x2c, 0x95, 0x72, 0x29, 0x2d, + 0xad, 0x29, 0x72, 0xb1, 0x78, 0x39, 0xa4, 0x85, + 0x40, 0x14, 0xbc, 0x00, 0x92, 0x20, 0x12, 0x62, + 0x0c, 0x8a, 0xa0, 0x06, 0x43, 0x24, 0xbe, 0xc2, + 0x0b, 0x2f, 0xc6, 0x0b, 0x4f, 0xa0, 0xf1, 0xf2, + 0xe0, 0x8b, 0xc6, 0xcb, 0x03, 0x55, 0x9e, 0xbc, + 0x45, 0x40, 0x22, 0x90, 0x08, 0x18, 0x8b, 0x58, + 0x3c, 0x06, 0x35, 0x16, 0x4a, 0x40, 0x4b, 0x4b, + 0xb9, 0x14, 0x04, 0x6a, 0x4b, 0xb7, 0xed, 0xae, + 0x0f, 0xbb, 0x5b, 0xa6, 0xb3, 0xdf, 0x6e, 0xbf, + 0xef, 0xdb, 0x6d, 0x8c, 0xff, 0x97, 0x9d, 0x33, + 0xe7, 0xcc, 0xcc, 0xf9, 0x7f, 0x67, 0x66, 0xbe, + 0x99, 0xf3, 0x6d, 0x20, 0x16, 0x8b, 0xf1, 0x7f, + 0x46, 0x7e, 0xae, 0x3b, 0x14, 0x91, 0x20, 0xf0, + 0x08, 0x30, 0x06, 0xd8, 0xad, 0xaa, 0x91, 0x5c, + 0x8f, 0x61, 0x22, 0x6f, 0x14, 0xfa, 0xdc, 0x0c, + 0xec, 0x01, 0x3e, 0x03, 0x5e, 0x1b, 0x85, 0xfe, + 0x87, 0xc1, 0x57, 0x04, 0x44, 0x64, 0x3c, 0x50, + 0x09, 0xfc, 0xae, 0xaa, 0xf6, 0x1c, 0x5c, 0x6b, + 0x94, 0x9f, 0x00, 0xb6, 0x3a, 0xb4, 0x7f, 0x18, + 0xd8, 0x04, 0x34, 0xab, 0xea, 0x0e, 0x3f, 0x3e, + 0x24, 0xe1, 0x39, 0x02, 0x22, 0x32, 0x0b, 0xe8, + 0x04, 0x7e, 0x05, 0x5e, 0x77, 0x30, 0xa9, 0x32, + 0xca, 0x61, 0x87, 0xf6, 0x95, 0xc0, 0xd7, 0xc0, + 0x1a, 0x60, 0xbb, 0x88, 0x2c, 0xf4, 0xea, 0x83, + 0x09, 0x3f, 0x53, 0xe8, 0x49, 0xa0, 0x30, 0x51, + 0x7e, 0xc6, 0x72, 0xae, 0x10, 0x28, 0x37, 0xaa, + 0xc6, 0x39, 0xb4, 0x5f, 0x09, 0x14, 0x19, 0x72, + 0x85, 0x0f, 0x1f, 0x86, 0xe0, 0x87, 0x80, 0x39, + 0xed, 0x26, 0x89, 0xc8, 0x74, 0x43, 0x9e, 0x0a, + 0x04, 0x0c, 0x39, 0x94, 0x20, 0x65, 0xe2, 0x51, + 0x4b, 0xce, 0x6a, 0x91, 0xfb, 0x21, 0x60, 0xb7, + 0x31, 0xa7, 0x80, 0xd3, 0x13, 0x1f, 0xaa, 0x13, + 0x91, 0x02, 0x60, 0x89, 0xa5, 0xff, 0xcf, 0x09, + 0x34, 0x18, 0xe5, 0x22, 0x52, 0x51, 0x62, 0x94, + 0x67, 0x03, 0x63, 0x2d, 0x7d, 0x8f, 0x0f, 0x1f, + 0xd2, 0x3a, 0xe3, 0x06, 0x83, 0x96, 0x3c, 0xcb, + 0x28, 0xdb, 0xce, 0x01, 0x14, 0x1b, 0xe5, 0x7b, + 0x1d, 0xf4, 0xe7, 0x7d, 0xf8, 0x30, 0x04, 0xc7, + 0x6d, 0x54, 0x44, 0x8a, 0x89, 0x2f, 0xd6, 0xb3, + 0xaa, 0x7a, 0xd0, 0x52, 0xff, 0x6d, 0xc9, 0x33, + 0x8d, 0xf2, 0x48, 0x11, 0x10, 0x07, 0x7d, 0xfb, + 0x48, 0x4e, 0x66, 0x42, 0xba, 0x08, 0xbc, 0x0c, + 0x7c, 0x00, 0x1c, 0x10, 0x11, 0x7b, 0xd1, 0x5d, + 0xb5, 0xe4, 0x1a, 0x11, 0x09, 0x25, 0xca, 0x4e, + 0x11, 0x30, 0x09, 0xd8, 0x11, 0xe8, 0x52, 0xd5, + 0x9b, 0xae, 0x3c, 0x4d, 0x83, 0x74, 0x04, 0xcc, + 0xfd, 0x7b, 0x8b, 0xa5, 0xb3, 0x09, 0x04, 0x81, + 0xda, 0x44, 0x79, 0xa4, 0x08, 0xd8, 0x04, 0xb2, + 0x7a, 0xfa, 0x90, 0x9e, 0x40, 0x87, 0x51, 0x7e, + 0x40, 0x44, 0xa6, 0x19, 0xb2, 0x4d, 0x00, 0x6e, + 0x4d, 0xa3, 0xb4, 0x04, 0x44, 0xa4, 0x02, 0x98, + 0x68, 0xe9, 0xce, 0xb9, 0x71, 0x32, 0x13, 0xd2, + 0x11, 0x68, 0xb7, 0x6c, 0xd6, 0x19, 0xf2, 0x15, + 0x07, 0xfb, 0x24, 0x81, 0xa0, 0x83, 0x2e, 0x19, + 0x81, 0x39, 0x23, 0x8c, 0xe3, 0x0b, 0xe9, 0x08, + 0x9c, 0xb2, 0x64, 0xf3, 0x8d, 0xeb, 0x14, 0x81, + 0x3b, 0x13, 0xbf, 0x4e, 0x04, 0x92, 0xbb, 0xd0, + 0x4c, 0x07, 0x5d, 0x56, 0x3b, 0x10, 0xa4, 0x27, + 0xd0, 0x04, 0xf4, 0x1a, 0x72, 0x9d, 0x88, 0xd4, + 0x1b, 0x83, 0x0e, 0x58, 0xf6, 0xf3, 0x32, 0xf4, + 0x97, 0x8c, 0xc0, 0x2c, 0x07, 0x5d, 0xaf, 0x43, + 0x9d, 0x27, 0x38, 0x12, 0x50, 0xd5, 0x3e, 0xe0, + 0x88, 0x55, 0xfd, 0x6c, 0x42, 0x37, 0x00, 0x9c, + 0xb1, 0x74, 0x73, 0x44, 0xa4, 0x94, 0xcc, 0x53, + 0xc8, 0x29, 0x02, 0x69, 0x77, 0xa0, 0xfa, 0x3d, + 0xf9, 0x1b, 0xea, 0xf7, 0x8e, 0xd9, 0x3f, 0xff, + 0xdb, 0xd2, 0xe3, 0xf3, 0xf6, 0x8e, 0xdd, 0x5f, + 0xbf, 0x27, 0xb4, 0xc1, 0xc9, 0x2e, 0xd3, 0x71, + 0xfa, 0x00, 0xb0, 0xcc, 0x90, 0xd7, 0x8a, 0xc8, + 0x96, 0x04, 0x81, 0x56, 0x60, 0x86, 0xa1, 0xcb, + 0x23, 0xfe, 0x46, 0xce, 0x44, 0xc0, 0x29, 0x02, + 0x29, 0x04, 0x1a, 0xde, 0x0b, 0x14, 0x0c, 0x56, + 0x06, 0x3f, 0x29, 0x99, 0x5c, 0xb9, 0xac, 0x62, + 0x72, 0x5d, 0xb8, 0x34, 0x58, 0x4a, 0x2c, 0x16, + 0xa5, 0xe3, 0x42, 0x4b, 0x43, 0xc3, 0xde, 0x31, + 0x2b, 0x68, 0xeb, 0x7b, 0xfa, 0xa7, 0x17, 0x62, + 0xfd, 0xe6, 0xc0, 0x99, 0x08, 0x98, 0x98, 0x08, + 0x2c, 0x4f, 0x94, 0xed, 0x35, 0x02, 0xb0, 0x18, + 0x98, 0xe2, 0x50, 0xbf, 0x44, 0x44, 0xd6, 0x01, + 0x35, 0x0e, 0xba, 0x3e, 0xbb, 0x62, 0x70, 0x6a, + 0xfe, 0xab, 0x45, 0xd5, 0xd5, 0xab, 0x6a, 0x2a, + 0x24, 0x5c, 0x1d, 0xba, 0x9d, 0xea, 0x82, 0x5a, + 0x6a, 0x42, 0xd3, 0xb9, 0xab, 0xf2, 0xbe, 0x70, + 0x55, 0xcd, 0xdc, 0x55, 0x54, 0x86, 0x5e, 0x32, + 0xed, 0x33, 0x11, 0x38, 0x0e, 0x5c, 0xb0, 0xea, + 0xd6, 0x27, 0x7e, 0xff, 0x74, 0xb0, 0x7f, 0x85, + 0xf8, 0x6d, 0xcc, 0xc6, 0x0c, 0x60, 0x67, 0x9a, + 0xb1, 0x86, 0x45, 0xe0, 0x9e, 0xdd, 0x81, 0xb2, + 0x68, 0x51, 0xf0, 0xa9, 0x89, 0xe3, 0x6b, 0x42, + 0x93, 0x82, 0x53, 0xe8, 0xfe, 0x26, 0xc2, 0xd1, + 0xcd, 0xca, 0xbe, 0x35, 0x87, 0x38, 0xb9, 0xad, + 0x8d, 0xea, 0xa2, 0xba, 0x50, 0xe1, 0xd8, 0x71, + 0xeb, 0xe6, 0x7e, 0x11, 0x18, 0x3f, 0x22, 0x01, + 0x55, 0x8d, 0x02, 0x9f, 0x5a, 0xd5, 0x8f, 0x8b, + 0x48, 0x1d, 0x70, 0x31, 0x5d, 0x3b, 0x8f, 0x18, + 0x46, 0x20, 0x38, 0xc0, 0xc2, 0x82, 0x09, 0x65, + 0x55, 0xa5, 0xfd, 0x61, 0x4e, 0x6c, 0x6d, 0xa5, + 0xe9, 0xad, 0x66, 0x3a, 0x4e, 0x74, 0xd2, 0x73, + 0xb5, 0x97, 0xbf, 0x8e, 0xb4, 0x73, 0xf3, 0xe8, + 0x20, 0xe5, 0xe5, 0xb5, 0xd3, 0x02, 0xc1, 0x5b, + 0x27, 0xe0, 0x91, 0x0e, 0x73, 0x3b, 0x2d, 0x39, + 0x04, 0x34, 0x02, 0xdb, 0x73, 0xe3, 0xbf, 0x35, + 0x85, 0x0a, 0xf2, 0x1f, 0x2c, 0x2c, 0x1c, 0x57, + 0xd0, 0xbe, 0xa3, 0x8b, 0x4b, 0xda, 0x35, 0x4c, + 0x15, 0xc8, 0x0b, 0x50, 0x39, 0x7b, 0x2a, 0xe1, + 0x92, 0x49, 0x05, 0x79, 0xc1, 0xd0, 0xe2, 0x64, + 0x7d, 0x46, 0x02, 0xaa, 0xda, 0x0c, 0xfc, 0x61, + 0x55, 0x0b, 0xf1, 0x8b, 0x4b, 0x2e, 0x90, 0xb2, + 0x88, 0x23, 0x1f, 0x87, 0xb8, 0xda, 0x74, 0x23, + 0xc5, 0x70, 0xc1, 0x63, 0xf3, 0x99, 0x50, 0x7d, + 0x1b, 0xf9, 0xd6, 0xbe, 0xe3, 0xe6, 0x38, 0x6d, + 0x2f, 0xe6, 0x5c, 0x62, 0x18, 0x81, 0xd8, 0xe7, + 0x53, 0xfe, 0xe9, 0xdf, 0x97, 0xba, 0x91, 0x95, + 0x95, 0x97, 0xb1, 0xfc, 0xc5, 0xa5, 0x0c, 0xc4, + 0xfa, 0xe9, 0xee, 0xb9, 0xdc, 0x1f, 0x1d, 0x8c, + 0x1c, 0x4a, 0xea, 0xdc, 0x64, 0x25, 0x8e, 0x65, + 0xef, 0x67, 0x5a, 0x0c, 0x4d, 0x21, 0x11, 0x09, + 0x13, 0x98, 0xb0, 0xc9, 0xc9, 0x68, 0xf5, 0x96, + 0x95, 0xf4, 0x14, 0x75, 0xd3, 0x1d, 0xb9, 0xc1, + 0x85, 0xcb, 0xad, 0x6d, 0xb1, 0x41, 0x7e, 0x48, + 0xea, 0xdc, 0x44, 0xe0, 0xc7, 0x1c, 0x38, 0x9a, + 0x0e, 0x66, 0x06, 0xe3, 0x0d, 0x62, 0xa9, 0x17, + 0xfc, 0x3b, 0x16, 0xd7, 0x12, 0x5e, 0x58, 0x4c, + 0xe7, 0x40, 0x07, 0xa7, 0xba, 0x34, 0xd2, 0xdb, + 0x7d, 0xbd, 0xf1, 0xe7, 0xd5, 0xb1, 0xa1, 0x3b, + 0x89, 0x1b, 0x02, 0x2d, 0x40, 0xea, 0xa4, 0xcc, + 0x0d, 0x16, 0x01, 0x88, 0xc8, 0x22, 0x60, 0xa3, + 0xad, 0x0c, 0xe4, 0x07, 0xa8, 0xdd, 0x58, 0xc5, + 0x99, 0xc8, 0x69, 0x8e, 0x9d, 0xdb, 0x77, 0xad, + 0xe5, 0xcc, 0xe1, 0xaf, 0xa2, 0xed, 0x3d, 0xdb, + 0x86, 0xd9, 0xb8, 0xc9, 0x8d, 0x8a, 0x88, 0xe2, + 0x7c, 0x1d, 0xcc, 0x16, 0x37, 0x80, 0x15, 0xc0, + 0x87, 0x0c, 0x7f, 0xb3, 0x03, 0x10, 0xbc, 0xbb, + 0xbb, 0xbd, 0xf8, 0xb9, 0xeb, 0x17, 0x07, 0x06, + 0x22, 0x57, 0xa2, 0xd1, 0xbe, 0xc6, 0xa6, 0x15, + 0xbd, 0x1f, 0xd9, 0x36, 0x6e, 0x33, 0x73, 0x1d, + 0x8c, 0x0e, 0x81, 0x52, 0xe0, 0x70, 0x1a, 0x5d, + 0x64, 0xf0, 0x44, 0xc9, 0x82, 0x43, 0x4b, 0x5b, + 0x33, 0xde, 0x19, 0xdc, 0x5e, 0xea, 0x3b, 0x46, + 0x36, 0xc9, 0x39, 0x76, 0xa9, 0xea, 0x88, 0x17, + 0x1e, 0xb7, 0x04, 0xb2, 0x3e, 0xb7, 0xfb, 0xc0, + 0x9b, 0x6e, 0x8c, 0xdc, 0x12, 0x68, 0xce, 0xc2, + 0x11, 0x3f, 0x38, 0xac, 0xaa, 0xbf, 0xb8, 0x31, + 0x74, 0x4b, 0xe0, 0x20, 0xa9, 0x97, 0x98, 0xd1, + 0xc4, 0x2e, 0xb7, 0x86, 0xae, 0x08, 0xa8, 0xea, + 0x75, 0xb8, 0xf5, 0xf2, 0x18, 0x65, 0x44, 0x89, + 0x7f, 0x5b, 0x70, 0x05, 0x2f, 0x99, 0xb9, 0x2f, + 0xbd, 0xfb, 0xe2, 0x0b, 0xdf, 0xa9, 0x6a, 0xa7, + 0x5b, 0x63, 0x2f, 0x04, 0xde, 0x07, 0xae, 0x79, + 0xf7, 0xc7, 0x13, 0xda, 0x80, 0xe7, 0xbd, 0x34, + 0x70, 0x4d, 0x20, 0x31, 0x8d, 0xde, 0xf5, 0xea, + 0x91, 0x07, 0xb4, 0x03, 0x0f, 0xa9, 0xea, 0x59, + 0x2f, 0x8d, 0xbc, 0x26, 0x77, 0xdf, 0x26, 0x07, + 0x99, 0x04, 0x07, 0x9c, 0x07, 0x1e, 0x56, 0xd5, + 0xd3, 0x5e, 0x1b, 0x7a, 0x22, 0xa0, 0xaa, 0x97, + 0x88, 0xe7, 0x4c, 0x73, 0x89, 0x73, 0xc4, 0x9f, + 0xfc, 0x49, 0x3f, 0x8d, 0xfd, 0xa4, 0xd7, 0xdf, + 0x01, 0x72, 0xf5, 0x71, 0xf9, 0x2c, 0x70, 0xbf, + 0xaa, 0xb6, 0xf8, 0xed, 0xc0, 0x33, 0x01, 0x55, + 0x6d, 0x25, 0xfe, 0x19, 0x35, 0x5b, 0x44, 0x81, + 0xf5, 0xaa, 0xea, 0x94, 0x20, 0x70, 0x0d, 0xbf, + 0xdf, 0x89, 0x1b, 0xb3, 0x19, 0x34, 0x81, 0xdf, + 0x54, 0xf5, 0xfb, 0x6c, 0x3b, 0xf1, 0x4b, 0x20, + 0xeb, 0x81, 0x49, 0xbd, 0x6b, 0xfb, 0x82, 0x5f, + 0x02, 0x97, 0x72, 0x30, 0xb6, 0xef, 0x79, 0x6f, + 0xc2, 0x2f, 0x81, 0x94, 0x8c, 0x9a, 0x0f, 0xe4, + 0xe4, 0x96, 0xe7, 0x8b, 0x40, 0x22, 0xe9, 0x95, + 0xed, 0xe1, 0xce, 0xfe, 0x58, 0xe8, 0x0b, 0xd9, + 0xfc, 0xd9, 0x23, 0xab, 0x6f, 0x5b, 0xc4, 0x77, + 0xa1, 0xac, 0xf1, 0x2f, 0x72, 0xb4, 0x70, 0x1f, + 0xbc, 0xbf, 0xb5, 0x7f, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x2f, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x69, 0x6e, 0x64, + 0x65, 0x78, 0x2d, 0x66, 0x69, 0x6e, 0x67, 0x65, + 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, + 0xeb, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x68, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x99, 0x6d, + 0x88, 0x54, 0x65, 0x14, 0xc7, 0x7f, 0x77, 0x66, + 0x67, 0x67, 0xdc, 0xd7, 0xf1, 0x6d, 0x7d, 0xdb, + 0x32, 0x0c, 0xdd, 0xd2, 0xc0, 0x63, 0xb9, 0x42, + 0xa4, 0x85, 0x06, 0x86, 0x09, 0x45, 0xd2, 0x12, + 0xa2, 0x99, 0x48, 0x54, 0xe0, 0xb7, 0x82, 0x88, + 0x3e, 0x94, 0x51, 0x04, 0x59, 0x44, 0x42, 0x41, + 0x96, 0x06, 0x41, 0xa1, 0x5f, 0x0a, 0x0b, 0xf4, + 0x43, 0x90, 0x25, 0x96, 0x56, 0xeb, 0xcb, 0xd1, + 0x0c, 0x77, 0x37, 0xdf, 0x4a, 0x5d, 0x5f, 0xd6, + 0xd6, 0xd5, 0x75, 0xdb, 0x99, 0xd9, 0xd9, 0x99, + 0x3e, 0xcc, 0xac, 0xde, 0xbd, 0xfb, 0xdc, 0x99, + 0x7b, 0xef, 0x4c, 0x46, 0xff, 0x2f, 0x7b, 0x9e, + 0xe7, 0x9c, 0xe7, 0x79, 0xce, 0xff, 0x9e, 0x73, + 0xf7, 0x3e, 0xe7, 0x8c, 0x95, 0xcd, 0x66, 0xf9, + 0x3f, 0xa3, 0xa2, 0xdc, 0x1b, 0x8a, 0x48, 0x18, + 0x58, 0x0c, 0xc4, 0x80, 0xed, 0xaa, 0x9a, 0xb2, + 0xeb, 0x9b, 0xbf, 0xb6, 0xee, 0xcb, 0x44, 0xa2, + 0xab, 0x2c, 0x2b, 0x7c, 0x1b, 0xd9, 0xcc, 0xc1, + 0x54, 0x7f, 0xe2, 0xa3, 0xc3, 0xcb, 0xb2, 0x27, + 0x82, 0x9e, 0x57, 0x76, 0x02, 0xc0, 0xf3, 0xc0, + 0xfa, 0xbc, 0xfc, 0x16, 0xf0, 0x12, 0x80, 0xf5, + 0x9a, 0x15, 0x92, 0x79, 0xe1, 0xf7, 0x63, 0x13, + 0x27, 0xb5, 0x4c, 0x6c, 0xb8, 0x63, 0x5c, 0x5d, + 0x24, 0x4e, 0x22, 0x79, 0x6d, 0x71, 0xe7, 0xe9, + 0x5f, 0x57, 0x34, 0x6f, 0xaf, 0x5c, 0xd7, 0xba, + 0x34, 0xb5, 0x39, 0xc8, 0x61, 0xa1, 0x20, 0x8b, + 0x44, 0x24, 0x2e, 0x22, 0xb3, 0x44, 0xc4, 0x32, + 0xa8, 0x97, 0xdb, 0xe4, 0xc7, 0x87, 0x84, 0xd9, + 0xcd, 0x15, 0x2f, 0xc7, 0x1a, 0x1b, 0x57, 0x4f, + 0x9b, 0x32, 0x77, 0x5c, 0xbc, 0x7d, 0x02, 0x97, + 0xd6, 0xf7, 0x11, 0xda, 0x51, 0xc7, 0x9c, 0xa6, + 0x25, 0x8d, 0xb5, 0x63, 0x26, 0xbf, 0xd9, 0xbc, + 0xad, 0x72, 0x5e, 0x10, 0x5f, 0x7c, 0x13, 0x10, + 0x91, 0x26, 0xe0, 0x3c, 0x70, 0x04, 0x78, 0xdb, + 0x60, 0xd2, 0x68, 0x93, 0xeb, 0x01, 0xe6, 0x6c, + 0xb3, 0xe2, 0xd9, 0x58, 0x78, 0x75, 0x43, 0x7c, + 0xda, 0xa8, 0x78, 0xcf, 0x58, 0x0e, 0xbf, 0xd2, + 0xc1, 0xd9, 0x5d, 0x17, 0x38, 0xba, 0xe9, 0x18, + 0xd1, 0x8e, 0x1a, 0x66, 0xdc, 0x3a, 0xbf, 0xc1, + 0xaa, 0x8a, 0x6e, 0xb8, 0x29, 0x04, 0x80, 0x27, + 0x80, 0x68, 0x5e, 0x7e, 0xd2, 0xae, 0x10, 0x91, + 0x28, 0x30, 0xce, 0x36, 0x55, 0x07, 0x10, 0xb2, + 0x58, 0x10, 0x19, 0x33, 0x66, 0x6a, 0x3c, 0x14, + 0x27, 0xd1, 0x9a, 0x66, 0x30, 0x39, 0x78, 0xdd, + 0x20, 0xd6, 0x53, 0xc5, 0xf8, 0x48, 0x03, 0xd5, + 0xd5, 0xf1, 0x49, 0xb3, 0xbf, 0xb1, 0xaa, 0xfd, + 0x3a, 0x13, 0x84, 0x80, 0xfd, 0xbd, 0x69, 0x10, + 0x91, 0xdb, 0x6d, 0xe3, 0xc9, 0x80, 0x3d, 0xad, + 0x2a, 0x45, 0x24, 0x9a, 0x89, 0x54, 0x2c, 0x8c, + 0x55, 0xd5, 0x55, 0x8c, 0x0a, 0x55, 0xd1, 0xf5, + 0x73, 0xf7, 0xb0, 0xcd, 0xea, 0xa2, 0xf5, 0xd4, + 0x84, 0x6a, 0xa9, 0xad, 0x69, 0x18, 0x1b, 0xe9, + 0xe7, 0x2e, 0xbf, 0xce, 0x04, 0x21, 0xe0, 0x5c, + 0x73, 0xaf, 0xdd, 0x1f, 0x83, 0x7d, 0x9d, 0x05, + 0x7d, 0x56, 0xc6, 0x22, 0x94, 0x0e, 0xd1, 0x79, + 0xe0, 0xc2, 0x30, 0x65, 0x2c, 0x12, 0x23, 0x6c, + 0x55, 0x40, 0x36, 0x33, 0x90, 0xc9, 0x90, 0x28, + 0xd5, 0x99, 0x20, 0x6b, 0xe6, 0xda, 0xe4, 0x51, + 0x06, 0xfb, 0x9a, 0x4c, 0x22, 0xbd, 0x33, 0xdd, + 0xdf, 0x97, 0xe8, 0x3d, 0xd3, 0x47, 0x3a, 0x99, + 0x1e, 0xa6, 0xcc, 0x46, 0x33, 0x0c, 0x64, 0x53, + 0xf4, 0xf6, 0xfe, 0xd5, 0x93, 0x4a, 0x73, 0xb4, + 0x54, 0x67, 0xbc, 0x60, 0xd0, 0x31, 0x6e, 0xb2, + 0xc9, 0x55, 0x06, 0xfb, 0xea, 0xd1, 0x57, 0xd9, + 0x9b, 0xbc, 0xd4, 0x75, 0xe2, 0xf2, 0xf1, 0x2b, + 0x23, 0x94, 0xe9, 0xd1, 0x29, 0xba, 0x53, 0x17, + 0x49, 0xfc, 0xdd, 0xd3, 0x7e, 0xa4, 0x25, 0x9b, + 0x32, 0xac, 0x2f, 0x08, 0x23, 0x01, 0x11, 0xa9, + 0x16, 0x91, 0x35, 0x22, 0xb2, 0xc8, 0xa0, 0xee, + 0x71, 0x8c, 0x67, 0xd8, 0x64, 0x63, 0x04, 0xbe, + 0x5b, 0x9d, 0x4d, 0x0c, 0xa6, 0x06, 0x5e, 0xef, + 0x3a, 0xd8, 0xd9, 0xef, 0x54, 0x5e, 0xa9, 0xeb, + 0x66, 0x5f, 0xc7, 0xf6, 0xd3, 0x03, 0x57, 0x7b, + 0x9f, 0xf5, 0xee, 0xf6, 0x0d, 0xb8, 0x45, 0xe0, + 0x55, 0x60, 0x33, 0xf0, 0xad, 0x88, 0x2c, 0x75, + 0xe8, 0x2e, 0x3b, 0xc6, 0x53, 0x45, 0xa4, 0x32, + 0x2f, 0x9b, 0x22, 0x50, 0x03, 0x70, 0x68, 0x69, + 0x7a, 0x6b, 0x72, 0xbf, 0x75, 0xd2, 0xae, 0x08, + 0xd7, 0x84, 0xb2, 0xdf, 0xb7, 0x7d, 0xda, 0x76, + 0xad, 0xff, 0xe2, 0xa3, 0xfb, 0x5a, 0xb2, 0x7f, + 0xfa, 0xf4, 0x1d, 0x70, 0x27, 0x50, 0x6f, 0x93, + 0x5f, 0x70, 0xe8, 0x9c, 0x04, 0xc2, 0xc0, 0xb4, + 0xbc, 0x6c, 0x8c, 0xc0, 0x75, 0xa9, 0x27, 0x32, + 0xde, 0xae, 0x18, 0x1c, 0x48, 0x9f, 0x1c, 0xb8, + 0xdc, 0x75, 0x77, 0xeb, 0x92, 0xd4, 0xc1, 0xe2, + 0xae, 0x9a, 0xe1, 0x46, 0xa0, 0xd3, 0x26, 0x3f, + 0x20, 0x22, 0xb7, 0xd8, 0xc6, 0x4e, 0x02, 0x70, + 0x23, 0x8d, 0x5c, 0x09, 0x88, 0xc8, 0x24, 0x60, + 0x18, 0x01, 0x92, 0xa1, 0xb6, 0x3d, 0x2d, 0xd9, + 0x11, 0x69, 0xe5, 0x07, 0x6e, 0x04, 0xce, 0x3a, + 0x6c, 0x56, 0xd8, 0xc6, 0xdd, 0x8c, 0xc4, 0x10, + 0x81, 0xb0, 0x41, 0x37, 0x14, 0x81, 0x59, 0x45, + 0xce, 0x09, 0x04, 0x37, 0x02, 0xbf, 0x3b, 0xc6, + 0xf6, 0x2f, 0xae, 0x29, 0x02, 0x77, 0xe6, 0xff, + 0x9a, 0x08, 0x0c, 0x7d, 0x5d, 0x67, 0x18, 0x74, + 0xe7, 0xdc, 0x5d, 0xf3, 0x06, 0x37, 0x02, 0x3f, + 0x01, 0xf6, 0xd0, 0xce, 0x14, 0x91, 0x7b, 0x6c, + 0x87, 0xa6, 0x1d, 0xf6, 0xcd, 0x05, 0xf6, 0x1b, + 0x8a, 0x40, 0x93, 0x41, 0x57, 0x52, 0xfa, 0xb8, + 0x1d, 0x88, 0xaa, 0x26, 0x81, 0x1f, 0x1c, 0xd3, + 0xab, 0xf2, 0xba, 0x34, 0x70, 0xd2, 0xa1, 0x9b, + 0x25, 0x22, 0xb5, 0x14, 0x4e, 0x21, 0x53, 0x04, + 0x7c, 0x7f, 0x79, 0x9d, 0x28, 0xf4, 0x21, 0xfb, + 0xd6, 0x31, 0x5e, 0x2e, 0x22, 0x43, 0xf7, 0xa0, + 0x63, 0x86, 0x7d, 0xe6, 0x52, 0x98, 0x80, 0x29, + 0x02, 0x37, 0x95, 0xc0, 0x78, 0xe0, 0xa1, 0xbc, + 0xec, 0x7c, 0x47, 0x00, 0xee, 0x07, 0x26, 0x1a, + 0xe6, 0x1f, 0x14, 0x91, 0x15, 0xc0, 0x54, 0x83, + 0x2e, 0x59, 0xd4, 0xc3, 0x22, 0x28, 0x54, 0x91, + 0x1d, 0x00, 0x2e, 0x00, 0x13, 0x6c, 0x73, 0x2b, + 0x81, 0xed, 0xc0, 0x1f, 0x06, 0xfb, 0x75, 0x2e, + 0xfb, 0x4c, 0x07, 0x3e, 0x73, 0xd1, 0xb9, 0x46, + 0x20, 0x5f, 0x2c, 0x3d, 0x93, 0x3f, 0x73, 0x3a, + 0xb0, 0x07, 0x78, 0x4a, 0x55, 0x7b, 0xed, 0x76, + 0xae, 0x11, 0x50, 0xd5, 0x0c, 0xb0, 0xc5, 0x31, + 0xbd, 0x4c, 0x44, 0x66, 0x02, 0x17, 0xdd, 0xd6, + 0xf9, 0x84, 0x91, 0x80, 0x88, 0x54, 0x91, 0xcb, + 0x80, 0x0f, 0x81, 0xf9, 0xe4, 0x1e, 0xe2, 0x63, + 0xc0, 0x23, 0x4e, 0xdb, 0x62, 0x97, 0x39, 0xe7, + 0x93, 0xab, 0x04, 0x3e, 0x27, 0x57, 0xeb, 0x96, + 0x03, 0x23, 0x52, 0x28, 0xdf, 0x14, 0xd8, 0x02, + 0x2c, 0x74, 0xa8, 0x32, 0xc0, 0x3e, 0xa7, 0x7d, + 0x41, 0x02, 0xaa, 0xba, 0x1f, 0x68, 0x73, 0x9e, + 0x41, 0xae, 0x70, 0x29, 0x07, 0x4c, 0x11, 0xd8, + 0x80, 0xe1, 0x49, 0x03, 0x9b, 0x54, 0xb5, 0xdd, + 0x39, 0xe9, 0xe5, 0x3a, 0xed, 0x7c, 0x99, 0xcb, + 0x89, 0x61, 0x04, 0xf2, 0x17, 0xc7, 0xb5, 0x06, + 0xbb, 0x4e, 0xe0, 0x45, 0xd3, 0x06, 0x5e, 0x08, + 0xb4, 0xfa, 0xf7, 0xcb, 0x33, 0xae, 0xa7, 0x90, + 0x88, 0xd4, 0x03, 0x1b, 0x5d, 0xec, 0xd6, 0xaa, + 0xea, 0xc8, 0x62, 0x02, 0x6f, 0x04, 0x7e, 0x09, + 0xe0, 0x98, 0x57, 0xd8, 0x3b, 0x18, 0xef, 0x00, + 0x53, 0x0c, 0x36, 0x5f, 0xa8, 0xea, 0x36, 0xb7, + 0x0d, 0xbc, 0x10, 0x68, 0x07, 0x7a, 0x8b, 0x5a, + 0x05, 0xc3, 0x02, 0x00, 0x11, 0x59, 0x00, 0x3c, + 0x6d, 0xd0, 0x0f, 0xe0, 0x92, 0x3a, 0x43, 0xb0, + 0xbc, 0xf4, 0x46, 0x45, 0x44, 0x81, 0xd9, 0x01, + 0x1c, 0x2c, 0x86, 0x5e, 0xe0, 0x61, 0xe0, 0x13, + 0x72, 0xff, 0xeb, 0x9d, 0xd8, 0xa8, 0xaa, 0xcf, + 0x15, 0xda, 0xc0, 0x6b, 0x4d, 0xdc, 0x59, 0xdc, + 0x24, 0x10, 0x6a, 0x81, 0xdd, 0x98, 0x9d, 0x4f, + 0x01, 0x6f, 0x14, 0xdb, 0xe0, 0xbf, 0x26, 0x50, + 0x08, 0x5b, 0x55, 0xf5, 0x4c, 0x31, 0x23, 0xaf, + 0x04, 0x4a, 0xbe, 0xb7, 0x07, 0xc0, 0xbb, 0x5e, + 0x8c, 0xbc, 0x12, 0xd8, 0x5f, 0x82, 0x23, 0x41, + 0xb0, 0x5b, 0x55, 0x0f, 0x79, 0x31, 0xf4, 0x4a, + 0x60, 0x27, 0x23, 0x8b, 0x98, 0x7f, 0x13, 0x5b, + 0xbd, 0x1a, 0x7a, 0x22, 0xa0, 0xaa, 0x57, 0x81, + 0xbd, 0x81, 0xdd, 0xf1, 0x87, 0x0c, 0xf0, 0xa5, + 0x57, 0x63, 0x3f, 0x9d, 0xb9, 0xaf, 0xfc, 0xfb, + 0x12, 0x08, 0xbb, 0x54, 0xf5, 0xbc, 0x57, 0x63, + 0x3f, 0x04, 0x3e, 0x06, 0x8c, 0x9f, 0xf3, 0x32, + 0xe2, 0x34, 0xb0, 0xc6, 0xcf, 0x02, 0xcf, 0x04, + 0xf2, 0x69, 0xf4, 0x81, 0x5f, 0x8f, 0x7c, 0xe0, + 0x2c, 0xb0, 0x50, 0x55, 0x4f, 0xf9, 0x59, 0xe4, + 0xb7, 0xb9, 0xfb, 0x1e, 0x65, 0xe8, 0x24, 0x18, + 0x70, 0x0e, 0x58, 0xa4, 0xaa, 0xc7, 0xfd, 0x2e, + 0xf4, 0x45, 0x40, 0x55, 0xbb, 0xc8, 0xf5, 0x4c, + 0xcb, 0x89, 0x33, 0xe4, 0x9e, 0x7c, 0x47, 0x90, + 0xc5, 0x41, 0xda, 0xeb, 0x1b, 0x80, 0x72, 0xfd, + 0xb8, 0x7c, 0x0a, 0x98, 0x6f, 0x2a, 0x54, 0xbc, + 0xc2, 0x37, 0x01, 0x55, 0x3d, 0x06, 0xec, 0x08, + 0x7a, 0xa0, 0x0d, 0x19, 0x60, 0xa5, 0xaa, 0x9a, + 0x1a, 0x04, 0x9e, 0x11, 0xe8, 0x67, 0x56, 0x72, + 0x75, 0x71, 0xa9, 0xf8, 0x4d, 0x55, 0x7f, 0x2c, + 0x75, 0x93, 0xa0, 0x04, 0x4a, 0x3e, 0x98, 0x91, + 0xb5, 0x76, 0x20, 0x04, 0x25, 0xd0, 0x55, 0x86, + 0xb3, 0x03, 0xe7, 0xbd, 0x1d, 0x41, 0x09, 0x94, + 0xdc, 0x51, 0xa3, 0x4c, 0x55, 0x5e, 0x20, 0x02, + 0xf9, 0xa6, 0x57, 0xa9, 0x97, 0x3b, 0xe7, 0x8f, + 0x85, 0x81, 0x10, 0x34, 0x02, 0x50, 0x7a, 0x63, + 0x36, 0x53, 0xe2, 0x7a, 0x00, 0xfe, 0x01, 0x3b, + 0x8a, 0x84, 0x37, 0xd0, 0x7c, 0x42, 0x34, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x68, 0x69, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, + 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0xaa, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -6931,324 +6439,52 @@ 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x48, - 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, - 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x2d, 0x6f, 0x6e, 0x2d, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, - 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, - 0x3e, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2d, - 0x75, 0x73, 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, - 0x61, 0x72, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, - 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x2d, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x2d, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4c, 0x6f, 0x67, 0x69, 0x6e, - 0x20, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 0x74, 0x69, - 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x48, 0x69, - 0x73, 0x74, 0x6f, 0x72, 0x79, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, - 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, - 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, - 0x6f, 0x75, 0x73, 0x2d, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x78, 0x74, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6e, 0x65, 0x78, 0x74, 0x2d, 0x69, - 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, - 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, - 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, - 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, - 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, - 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, - 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, - 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x64, 0x77, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3e, 0x33, 0x35, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x22, 0x3e, 0x33, 0x30, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x61, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2d, + 0x6f, 0x6e, 0x2d, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2d, 0x75, 0x73, + 0x65, 0x72, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, - 0x69, 0x63, 0x79, 0x22, 0x3e, 0x6e, 0x65, 0x76, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, - 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, - 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2d, 0x62, - 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2d, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -7260,215 +6496,232 @@ 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, + 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x6f, 0x64, 0x65, - 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x69, 0x6e, + 0x6b, 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, + 0x6f, 0x75, 0x73, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, + 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x2d, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, + 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, + 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, + 0x65, 0x78, 0x74, 0x2d, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0xbc, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, - 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, - 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, - 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, - 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, - 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, - 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, - 0x6d, 0x65, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, - 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, - 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, - 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, - 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x2d, 0x74, 0x79, 0x70, 0x65, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, - 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x67, - 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, - 0x79, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, - 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, - 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x67, 0x69, 0x6e, 0x74, 0x20, 0x2d, 0x2d, - 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, - 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, - 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, - 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, - 0x74, 0x3d, 0x22, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, 0x65, 0x22, - 0x3e, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, - 0x64, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, - 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x31, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x63, 0x6f, - 0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, - 0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, - 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x78, 0x74, 0x3d, 0x22, 0x41, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3e, 0x41, 0x64, 0x6d, 0x69, 0x6e, - 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, - 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, - 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, - 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, + 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, + 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, + 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x64, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x3e, 0x33, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, + 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, - 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, - 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x74, - 0x61, 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x2d, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, @@ -7477,511 +6730,1284 @@ 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, - 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x54, 0x65, 0x78, - 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x75, 0x73, 0x65, - 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x61, 0x73, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x62, 0x61, + 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, + 0x22, 0x3e, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x6e, + 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x2d, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, 0x74, - 0x65, 0x78, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x75, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x2d, - 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x6e, + 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x65, - 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, - 0x2d, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x2d, 0x75, 0x73, 0x65, 0x72, 0x6e, - 0x61, 0x6d, 0x65, 0x2d, 0x68, 0x69, 0x6e, 0x74, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, + 0x79, 0x29, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, + 0x6f, 0x6b, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, + 0x5d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, + 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x00, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x20, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x52, 0x65, 0x61, + 0x64, 0x79, 0x71, 0xc9, 0x65, 0x3c, 0x00, 0x00, + 0x0d, 0xff, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda, + 0xc4, 0x5a, 0x07, 0x98, 0x14, 0xe5, 0x19, 0xfe, + 0x66, 0x66, 0xeb, 0xdd, 0xde, 0xdd, 0xee, 0x95, + 0xbd, 0x02, 0x87, 0x48, 0x47, 0x90, 0x22, 0x0a, + 0x82, 0x15, 0x11, 0xd4, 0x88, 0x8a, 0x05, 0x43, + 0x14, 0xb9, 0x28, 0x46, 0xf4, 0xd1, 0x08, 0x76, + 0xb1, 0x44, 0x44, 0x43, 0x7c, 0x54, 0x90, 0xa8, + 0xd1, 0x20, 0x51, 0x01, 0x31, 0x82, 0x1a, 0x02, + 0x22, 0xe6, 0x09, 0x22, 0x4a, 0x91, 0x62, 0x38, + 0xaa, 0xf4, 0x7a, 0x85, 0xeb, 0x65, 0xef, 0xf6, + 0xb6, 0x4f, 0xc9, 0xf7, 0xcf, 0xbd, 0x7b, 0x2e, + 0x27, 0x20, 0x1e, 0x98, 0xac, 0xcf, 0xcb, 0x78, + 0x3b, 0x33, 0xff, 0x7c, 0xe5, 0xfd, 0xda, 0x3f, + 0x2b, 0x19, 0x86, 0x41, 0x6d, 0xf9, 0xcc, 0x9b, + 0x37, 0xcf, 0xc9, 0x87, 0xb3, 0x18, 0xd9, 0x0c, + 0x2f, 0x23, 0x93, 0x51, 0xcf, 0x38, 0x1a, 0xc7, + 0xb8, 0x71, 0xe3, 0x22, 0xf4, 0x0b, 0x7f, 0xa4, + 0x9f, 0xa3, 0x00, 0x0b, 0x2d, 0x04, 0x1e, 0xc9, + 0xb8, 0x96, 0x31, 0x94, 0xe1, 0xc0, 0xa9, 0x00, + 0xc3, 0x07, 0x88, 0x05, 0xbb, 0xe0, 0xdc, 0x77, + 0x8c, 0xbf, 0x31, 0x16, 0xb0, 0x32, 0xfe, 0xff, + 0x9b, 0x02, 0x2c, 0x78, 0x07, 0x3e, 0xfc, 0x05, + 0x82, 0x4b, 0xf8, 0xba, 0x88, 0x31, 0x93, 0x51, + 0xc6, 0xe8, 0xc9, 0xe8, 0xcf, 0x90, 0x19, 0x85, + 0x8c, 0xcf, 0x19, 0xd7, 0x30, 0x5c, 0x8c, 0x2b, + 0x19, 0x3d, 0x18, 0x1f, 0x33, 0xa6, 0xb0, 0x22, + 0xc5, 0xff, 0x33, 0x05, 0x58, 0x70, 0x85, 0x0f, + 0x0f, 0xc2, 0xda, 0xff, 0x62, 0xdc, 0xc1, 0x18, + 0xcc, 0xf8, 0x90, 0xb1, 0x8c, 0x31, 0x8d, 0xd1, + 0x91, 0xb1, 0x8f, 0xf1, 0x0d, 0x43, 0x5c, 0x9f, + 0xcc, 0x28, 0x65, 0xcc, 0x60, 0xbc, 0xce, 0x68, + 0xc2, 0xbd, 0xbd, 0x19, 0xbf, 0x62, 0x3c, 0xc0, + 0x4a, 0x6c, 0x38, 0x53, 0x0a, 0xc8, 0x27, 0x11, + 0x5e, 0x50, 0xe0, 0x6b, 0x46, 0x2a, 0xe3, 0x4d, + 0xc6, 0x08, 0x08, 0xff, 0x2e, 0x04, 0xfe, 0x3b, + 0x04, 0x1d, 0x0d, 0x9a, 0x08, 0x2f, 0x5d, 0x01, + 0x85, 0x3a, 0x33, 0xee, 0x66, 0xfc, 0x01, 0x6b, + 0xcc, 0x66, 0xe4, 0xe1, 0xfe, 0x8e, 0xbc, 0x76, + 0x97, 0x5f, 0x5c, 0x01, 0xfe, 0xcc, 0x82, 0x90, + 0x7d, 0x41, 0x83, 0x51, 0x8c, 0x2f, 0xc1, 0xf3, + 0x29, 0x8c, 0xe7, 0x19, 0xff, 0x66, 0x7c, 0x04, + 0x2f, 0xd5, 0x32, 0xde, 0x02, 0x7d, 0x84, 0x5b, + 0xef, 0x64, 0xec, 0x62, 0x4c, 0x60, 0xdc, 0x06, + 0x9a, 0x2d, 0x01, 0xc5, 0xd6, 0xb2, 0x12, 0x43, + 0x7e, 0x31, 0x0a, 0xf1, 0xe2, 0x8f, 0xf0, 0x21, + 0x9f, 0x31, 0x8c, 0xf1, 0x1e, 0x84, 0x15, 0x5c, + 0x7f, 0x1b, 0xbc, 0xff, 0x33, 0xe3, 0x1c, 0xc6, + 0x70, 0x04, 0xf0, 0x26, 0x64, 0xa2, 0x1c, 0x46, + 0x39, 0x63, 0x07, 0x63, 0x23, 0xe3, 0x5b, 0xd0, + 0x48, 0xc4, 0xc7, 0xed, 0x8c, 0x71, 0xa0, 0xd9, + 0x06, 0x28, 0xd8, 0x8f, 0xe9, 0xd4, 0x78, 0x46, + 0x3d, 0xc0, 0xc2, 0x0b, 0x1a, 0xfc, 0x96, 0x11, + 0x62, 0x04, 0xa1, 0x48, 0x0a, 0xe3, 0x1d, 0xc6, + 0x9f, 0x18, 0x8b, 0xf1, 0xdd, 0x70, 0xdc, 0x72, + 0x18, 0x01, 0xfa, 0x28, 0xa8, 0xf6, 0x11, 0xe2, + 0xe3, 0x36, 0x58, 0x5c, 0xd0, 0x67, 0x85, 0x58, + 0x1a, 0x54, 0xbb, 0x94, 0x71, 0x84, 0x61, 0x67, + 0x4c, 0x3e, 0xe3, 0x1e, 0x60, 0x05, 0xd6, 0x82, + 0xe7, 0x7f, 0x65, 0xdc, 0xc2, 0x78, 0x01, 0x94, + 0xd8, 0x82, 0x60, 0x7e, 0x17, 0xdf, 0x09, 0xab, + 0x3f, 0xcb, 0x18, 0x00, 0x7a, 0x0d, 0x68, 0x95, + 0xa1, 0x84, 0x70, 0x59, 0x08, 0xe6, 0xf1, 0x8c, + 0x27, 0xa1, 0xec, 0x57, 0xa0, 0xdc, 0x7b, 0x58, + 0x7f, 0x20, 0x7b, 0x21, 0x74, 0x46, 0x3c, 0xc0, + 0xc2, 0xf7, 0xe3, 0x83, 0xce, 0xb8, 0x09, 0xc5, + 0x68, 0x15, 0xb2, 0xc7, 0x62, 0x50, 0xe0, 0x23, + 0x08, 0xdd, 0x88, 0x20, 0x7d, 0x86, 0xf1, 0x22, + 0xa3, 0x13, 0xac, 0x2e, 0xa8, 0x37, 0x91, 0x51, + 0xc7, 0x98, 0xcf, 0xa8, 0x61, 0xbc, 0x04, 0x1a, + 0xbd, 0x82, 0xd4, 0x5a, 0x88, 0x80, 0xae, 0x05, + 0x0d, 0x6f, 0xe2, 0xe7, 0x9e, 0x7b, 0xa6, 0x28, + 0x74, 0x15, 0xe3, 0x7d, 0xd0, 0xe3, 0x9f, 0x8c, + 0x5e, 0xe0, 0xac, 0xe0, 0xb9, 0x8d, 0xe1, 0xc1, + 0xf1, 0x05, 0x58, 0xf0, 0x22, 0xdc, 0x77, 0x10, + 0xd6, 0x17, 0xb1, 0x32, 0x1d, 0xc1, 0x2e, 0xe8, + 0x33, 0x17, 0x81, 0x2e, 0x2c, 0xaf, 0x32, 0x36, + 0x33, 0x0a, 0x18, 0xeb, 0x50, 0xc5, 0x3f, 0x07, + 0x55, 0x27, 0x9f, 0x29, 0x05, 0xfc, 0xb0, 0x6e, + 0x8c, 0x71, 0x00, 0xc1, 0x27, 0x3e, 0x51, 0x1c, + 0xaf, 0x85, 0x37, 0xda, 0x31, 0xce, 0x83, 0xa5, + 0xfb, 0x23, 0x95, 0x3e, 0x87, 0xf4, 0x29, 0x02, + 0xf7, 0x71, 0xc6, 0x56, 0x46, 0x15, 0xe3, 0x31, + 0xc4, 0x81, 0xa8, 0x01, 0x2b, 0x19, 0xc2, 0xda, + 0xcb, 0xa1, 0xbc, 0xf0, 0xe0, 0x6a, 0x71, 0x3f, + 0x7b, 0xa1, 0xeb, 0x69, 0x29, 0xc0, 0x0b, 0x08, + 0xcb, 0xae, 0x85, 0xf5, 0xe3, 0x42, 0xe6, 0xe0, + 0xb4, 0x1d, 0x47, 0x11, 0xbc, 0x4f, 0x23, 0xc8, + 0x05, 0xd5, 0x6e, 0x46, 0xae, 0x3f, 0x8c, 0x98, + 0xd8, 0x8c, 0xb4, 0x59, 0xc1, 0xb8, 0x87, 0xf1, + 0x1a, 0x5a, 0x8f, 0x2d, 0xc8, 0x68, 0xbb, 0x51, + 0x2f, 0x8a, 0x10, 0x33, 0xa2, 0x9e, 0x58, 0xe1, + 0xc1, 0x91, 0xa7, 0xeb, 0x81, 0x1b, 0x19, 0x7d, + 0x40, 0xa3, 0x12, 0xd0, 0xc7, 0x82, 0x73, 0x3e, + 0x1c, 0x0f, 0x31, 0x2e, 0x64, 0xb8, 0x19, 0x9f, + 0x32, 0x2e, 0xc3, 0x7d, 0x5b, 0x51, 0x9d, 0xb3, + 0x91, 0x8d, 0x66, 0xc1, 0x00, 0xe5, 0xa0, 0x96, + 0x68, 0x25, 0xf6, 0x42, 0xd1, 0x2c, 0x54, 0x67, + 0x61, 0xb0, 0x5c, 0xc6, 0x54, 0x28, 0xde, 0xf7, + 0x74, 0x15, 0x88, 0xe7, 0xe8, 0xb3, 0xe0, 0xfa, + 0x9e, 0x09, 0x0a, 0x54, 0xe1, 0x28, 0xaa, 0xea, + 0x20, 0xfc, 0xff, 0xcb, 0xa0, 0x8e, 0x0f, 0x41, + 0xbf, 0x94, 0xf1, 0x19, 0x38, 0xbe, 0x3c, 0xa1, + 0xc9, 0xab, 0x86, 0x31, 0x56, 0x42, 0xe0, 0x38, + 0x4d, 0xe3, 0xcf, 0xbf, 0x0e, 0x75, 0xa3, 0xcf, + 0xe9, 0x2a, 0x70, 0x0e, 0xb2, 0x83, 0x84, 0x07, + 0x7b, 0x12, 0xce, 0x97, 0xe3, 0xb8, 0x0a, 0x96, + 0xad, 0x83, 0x10, 0xbd, 0xd0, 0xe7, 0x5c, 0x80, + 0xc0, 0xde, 0x09, 0x4a, 0xa8, 0xb8, 0xde, 0x89, + 0x6b, 0x3b, 0x20, 0xb8, 0x85, 0x77, 0xd6, 0xa0, + 0xae, 0xc4, 0x9f, 0xef, 0x01, 0xe5, 0xce, 0x61, + 0x1a, 0x5b, 0xda, 0xa4, 0x00, 0x6e, 0xcc, 0x87, + 0x6b, 0xc5, 0x47, 0xc3, 0x39, 0x39, 0x41, 0x90, + 0xb8, 0x22, 0xed, 0x50, 0x49, 0x87, 0xe1, 0xbb, + 0x25, 0x48, 0x8f, 0x01, 0x58, 0x98, 0x40, 0x0f, + 0xf1, 0x11, 0xf3, 0x40, 0x18, 0x05, 0xb1, 0x1f, + 0x02, 0x5e, 0xd4, 0x81, 0x0c, 0x9c, 0x77, 0xe1, + 0xda, 0x3c, 0x28, 0x6e, 0x6d, 0xab, 0x07, 0xf2, + 0x41, 0x9f, 0x43, 0x27, 0x50, 0x20, 0x2d, 0x21, + 0x1b, 0xb5, 0x43, 0xd0, 0x75, 0x87, 0x80, 0x22, + 0xf0, 0x6f, 0x45, 0xb5, 0xcd, 0x43, 0xd1, 0xcb, + 0xc4, 0xf5, 0x7b, 0x50, 0x23, 0x84, 0x61, 0xee, + 0x47, 0x5d, 0x48, 0x43, 0xdb, 0x41, 0x09, 0x8a, + 0x88, 0xeb, 0x8b, 0xda, 0x52, 0xd0, 0xe2, 0x02, + 0x76, 0xc4, 0xb1, 0x09, 0x9c, 0x56, 0x61, 0x99, + 0xf8, 0x10, 0xe2, 0x8e, 0x57, 0x6e, 0x3c, 0xac, + 0x0a, 0x0a, 0xac, 0x40, 0xca, 0x4c, 0x86, 0x22, + 0x43, 0x91, 0x61, 0xba, 0x23, 0x15, 0x47, 0x40, + 0x97, 0x1d, 0xc8, 0x32, 0xa2, 0xd5, 0x18, 0x98, + 0xb0, 0x5e, 0xdc, 0x30, 0xa2, 0x59, 0xdc, 0x8e, + 0x81, 0xe9, 0x67, 0x7d, 0xe2, 0x9c, 0x3b, 0x1b, + 0x47, 0xe1, 0x62, 0x31, 0x70, 0xa4, 0xc3, 0xbd, + 0x91, 0x56, 0x0f, 0x72, 0x43, 0x09, 0x1f, 0xae, + 0xd5, 0x51, 0x1b, 0x44, 0x9e, 0x1f, 0x0b, 0xaa, + 0xcd, 0x02, 0xbd, 0x84, 0xf5, 0x7f, 0x03, 0x6f, + 0xee, 0xc7, 0x39, 0xa1, 0xe4, 0x95, 0x31, 0x23, + 0xec, 0x2d, 0x8b, 0xee, 0x28, 0xdf, 0x1f, 0xfe, + 0xfa, 0x21, 0x9b, 0x94, 0x44, 0x41, 0xdd, 0xd7, + 0x3b, 0xac, 0x37, 0x66, 0x58, 0x25, 0xfb, 0xe7, + 0x1f, 0x4c, 0x2f, 0xf8, 0x12, 0x85, 0x70, 0xe5, + 0x97, 0x8f, 0x18, 0x91, 0x53, 0x55, 0x20, 0xce, + 0xbd, 0x21, 0xa8, 0x92, 0xb1, 0x04, 0x0e, 0x0b, + 0x21, 0x93, 0x5a, 0xc5, 0xc2, 0xf0, 0x84, 0x1a, + 0x31, 0x0f, 0x0f, 0xfc, 0x18, 0x71, 0xb0, 0x11, + 0x4d, 0x9f, 0xa8, 0x0f, 0xbf, 0x47, 0xa1, 0x12, + 0x06, 0xda, 0x16, 0x33, 0x42, 0xe7, 0x6e, 0xf0, + 0xcf, 0x71, 0x95, 0x44, 0x0b, 0x0b, 0x34, 0x23, + 0x26, 0xcb, 0x92, 0x92, 0x9b, 0xe2, 0xf0, 0x50, + 0x4a, 0xb2, 0x87, 0x64, 0xcd, 0x91, 0xdb, 0x18, + 0xac, 0xcd, 0x41, 0xeb, 0xf2, 0x90, 0x58, 0x6b, + 0xf8, 0x74, 0x49, 0xd4, 0x91, 0xa9, 0xac, 0x48, + 0xec, 0xa7, 0x14, 0xf0, 0x23, 0x13, 0x0c, 0x06, + 0x9f, 0x2f, 0x44, 0xaf, 0x22, 0x86, 0x99, 0x6d, + 0x50, 0xc0, 0x80, 0x80, 0xf1, 0x8a, 0x5c, 0x85, + 0x4a, 0x2a, 0x32, 0xd1, 0x42, 0x04, 0xf8, 0x04, + 0x08, 0x1f, 0x82, 0xe5, 0xbd, 0xc8, 0x4e, 0x63, + 0x8b, 0x23, 0x9b, 0xd6, 0x14, 0x06, 0x16, 0xbc, + 0x18, 0x93, 0x9b, 0x92, 0xbb, 0xe6, 0xf6, 0x23, + 0xb7, 0x2b, 0x83, 0x5c, 0xce, 0x66, 0xc7, 0x6a, + 0x7a, 0xb3, 0x7c, 0xba, 0xa1, 0x4b, 0x31, 0x35, + 0x42, 0xac, 0x08, 0xd5, 0xf8, 0x2b, 0x93, 0x2b, + 0xeb, 0x8b, 0x9f, 0x31, 0xc8, 0x18, 0xc9, 0x8a, + 0x8c, 0x65, 0x25, 0x76, 0x9e, 0x4c, 0x81, 0x46, + 0xa4, 0xc8, 0x5f, 0xc3, 0xdd, 0x77, 0xa3, 0x87, + 0xb9, 0x02, 0x16, 0xcc, 0xc2, 0xf4, 0x15, 0x4f, + 0x7f, 0x65, 0xa8, 0xc6, 0xaf, 0x21, 0x7f, 0x8b, + 0x6b, 0x1e, 0x46, 0xef, 0xd3, 0x0b, 0x71, 0x21, + 0x2a, 0xb1, 0xa1, 0x1a, 0xd1, 0x92, 0x3d, 0xa1, + 0xe5, 0x97, 0x6d, 0x09, 0x7c, 0x7a, 0x51, 0x4e, + 0x6a, 0x07, 0x4b, 0xcf, 0xfc, 0xcb, 0xc9, 0x6a, + 0xb5, 0x90, 0xdd, 0x92, 0xc4, 0x70, 0x91, 0x2c, + 0xc9, 0x64, 0x55, 0xec, 0x6c, 0x1d, 0x9d, 0x34, + 0x4d, 0x25, 0x95, 0x8d, 0x9d, 0x64, 0x77, 0x53, + 0x6a, 0x72, 0x26, 0x79, 0x5c, 0x99, 0x74, 0xb0, + 0x7c, 0x67, 0xdf, 0xa8, 0x1a, 0xde, 0xcc, 0x4a, + 0x3c, 0x25, 0x9e, 0xc7, 0x8a, 0xe8, 0x27, 0x52, + 0xe0, 0x00, 0xb2, 0x4c, 0x1f, 0x94, 0xf9, 0x37, + 0x30, 0x03, 0xcc, 0x40, 0xfe, 0x16, 0xe7, 0xbb, + 0xc1, 0x33, 0x62, 0x36, 0x9e, 0x83, 0xe0, 0x7f, + 0x0d, 0x34, 0x5a, 0x8c, 0x22, 0x38, 0x07, 0xb1, + 0x22, 0xc6, 0xc6, 0xb9, 0x1b, 0xfc, 0xef, 0xbd, + 0x53, 0x12, 0xdb, 0x44, 0xbd, 0xdb, 0x0f, 0x51, + 0xda, 0x67, 0x76, 0xa2, 0x64, 0x47, 0x1a, 0x0b, + 0xad, 0x50, 0x73, 0x1b, 0xcf, 0x62, 0x1b, 0x1a, + 0x45, 0xd4, 0xe0, 0x0f, 0xfd, 0x3d, 0xff, 0xe7, + 0x76, 0x66, 0x51, 0x7a, 0x52, 0x2e, 0xa5, 0x39, + 0xbd, 0x64, 0xb3, 0x3a, 0xa5, 0x92, 0xaa, 0xfd, + 0xd6, 0xba, 0xa6, 0xca, 0x57, 0xf9, 0x74, 0x7b, + 0xd0, 0xeb, 0xb8, 0x14, 0x4a, 0x45, 0xd1, 0xc9, + 0x43, 0x15, 0x8e, 0xa7, 0xd2, 0x5d, 0xc8, 0x1c, + 0xb3, 0x91, 0x65, 0x66, 0x80, 0x3a, 0x59, 0x08, + 0x52, 0x27, 0x1a, 0xb8, 0xf8, 0x80, 0xa2, 0xa1, + 0x4a, 0x57, 0xec, 0x0f, 0x7f, 0xa3, 0x1c, 0x89, + 0x6c, 0xf0, 0x5e, 0xd0, 0x79, 0x04, 0x5b, 0x34, + 0x4d, 0xc8, 0x46, 0xc1, 0xe8, 0xa9, 0xef, 0xae, + 0x48, 0x92, 0x44, 0xe9, 0x2e, 0xee, 0x4e, 0x24, + 0x5d, 0x92, 0x65, 0x99, 0x6a, 0x1a, 0xcb, 0x27, + 0xb2, 0x27, 0x3e, 0x61, 0x2f, 0xac, 0x6b, 0x9d, + 0x46, 0x1b, 0x90, 0x69, 0xea, 0x90, 0x12, 0xf7, + 0xc2, 0xda, 0xfb, 0x40, 0x09, 0x71, 0xdd, 0x7a, + 0x78, 0x67, 0x1b, 0x14, 0x11, 0x2d, 0xc0, 0xd5, + 0x68, 0xab, 0x8b, 0xd1, 0x42, 0x5c, 0x09, 0xe1, + 0x2b, 0x83, 0x7a, 0xfd, 0xf3, 0xdf, 0x07, 0x97, + 0xde, 0xde, 0x21, 0xa3, 0x27, 0xa5, 0xb9, 0x3c, + 0x74, 0xb8, 0x6e, 0x3b, 0x85, 0x62, 0x7e, 0x56, + 0xa0, 0xe1, 0x94, 0x61, 0x95, 0x6d, 0xd4, 0x2d, + 0x6b, 0x20, 0xb9, 0x93, 0xb2, 0x29, 0xcb, 0x93, + 0x4b, 0x56, 0x8b, 0x5d, 0xb8, 0x6d, 0x0e, 0x2b, + 0xe1, 0x68, 0xed, 0x81, 0xa2, 0x84, 0x2e, 0x31, + 0x84, 0xae, 0xb1, 0x2f, 0x86, 0x8f, 0x6e, 0xb0, + 0x6a, 0x00, 0xc1, 0x3a, 0x01, 0xa9, 0x72, 0x3c, + 0x3c, 0x30, 0x13, 0x3b, 0x72, 0xb3, 0x13, 0x52, + 0xe5, 0x13, 0xdb, 0x02, 0x8b, 0x96, 0xea, 0x4a, + 0x44, 0xea, 0x9c, 0xdb, 0x9b, 0x8a, 0x7d, 0xbb, + 0x29, 0xaa, 0x45, 0x28, 0x10, 0x3d, 0xf5, 0xf1, + 0xb7, 0x63, 0xfa, 0xb9, 0x34, 0x6e, 0xe0, 0x0b, + 0xe4, 0xb4, 0xa6, 0xd0, 0x77, 0x45, 0x5f, 0xd0, + 0xbb, 0x1b, 0x1e, 0xa3, 0x1c, 0x4f, 0x7b, 0xb9, + 0xa4, 0xfa, 0x60, 0x57, 0xcc, 0x1d, 0x4f, 0xb4, + 0x78, 0x80, 0x2b, 0xa0, 0x86, 0x4a, 0xbc, 0x0c, + 0xc2, 0xa6, 0xa3, 0x98, 0x7d, 0x8f, 0x14, 0x58, + 0x05, 0x85, 0x56, 0xa1, 0x99, 0x2b, 0xc7, 0xcc, + 0x3b, 0x16, 0xed, 0x83, 0x58, 0xb0, 0x92, 0x31, + 0x46, 0x8c, 0xa2, 0x3e, 0xb5, 0x74, 0xe9, 0x81, + 0xf0, 0x9a, 0xf4, 0x1e, 0x79, 0xe7, 0x53, 0x58, + 0xf3, 0x53, 0xa9, 0x6f, 0x2f, 0x35, 0x84, 0xaa, + 0x4f, 0xd9, 0xf2, 0xdd, 0xbd, 0x03, 0x69, 0xfc, + 0xe0, 0x97, 0x4d, 0xe1, 0xfd, 0xe1, 0x3a, 0x7a, + 0x6b, 0xd5, 0x24, 0xaa, 0xf0, 0x15, 0x93, 0xc3, + 0xe1, 0xa4, 0xd4, 0x24, 0xb7, 0xf0, 0xc2, 0xa3, + 0xec, 0x85, 0x4e, 0xad, 0x9b, 0xb9, 0xad, 0x10, + 0x22, 0x04, 0x61, 0x4b, 0x51, 0xcc, 0x8e, 0x42, + 0x29, 0xd1, 0x4d, 0xfe, 0x0e, 0x69, 0x72, 0x22, + 0xb6, 0x56, 0x06, 0x21, 0x73, 0x6d, 0xc5, 0x6c, + 0x20, 0x62, 0x60, 0xee, 0x8e, 0xe0, 0x67, 0x85, + 0x49, 0x36, 0x17, 0xb9, 0x53, 0x32, 0xe9, 0x70, + 0xed, 0x76, 0x0e, 0x58, 0x9d, 0x54, 0x3d, 0x4a, + 0x15, 0x8d, 0x87, 0xd8, 0x0b, 0xbe, 0x93, 0x0a, + 0x7f, 0x49, 0xa7, 0xd1, 0x54, 0x30, 0x68, 0x1a, + 0x59, 0x98, 0x3e, 0xe2, 0x9e, 0xe7, 0xbf, 0x18, + 0x4d, 0x65, 0x0d, 0x87, 0x38, 0x3b, 0x45, 0xa8, + 0x29, 0x5a, 0x4f, 0x29, 0xae, 0x34, 0x09, 0x72, + 0x8f, 0x6a, 0xad, 0xc0, 0x26, 0xcc, 0xad, 0xeb, + 0x50, 0xd8, 0x44, 0x0a, 0xed, 0x0a, 0x4a, 0x08, + 0xaa, 0x3d, 0x80, 0x40, 0x57, 0x80, 0x4a, 0x28, + 0xf2, 0x1f, 0xc6, 0x24, 0x8c, 0x87, 0x82, 0x86, + 0x23, 0x6a, 0xd4, 0x43, 0xbd, 0x5c, 0x5c, 0xa0, + 0x0c, 0xd6, 0xdb, 0x1f, 0xa9, 0x6b, 0x79, 0x40, + 0x58, 0x0d, 0x50, 0x6d, 0xa0, 0x8c, 0x1a, 0xc3, + 0xb5, 0x26, 0x9d, 0x04, 0x82, 0x6a, 0x33, 0x42, + 0x5a, 0x13, 0x8d, 0x3e, 0xef, 0x49, 0xba, 0xa5, + 0xff, 0x13, 0x66, 0x26, 0x12, 0x9f, 0x19, 0x5f, + 0x4d, 0xa0, 0x1d, 0x65, 0xab, 0x49, 0x91, 0x25, + 0xb2, 0x28, 0x12, 0x45, 0xd5, 0x10, 0xc7, 0x81, + 0x85, 0xb3, 0x98, 0xa4, 0x23, 0x06, 0x8f, 0x51, + 0xa0, 0x10, 0x69, 0x71, 0x2a, 0xd2, 0xa7, 0x18, + 0x42, 0x6e, 0x80, 0x27, 0xb2, 0x20, 0xdc, 0x63, + 0x80, 0xa0, 0xd0, 0xab, 0x08, 0x6c, 0xb1, 0xdb, + 0xb0, 0x08, 0xbd, 0x93, 0xa8, 0xd0, 0x37, 0x84, + 0x74, 0x5f, 0x9e, 0x2b, 0x29, 0x95, 0x82, 0xb1, + 0x46, 0x33, 0x4d, 0xb6, 0xf4, 0xeb, 0x39, 0x17, + 0x93, 0xd3, 0xee, 0xe2, 0x32, 0x1f, 0xe4, 0x12, + 0xdf, 0x40, 0x31, 0xd9, 0x4f, 0x31, 0xc9, 0x4f, + 0x9a, 0x12, 0xa4, 0x07, 0x2e, 0x7d, 0x9b, 0x46, + 0x74, 0x1f, 0xdf, 0x72, 0xed, 0x82, 0xcd, 0x2f, + 0xd1, 0xca, 0xfd, 0xf3, 0x89, 0xcb, 0x04, 0xd9, + 0x6c, 0xcd, 0x62, 0xc6, 0xb4, 0x28, 0x69, 0xec, + 0x4d, 0xab, 0xd5, 0xfc, 0xa2, 0x5f, 0x6b, 0x05, + 0x76, 0x43, 0xb8, 0x1e, 0xa0, 0x4c, 0xbc, 0xa8, + 0x5d, 0x0f, 0xaa, 0xcc, 0x42, 0xbb, 0x90, 0x0d, + 0x65, 0x66, 0xa3, 0x70, 0x2d, 0x82, 0x37, 0x44, + 0x15, 0xbf, 0x97, 0xdb, 0x85, 0x07, 0x35, 0x51, + 0x8c, 0x6c, 0xa9, 0xd4, 0x14, 0x69, 0x68, 0x59, + 0x3c, 0x2d, 0x29, 0x8b, 0xa6, 0x5d, 0xb7, 0x82, + 0x9e, 0xbd, 0x6a, 0x31, 0xd9, 0x9d, 0x0e, 0xb2, + 0xda, 0x65, 0xb2, 0xd8, 0x25, 0x13, 0x13, 0x06, + 0xbf, 0x49, 0x17, 0x76, 0x18, 0xd5, 0x72, 0xed, + 0xda, 0xc3, 0x8b, 0x68, 0xfe, 0xa6, 0xe7, 0x48, + 0xb1, 0x48, 0x94, 0xec, 0xb2, 0x90, 0x62, 0x95, + 0x4c, 0x45, 0x04, 0xa5, 0x74, 0x43, 0xe5, 0xef, + 0xcd, 0xdc, 0xe3, 0xe6, 0x38, 0xb0, 0xb7, 0x28, + 0xc0, 0x81, 0xac, 0xa3, 0xad, 0x5e, 0x87, 0xf4, + 0x29, 0xa3, 0x0d, 0xd8, 0x87, 0xb6, 0x57, 0x28, + 0xf5, 0x47, 0x14, 0x35, 0x51, 0x15, 0x2f, 0xc1, + 0xde, 0xd1, 0x7a, 0xf4, 0x50, 0xe2, 0xfb, 0xf1, + 0xb5, 0xb1, 0xc3, 0x62, 0xc3, 0x97, 0x1c, 0xd6, + 0x24, 0x0a, 0x21, 0xeb, 0x08, 0x41, 0xda, 0x79, + 0xba, 0x99, 0xd4, 0xe8, 0xe9, 0x1d, 0x42, 0xf7, + 0x5c, 0xf0, 0x06, 0x0b, 0x2e, 0x9b, 0x4a, 0x8c, + 0xe9, 0xf7, 0x1c, 0x0d, 0x3d, 0xbb, 0xa0, 0x45, + 0xf8, 0x83, 0xb5, 0x5b, 0x68, 0xe6, 0xda, 0xf1, + 0x24, 0x33, 0x89, 0x53, 0xdc, 0x56, 0xb2, 0x39, + 0x9a, 0xaf, 0xb3, 0xb0, 0xd1, 0xc5, 0x3a, 0x31, + 0x2d, 0xc6, 0x94, 0x52, 0xe2, 0x97, 0x67, 0xb6, + 0x9e, 0x80, 0xde, 0x47, 0x20, 0xde, 0x02, 0x3a, + 0x29, 0xad, 0xce, 0x1b, 0x09, 0x13, 0xdb, 0x1a, + 0x6c, 0x50, 0x89, 0x56, 0xf9, 0x0b, 0xa4, 0xd2, + 0x8b, 0x92, 0x95, 0x4c, 0x31, 0xdc, 0x70, 0xce, + 0x0f, 0x90, 0xc5, 0x62, 0x33, 0xad, 0x27, 0xb0, + 0xb7, 0x76, 0x23, 0x1d, 0xaa, 0xdd, 0x4a, 0x9d, + 0x32, 0xfa, 0xd1, 0xd0, 0xce, 0x77, 0x50, 0x79, + 0x70, 0x0f, 0x53, 0x27, 0x44, 0xd7, 0x77, 0x7d, + 0xbc, 0x65, 0x71, 0x51, 0x27, 0xa6, 0x7f, 0x3b, + 0x8e, 0x34, 0x29, 0x6c, 0x0a, 0x6f, 0xb1, 0xca, + 0xa4, 0xab, 0x5c, 0xad, 0x35, 0x83, 0x3d, 0xc0, + 0x11, 0x25, 0xeb, 0x66, 0x3c, 0xa8, 0x4d, 0x2d, + 0xbd, 0x5d, 0xfd, 0xf1, 0x76, 0xe6, 0xae, 0x46, + 0xea, 0x94, 0xd1, 0xe0, 0xd5, 0x20, 0x2b, 0x4d, + 0x46, 0x07, 0xba, 0x03, 0x9e, 0xa8, 0xc6, 0x6c, + 0xd0, 0x1b, 0x9b, 0x00, 0x29, 0x98, 0xab, 0xfb, + 0x7e, 0x58, 0x7d, 0x17, 0xe5, 0x7b, 0xbb, 0x91, + 0xc7, 0x9d, 0x46, 0x47, 0x1a, 0xb7, 0xb1, 0x20, + 0xfc, 0x50, 0x16, 0xa2, 0xb3, 0x7b, 0x10, 0xbd, + 0x74, 0xcd, 0xd7, 0xcd, 0x96, 0x40, 0x4b, 0x23, + 0x49, 0x3f, 0xb0, 0xf8, 0xf5, 0x8d, 0x77, 0xd1, + 0x9a, 0x23, 0x0b, 0x29, 0xc9, 0xa5, 0x98, 0x96, + 0x17, 0x82, 0x0b, 0x05, 0x34, 0xc0, 0xd0, 0x24, + 0x0e, 0xb4, 0x24, 0xaa, 0xae, 0xac, 0xa7, 0x68, + 0x24, 0xd6, 0xc4, 0x15, 0x39, 0xe5, 0x78, 0x33, + 0xa8, 0x17, 0x15, 0xb6, 0x08, 0x8a, 0x04, 0xd1, + 0xe7, 0x74, 0x46, 0x11, 0xbb, 0x11, 0xc5, 0x2b, + 0xe7, 0x38, 0xf7, 0x8a, 0x4c, 0x76, 0xaf, 0x22, + 0xd9, 0x9e, 0x0a, 0x84, 0x1a, 0x3b, 0xe4, 0x7a, + 0xb3, 0xd9, 0x0b, 0x32, 0xc9, 0xfc, 0x14, 0xa7, + 0x53, 0xa6, 0xfd, 0xbe, 0x8d, 0xb4, 0xfa, 0xc8, + 0x02, 0xba, 0xb4, 0xe3, 0x98, 0x63, 0x04, 0x37, + 0x87, 0xed, 0xe2, 0x0f, 0x69, 0x7d, 0xd9, 0xc7, + 0xe4, 0x48, 0x56, 0xc8, 0xe5, 0xb1, 0x36, 0x0b, + 0xaf, 0x09, 0xab, 0xb3, 0xf5, 0x25, 0x01, 0x9d, + 0x0c, 0x5e, 0x48, 0x12, 0xdf, 0xc5, 0x34, 0x1d, + 0xdd, 0x02, 0xfd, 0x48, 0x01, 0x8e, 0x05, 0x76, + 0xc2, 0xbc, 0x1c, 0x54, 0xe0, 0x6c, 0xa4, 0xce, + 0x61, 0xb0, 0x70, 0x03, 0xda, 0x86, 0xb5, 0xa0, + 0x4c, 0x7c, 0xf6, 0x0d, 0xa1, 0x11, 0x3c, 0x5f, + 0xc4, 0x4d, 0x77, 0xe7, 0xb0, 0xac, 0x83, 0xe1, + 0x6f, 0x48, 0xd7, 0x75, 0x72, 0xd8, 0x93, 0x58, + 0x88, 0x10, 0xf3, 0x57, 0xa6, 0x14, 0x4e, 0xe1, + 0xf3, 0xb7, 0x3f, 0x4d, 0x03, 0xdb, 0x8f, 0x24, + 0x87, 0xc5, 0xd5, 0xf2, 0xcc, 0xf2, 0xc0, 0x01, + 0x9a, 0xbb, 0xf3, 0x11, 0x93, 0xe7, 0x19, 0xb9, + 0x76, 0x93, 0xa8, 0xc2, 0xe2, 0xc2, 0xfa, 0x42, + 0x70, 0xcd, 0xe4, 0xae, 0x6c, 0x2a, 0x1d, 0x0e, + 0xab, 0xdc, 0x7e, 0xeb, 0x32, 0x76, 0x41, 0xe8, + 0x44, 0xbb, 0x00, 0xbb, 0xd0, 0x51, 0xee, 0x02, + 0x85, 0xe2, 0xc3, 0x8d, 0x05, 0xbb, 0x08, 0xb9, + 0xd8, 0x89, 0xe8, 0x86, 0xc0, 0x4f, 0x4d, 0x5c, + 0x2b, 0xdf, 0x76, 0x9e, 0xb1, 0x33, 0xb8, 0x4c, + 0xf2, 0x37, 0x05, 0x28, 0x3d, 0x2d, 0x87, 0x6a, + 0x63, 0x47, 0x48, 0xe6, 0x3c, 0x2e, 0x04, 0x0c, + 0x34, 0x55, 0xd3, 0xc2, 0x5d, 0x53, 0xa9, 0xa0, + 0xcf, 0xcb, 0xe6, 0xb5, 0x22, 0xb3, 0xbc, 0x59, + 0x78, 0x27, 0x45, 0xb4, 0x20, 0xa5, 0x7b, 0x6d, + 0x26, 0xef, 0x4d, 0x6a, 0x31, 0xdf, 0x99, 0x31, + 0xa6, 0xe0, 0x06, 0x1b, 0x42, 0xd1, 0x45, 0x0a, + 0x50, 0x28, 0xd0, 0xd0, 0xd2, 0x8e, 0x2c, 0x39, + 0xe9, 0x2b, 0x26, 0xf6, 0xc2, 0x2b, 0x08, 0xe6, + 0x3c, 0x58, 0x5a, 0x47, 0xd7, 0x5a, 0xd2, 0x0a, + 0xc5, 0x18, 0x1f, 0x8b, 0x11, 0x37, 0xa2, 0x2b, + 0xad, 0x58, 0x58, 0x73, 0xdf, 0x52, 0x8b, 0xd5, + 0x32, 0xac, 0x47, 0x97, 0x9e, 0x14, 0xb0, 0x96, + 0x51, 0x44, 0x6a, 0x34, 0x85, 0xe3, 0x4e, 0x9a, + 0x7c, 0x35, 0x31, 0x1a, 0xd9, 0x75, 0x22, 0xdd, + 0xdc, 0xfd, 0x29, 0x7a, 0x67, 0xeb, 0xfd, 0xb4, + 0xb1, 0xe2, 0x1f, 0x94, 0xcc, 0x6c, 0x4e, 0xf1, + 0x1c, 0xbb, 0x29, 0xa1, 0x46, 0xb9, 0x82, 0xc7, + 0x58, 0x91, 0x28, 0xcb, 0xa8, 0x2a, 0xd4, 0x58, + 0x17, 0xa3, 0xaa, 0x22, 0x33, 0x35, 0x2f, 0x64, + 0xfe, 0x8f, 0xf9, 0x29, 0x05, 0xf2, 0x31, 0x99, + 0xf5, 0x40, 0x1a, 0x0d, 0x81, 0x52, 0x06, 0xe8, + 0x12, 0x85, 0x37, 0x2e, 0x49, 0xd8, 0x14, 0x28, + 0x85, 0xd7, 0xf6, 0xf9, 0xb5, 0xca, 0x9c, 0x65, + 0xf5, 0x7f, 0x18, 0x95, 0xe1, 0xf6, 0x5a, 0xf2, + 0x3b, 0x67, 0x51, 0x9d, 0xce, 0x5e, 0xb0, 0xb0, + 0x25, 0xd9, 0x0b, 0x91, 0x88, 0xce, 0x96, 0x54, + 0x61, 0x69, 0x32, 0x83, 0x3c, 0x23, 0xc7, 0xc1, + 0x14, 0x39, 0x56, 0x06, 0x4d, 0x65, 0x05, 0x58, + 0x78, 0x3d, 0xc6, 0x49, 0x20, 0xcc, 0x16, 0xda, + 0x59, 0xa7, 0xab, 0xaa, 0x2e, 0x4a, 0x7b, 0x4f, + 0x56, 0xa0, 0xe6, 0xa4, 0xaf, 0x98, 0x38, 0x16, + 0x4a, 0xb0, 0xa7, 0x33, 0x05, 0x2d, 0xc3, 0x75, + 0xa0, 0x8a, 0x9a, 0xb0, 0x5b, 0x2d, 0x9a, 0xbc, + 0x8b, 0x11, 0xec, 0x62, 0xc8, 0xf9, 0x00, 0x3b, + 0x1b, 0x97, 0xa7, 0x28, 0xd9, 0x23, 0xce, 0x77, + 0xdd, 0xd6, 0x50, 0xe5, 0x3b, 0x4a, 0xbe, 0xea, + 0x00, 0x79, 0xec, 0xb9, 0xa4, 0x48, 0xcd, 0x16, + 0x4e, 0x4e, 0x51, 0x28, 0x2d, 0xd3, 0x6a, 0x0a, + 0x2c, 0x72, 0xbb, 0xc7, 0x6b, 0xff, 0x91, 0xf0, + 0x3f, 0x0c, 0x38, 0xb2, 0xf9, 0x6f, 0x4d, 0x89, + 0x9f, 0x58, 0x78, 0xf1, 0xc7, 0x7d, 0x71, 0xe1, + 0x4f, 0xe9, 0x35, 0x2b, 0x7b, 0xe2, 0x12, 0x58, + 0xfd, 0x62, 0x28, 0xd1, 0x0e, 0xad, 0x05, 0x21, + 0x3e, 0x12, 0xd1, 0x80, 0xe9, 0x2e, 0xbe, 0x7d, + 0xe8, 0xff, 0xac, 0x6e, 0xf2, 0xa3, 0x41, 0xaa, + 0xed, 0xd5, 0x2e, 0x37, 0x8f, 0xb2, 0xf2, 0x5d, + 0x14, 0xb1, 0xf8, 0xcc, 0xfc, 0x6f, 0x56, 0xd7, + 0x13, 0x49, 0x6d, 0xa6, 0x59, 0x4e, 0x9b, 0x2a, + 0x7b, 0x2b, 0xa8, 0x51, 0xf9, 0x7e, 0x3f, 0xf9, + 0xeb, 0xcc, 0x0d, 0x0a, 0x31, 0xcc, 0xdc, 0xda, + 0x96, 0xf7, 0xc4, 0xe3, 0xf0, 0x5e, 0xac, 0x0a, + 0x5c, 0x2f, 0x41, 0x41, 0x93, 0xe0, 0x95, 0x1c, + 0x28, 0x95, 0x99, 0xb0, 0xe7, 0xd3, 0x1c, 0xf9, + 0x7a, 0x53, 0xc9, 0xea, 0x86, 0xb7, 0xb4, 0x4a, + 0x75, 0x57, 0xc7, 0x54, 0x57, 0xba, 0xd1, 0xa1, + 0x4b, 0xa6, 0x64, 0x75, 0xab, 0xa4, 0x2b, 0xec, + 0x5c, 0x45, 0x33, 0x67, 0xe1, 0x1f, 0x5b, 0x9c, + 0x03, 0x8e, 0xfd, 0xec, 0xab, 0x0e, 0x53, 0xd9, + 0x9e, 0x46, 0x9d, 0xe3, 0x40, 0xe6, 0xbf, 0xe7, + 0xd5, 0xee, 0xa5, 0x87, 0xb7, 0xbd, 0x4f, 0x75, + 0x46, 0x82, 0xd0, 0xa7, 0xfc, 0xa6, 0x9e, 0x95, + 0x18, 0x80, 0xe9, 0xab, 0x0f, 0x3c, 0x52, 0x8f, + 0x77, 0x5d, 0x93, 0x20, 0xf8, 0xcd, 0xd8, 0xb1, + 0xab, 0x05, 0xcd, 0x34, 0x55, 0x55, 0x6b, 0x83, + 0xc1, 0x60, 0xa7, 0x70, 0x38, 0x9c, 0xb2, 0xa2, + 0x7a, 0xa6, 0xa1, 0x66, 0x1d, 0x9d, 0x64, 0xb3, + 0xd8, 0x52, 0xbc, 0x79, 0x19, 0xe4, 0xf6, 0x3a, + 0xc9, 0xe9, 0x66, 0x61, 0x39, 0xdb, 0x18, 0x92, + 0x6a, 0x16, 0x36, 0xb1, 0xa8, 0xce, 0x29, 0xde, + 0x5f, 0x1f, 0xa1, 0xba, 0xb2, 0x00, 0xf9, 0x2a, + 0xc3, 0x9c, 0x81, 0xc8, 0x57, 0x7f, 0x90, 0x9e, + 0xd9, 0x3c, 0xcb, 0xec, 0x76, 0x85, 0x57, 0x1b, + 0x59, 0x66, 0xad, 0xad, 0x3f, 0x35, 0xb0, 0xa2, + 0xd0, 0x0d, 0xc0, 0x0b, 0x0e, 0x0d, 0xc2, 0x1e, + 0x41, 0x40, 0x5f, 0x83, 0x2d, 0x77, 0x51, 0x33, + 0xc2, 0xbc, 0xf6, 0xf2, 0xd2, 0xd2, 0xd2, 0xa5, + 0x53, 0xa6, 0x4c, 0xd9, 0xc0, 0xca, 0x38, 0xb2, + 0xfb, 0x52, 0x76, 0xf7, 0x9b, 0xe8, 0x69, 0x5b, + 0x32, 0x0d, 0x16, 0x49, 0xd1, 0x6a, 0xb3, 0xe8, + 0xf6, 0x24, 0xab, 0x6c, 0xb5, 0x2b, 0xa6, 0x02, + 0x91, 0x48, 0x8c, 0x22, 0x81, 0x98, 0xc1, 0x35, + 0xc0, 0xe4, 0x56, 0xb4, 0x89, 0xd6, 0xec, 0xfe, + 0x84, 0xa6, 0x55, 0xef, 0x34, 0xe9, 0x19, 0xc2, + 0xc8, 0x5b, 0xc3, 0xeb, 0xc6, 0xda, 0xa4, 0xc0, + 0x71, 0x7e, 0x37, 0x71, 0x23, 0x3a, 0x53, 0x0f, + 0x7e, 0x1b, 0xb1, 0x04, 0x5b, 0xec, 0x62, 0x53, + 0x60, 0x6f, 0x41, 0x41, 0x41, 0x08, 0xe7, 0xd2, + 0x30, 0x6e, 0x9a, 0xb3, 0x44, 0xc7, 0xa1, 0x74, + 0x56, 0x76, 0x7f, 0x1a, 0xc6, 0x23, 0xc3, 0x60, + 0xc5, 0x4a, 0xd9, 0xdc, 0x9b, 0x99, 0x7b, 0xa9, + 0xba, 0x46, 0x35, 0xdc, 0xab, 0x55, 0x84, 0xeb, + 0x69, 0x7d, 0x45, 0x21, 0x7d, 0x55, 0xb4, 0xca, + 0xec, 0x06, 0x74, 0x18, 0x2a, 0x14, 0xff, 0x3d, + 0x46, 0x9b, 0x3d, 0xf0, 0xb3, 0x5f, 0x81, 0x36, + 0x47, 0xa9, 0x1d, 0xca, 0xd9, 0x31, 0x28, 0x29, + 0x09, 0x1b, 0xc7, 0x4a, 0xab, 0x4d, 0xe4, 0xb8, + 0xb0, 0x89, 0x47, 0x3d, 0x61, 0x9f, 0x55, 0x64, + 0xc5, 0x48, 0x9b, 0x62, 0xe0, 0x34, 0x94, 0x48, + 0x14, 0x36, 0x2e, 0xb0, 0x74, 0x9c, 0x63, 0x5c, + 0x01, 0x03, 0xd0, 0x13, 0xfe, 0xd6, 0xe2, 0x0a, + 0x19, 0xc6, 0xb1, 0x1b, 0x5b, 0xff, 0x15, 0x60, + 0x00, 0xc5, 0x21, 0xe2, 0xc4, 0xad, 0xbe, 0xab, + 0x3c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, + 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, + 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x2f, 0x05, 0x00, 0x00, 0x00, + 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x6d, 0x69, 0x64, + 0x64, 0x6c, 0x65, 0x2d, 0x66, 0x69, 0x6e, 0x67, + 0x65, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, + 0xcb, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x48, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xc5, 0x99, 0x5b, + 0x6c, 0x54, 0x45, 0x18, 0xc7, 0x7f, 0x67, 0x2f, + 0xdd, 0x76, 0xa1, 0x05, 0x2c, 0x94, 0x16, 0x30, + 0x04, 0x48, 0x29, 0x97, 0x07, 0x3e, 0xb9, 0xc4, + 0x90, 0x80, 0x0a, 0xc4, 0x18, 0x11, 0x4d, 0xaa, + 0x89, 0xc4, 0x00, 0x1a, 0x89, 0x31, 0x1a, 0x1e, + 0x4d, 0x7c, 0x55, 0x13, 0x13, 0x42, 0x34, 0x06, + 0x24, 0x26, 0x12, 0xc5, 0x07, 0x2f, 0x11, 0x4d, + 0x14, 0xef, 0x89, 0x0f, 0x98, 0x34, 0x05, 0x15, + 0xa4, 0x75, 0x48, 0xb8, 0xc8, 0x2d, 0x54, 0x29, + 0xa5, 0x5c, 0x0a, 0x94, 0xd2, 0x76, 0x4f, 0x77, + 0xbb, 0xeb, 0xc3, 0x6e, 0x9b, 0xc3, 0xec, 0x9c, + 0xed, 0xb9, 0x2c, 0xf0, 0x7f, 0xd9, 0x99, 0xf9, + 0xfe, 0xf3, 0xcd, 0xf7, 0x9f, 0x99, 0x73, 0x76, + 0xe6, 0x3b, 0x56, 0x2e, 0x97, 0xa3, 0x5c, 0x58, + 0xbc, 0xd7, 0x9a, 0x4c, 0x65, 0x7c, 0x67, 0x2c, + 0x9e, 0x68, 0x8c, 0x58, 0xd1, 0xaa, 0x6c, 0x26, + 0xdd, 0x3d, 0x9c, 0x1e, 0x7a, 0xbf, 0x6d, 0x5d, + 0xfa, 0xfb, 0xb2, 0x0d, 0xa2, 0xc1, 0x2a, 0x97, + 0x80, 0x07, 0x7e, 0x8c, 0x2e, 0xb1, 0x12, 0x15, + 0x5f, 0xd7, 0xcf, 0x5a, 0x34, 0xbb, 0xf2, 0xc4, + 0x24, 0x62, 0xe9, 0x38, 0xd5, 0xcb, 0x2a, 0xe9, + 0xe8, 0x6a, 0xbb, 0xda, 0x7b, 0xbd, 0xeb, 0xd3, + 0xc3, 0x8f, 0x0f, 0xbe, 0x56, 0x96, 0x81, 0x34, + 0x94, 0x45, 0xc0, 0xe2, 0xbd, 0x56, 0x24, 0x9b, + 0x8c, 0xb7, 0x35, 0xcc, 0x5b, 0x2a, 0xf1, 0x1f, + 0x6a, 0xf8, 0x6f, 0x77, 0x37, 0x00, 0x4d, 0xeb, + 0xe7, 0x30, 0xed, 0xc5, 0x5a, 0x8e, 0x9e, 0x6f, + 0xe9, 0xe9, 0xe9, 0x3e, 0xfb, 0x4c, 0xfb, 0x93, + 0x99, 0x96, 0xd0, 0x83, 0x69, 0x88, 0x04, 0xe9, + 0x24, 0x22, 0x13, 0x45, 0x64, 0xa1, 0x88, 0x58, + 0x00, 0xb9, 0x78, 0xf4, 0xd5, 0x8a, 0x86, 0xa9, + 0xf3, 0x27, 0xc7, 0xea, 0xe8, 0x6d, 0xe9, 0x1f, + 0xe5, 0x5d, 0x6a, 0xbd, 0xca, 0xb4, 0xf8, 0x0c, + 0x1a, 0xa7, 0x3f, 0x58, 0x1b, 0x4f, 0x24, 0xb7, + 0x3a, 0xfa, 0xaf, 0x16, 0x91, 0xaf, 0x44, 0xe4, + 0xf5, 0xbb, 0x2e, 0x40, 0x44, 0x9a, 0x80, 0x6e, + 0xe0, 0x28, 0xf0, 0x0e, 0x40, 0x2e, 0x6a, 0x3d, + 0x5a, 0x5d, 0x53, 0x97, 0xa8, 0x89, 0x4e, 0xc4, + 0xbe, 0x3a, 0x34, 0xca, 0x4d, 0xf7, 0x67, 0xa8, + 0x8b, 0xd6, 0x33, 0x29, 0x56, 0x4b, 0xa2, 0x6a, + 0x7c, 0xdd, 0xe2, 0xbd, 0x56, 0x4c, 0x44, 0xa6, + 0x03, 0x3f, 0x01, 0xcf, 0x02, 0xdb, 0x44, 0x64, + 0xf9, 0x5d, 0x15, 0x00, 0xac, 0x07, 0x12, 0x85, + 0xf2, 0x26, 0x80, 0x5c, 0x2c, 0x52, 0x5b, 0x11, + 0xa9, 0x24, 0x91, 0x49, 0x90, 0xea, 0xb5, 0x47, + 0x89, 0xf6, 0x80, 0x4d, 0x4d, 0x64, 0x02, 0xc9, + 0x48, 0x92, 0x64, 0x72, 0x52, 0x0d, 0x30, 0x0b, + 0x58, 0x07, 0x54, 0x39, 0xfc, 0x35, 0x04, 0x0b, + 0x3d, 0x8f, 0x20, 0x02, 0x62, 0x8e, 0x72, 0x9d, + 0x88, 0xcc, 0xb1, 0x86, 0xb3, 0xfd, 0x16, 0x16, + 0x43, 0x3d, 0x69, 0x70, 0x3c, 0x52, 0x99, 0x74, + 0x86, 0x6c, 0x26, 0x87, 0x45, 0x84, 0x74, 0x6a, + 0x60, 0x10, 0xb8, 0x08, 0x3c, 0xa1, 0xf9, 0x1b, + 0x22, 0x04, 0x82, 0x08, 0xd0, 0xfb, 0x2c, 0xb7, + 0xb2, 0xb9, 0xa3, 0xa9, 0xd4, 0x4d, 0x06, 0xfb, + 0x53, 0x45, 0xe4, 0xeb, 0x7d, 0xd7, 0xb0, 0x73, + 0x29, 0x6c, 0xbb, 0xef, 0x46, 0xf6, 0xad, 0x45, + 0x36, 0xb0, 0x46, 0xa3, 0xdc, 0x73, 0x01, 0x4b, + 0x2d, 0x7b, 0x78, 0x6b, 0x5f, 0x67, 0xc7, 0xd9, + 0x5b, 0xa9, 0xbe, 0x22, 0xf2, 0xa5, 0x5b, 0xdd, + 0x74, 0x5c, 0x3b, 0x96, 0xb2, 0x53, 0xfd, 0x7b, + 0x80, 0x79, 0x40, 0x52, 0xa3, 0x0c, 0x04, 0x88, + 0xc1, 0x35, 0x18, 0x2f, 0x18, 0xd6, 0xea, 0x4d, + 0xed, 0xcd, 0xb9, 0x9e, 0x4c, 0x6a, 0x70, 0x47, + 0xe7, 0xb9, 0xe3, 0x37, 0x74, 0xf2, 0xa9, 0xcb, + 0x47, 0x32, 0xa7, 0x3b, 0x0e, 0xb4, 0x0d, 0xdb, + 0xa9, 0x6d, 0xc0, 0x22, 0x83, 0xbf, 0x8b, 0x01, + 0x62, 0x18, 0x85, 0x51, 0x80, 0x88, 0x8c, 0x13, + 0x91, 0xcd, 0x22, 0xb2, 0xda, 0x60, 0xd6, 0x83, + 0x9c, 0x0b, 0xf0, 0xf7, 0xda, 0xf4, 0xce, 0x81, + 0x83, 0xe9, 0xed, 0x3a, 0xf9, 0x44, 0xfb, 0xc1, + 0x5f, 0x53, 0x03, 0x37, 0x1f, 0x69, 0x6f, 0xce, + 0x65, 0x01, 0x31, 0xf8, 0xbb, 0xe0, 0x37, 0x68, + 0x27, 0xdc, 0x56, 0xe0, 0x0d, 0x60, 0x37, 0xb0, + 0x4f, 0x44, 0xf4, 0x87, 0xee, 0xba, 0x56, 0x9f, + 0x29, 0x22, 0x15, 0x00, 0xb9, 0x43, 0xf7, 0x1d, + 0xd7, 0x1d, 0x0d, 0x7d, 0x56, 0xbf, 0xbd, 0xbd, + 0x39, 0x97, 0x29, 0x54, 0xf5, 0x15, 0xe8, 0x51, + 0x4a, 0x15, 0x3f, 0x38, 0x3e, 0xe0, 0x26, 0x60, + 0x82, 0xa3, 0xac, 0x1f, 0x01, 0x74, 0x01, 0x51, + 0x60, 0x76, 0xa1, 0x5c, 0x45, 0x31, 0xc6, 0x3b, + 0xca, 0xba, 0x80, 0x50, 0xb3, 0x0f, 0xee, 0x02, + 0xba, 0x1c, 0xe5, 0x87, 0x45, 0xe4, 0x7e, 0x47, + 0x5d, 0x17, 0x00, 0x85, 0x6d, 0x44, 0x09, 0x01, + 0x22, 0xd2, 0x00, 0x4c, 0xd1, 0x6c, 0x9d, 0x5e, + 0x82, 0x2c, 0x05, 0x37, 0x01, 0x17, 0x34, 0xce, + 0x06, 0x47, 0xfd, 0x9a, 0x81, 0x3f, 0x22, 0x20, + 0x6a, 0xb0, 0x8d, 0xac, 0xc0, 0xc2, 0x31, 0xc6, + 0x09, 0x04, 0x37, 0x01, 0xa7, 0xb5, 0xfa, 0x26, + 0x47, 0xd9, 0xb4, 0x02, 0xf3, 0x0b, 0xbf, 0x26, + 0x01, 0xe3, 0x0a, 0xbf, 0x73, 0x0d, 0xb6, 0x50, + 0x6f, 0x20, 0x70, 0x17, 0xf0, 0x27, 0x30, 0xe8, + 0xa8, 0x2f, 0x10, 0x91, 0x25, 0x8e, 0x41, 0x33, + 0x1a, 0x7f, 0x59, 0x09, 0x7f, 0x23, 0x2b, 0xd0, + 0x64, 0xb0, 0x0d, 0x1a, 0xda, 0x7c, 0xc1, 0x28, + 0x40, 0x29, 0x65, 0x03, 0xfb, 0xb5, 0xe6, 0xe7, + 0x0b, 0xb6, 0x0c, 0x70, 0x4e, 0xb3, 0x2d, 0x14, + 0x91, 0x6a, 0x4a, 0x6f, 0x21, 0xd3, 0x0a, 0x84, + 0x7a, 0x03, 0x41, 0xe9, 0x3f, 0xb2, 0x7d, 0x5a, + 0xfd, 0x39, 0x11, 0x19, 0x39, 0x07, 0x9d, 0x31, + 0xf8, 0x59, 0x4a, 0x69, 0x01, 0xa6, 0x15, 0xb8, + 0xab, 0x02, 0xa6, 0x00, 0x8f, 0x15, 0xca, 0xfa, + 0x33, 0x02, 0xf0, 0x10, 0x50, 0x6f, 0x68, 0x5f, + 0x23, 0x22, 0x1b, 0x80, 0x99, 0x06, 0x9b, 0x6d, + 0x68, 0xf3, 0x85, 0x58, 0x09, 0x5b, 0x3b, 0x70, + 0x09, 0x98, 0xea, 0x68, 0xdb, 0x08, 0xfc, 0x0c, + 0xfc, 0x6b, 0xe0, 0xbf, 0xe9, 0xe2, 0xa7, 0x11, + 0xf8, 0xdc, 0xc5, 0xe6, 0xba, 0x02, 0x85, 0xcb, + 0xd2, 0xcb, 0x85, 0x31, 0x1b, 0x81, 0xdf, 0x81, + 0x17, 0x94, 0x52, 0xb7, 0x1d, 0xb8, 0x5c, 0x57, + 0x40, 0x29, 0x95, 0x05, 0xbe, 0xd4, 0x9a, 0x9f, + 0x16, 0x91, 0x05, 0xc0, 0x65, 0xb7, 0x7e, 0x3e, + 0x61, 0x14, 0x20, 0x22, 0x49, 0xf2, 0x3b, 0xe0, + 0x43, 0x60, 0x05, 0xf9, 0x49, 0x6c, 0x06, 0x9e, + 0xd2, 0xb9, 0x63, 0x1d, 0xe6, 0xf4, 0x99, 0xab, + 0x00, 0xbe, 0x00, 0xb6, 0xf9, 0x8d, 0xd4, 0x05, + 0x45, 0x5b, 0x48, 0x44, 0xa2, 0xe4, 0x27, 0x6e, + 0x95, 0x66, 0xca, 0x02, 0x87, 0x75, 0x7e, 0x49, + 0x01, 0x4a, 0xa9, 0x36, 0xe0, 0x1f, 0x7d, 0x0c, + 0x60, 0x9a, 0xaf, 0x30, 0xdd, 0x61, 0x5a, 0x81, + 0x1d, 0x18, 0x66, 0x1a, 0xf8, 0x58, 0x29, 0x75, + 0x52, 0x6f, 0xf4, 0x72, 0x9c, 0xd6, 0x1f, 0xe6, + 0x72, 0xe2, 0x36, 0x01, 0x85, 0x83, 0xe3, 0x16, + 0x03, 0xaf, 0x0b, 0x30, 0x26, 0x00, 0xbc, 0x08, + 0xf8, 0xcb, 0x7f, 0x5c, 0x9e, 0x31, 0xba, 0x85, + 0x44, 0x64, 0x02, 0xb0, 0xcb, 0x85, 0xb7, 0x45, + 0x29, 0xd5, 0x6b, 0x32, 0x78, 0x11, 0x70, 0x28, + 0x40, 0x60, 0x5e, 0x31, 0xc3, 0x51, 0x7e, 0x17, + 0x98, 0x6e, 0xe0, 0x7c, 0xa3, 0x94, 0xfa, 0xce, + 0xcd, 0x81, 0x17, 0x01, 0x27, 0x81, 0xe2, 0xbb, + 0x62, 0x79, 0xb0, 0x12, 0x40, 0x44, 0x56, 0x02, + 0x2f, 0x19, 0xec, 0x69, 0x5c, 0xb6, 0xce, 0x08, + 0x3c, 0x65, 0xe6, 0x44, 0x44, 0x61, 0xbe, 0x0e, + 0x86, 0x45, 0x1f, 0xb0, 0x16, 0xf8, 0x84, 0xfc, + 0xbb, 0x5e, 0xc7, 0x2e, 0xa5, 0xd4, 0x2b, 0xa5, + 0x1c, 0x78, 0xbd, 0x13, 0x77, 0x8d, 0x4d, 0x09, + 0x84, 0x6a, 0xa0, 0x15, 0x73, 0xf0, 0x43, 0xc0, + 0xdb, 0x63, 0x39, 0xb8, 0xd7, 0x02, 0x4a, 0x61, + 0x8f, 0x52, 0x6a, 0xcc, 0x0b, 0x8f, 0x57, 0x01, + 0xa1, 0xcf, 0xed, 0x01, 0xf0, 0x9e, 0x17, 0x92, + 0x57, 0x01, 0x6d, 0x21, 0x02, 0x09, 0x82, 0x56, + 0xa5, 0xd4, 0x11, 0x2f, 0x44, 0xaf, 0x02, 0x7e, + 0xa3, 0xf8, 0x12, 0x73, 0x27, 0xb1, 0xc7, 0x2b, + 0xd1, 0x93, 0x00, 0xa5, 0xd4, 0x4d, 0xe0, 0x8f, + 0xc0, 0xe1, 0xf8, 0x43, 0x16, 0xf8, 0xd6, 0x2b, + 0xd9, 0x4f, 0x66, 0xee, 0x8e, 0x7d, 0x26, 0xd2, + 0xd0, 0xa2, 0x94, 0xea, 0xf6, 0x4a, 0xf6, 0x23, + 0xe0, 0x23, 0xc0, 0xf8, 0x77, 0x5e, 0x46, 0x9c, + 0x07, 0x36, 0xfb, 0xe9, 0xe0, 0x59, 0x40, 0x61, + 0x1b, 0x7d, 0xe0, 0x37, 0x22, 0x1f, 0xb8, 0x00, + 0xac, 0x52, 0x4a, 0x75, 0xf8, 0xe9, 0xe4, 0x37, + 0xb9, 0xbb, 0x9d, 0x32, 0x64, 0x12, 0x0c, 0xb8, + 0x08, 0xac, 0x56, 0x4a, 0x9d, 0xf5, 0xdb, 0xd1, + 0x97, 0x00, 0xa5, 0xd4, 0x15, 0xf2, 0x39, 0xd3, + 0x72, 0xa2, 0x93, 0xfc, 0xcc, 0x9f, 0x0a, 0xd2, + 0x39, 0x48, 0x7a, 0x7d, 0x07, 0xb7, 0x7d, 0x87, + 0x09, 0x85, 0x0e, 0x60, 0x85, 0xe9, 0xa2, 0xe2, + 0x15, 0xbe, 0x05, 0x28, 0xa5, 0xce, 0x00, 0xbf, + 0x04, 0x1d, 0xd0, 0x81, 0x2c, 0xb0, 0x51, 0x29, + 0x65, 0x4a, 0x10, 0x78, 0x46, 0xa0, 0xcf, 0xac, + 0xe4, 0xef, 0xc5, 0x61, 0x71, 0x4c, 0x29, 0x75, + 0x20, 0xac, 0x93, 0xa0, 0x02, 0x42, 0x0f, 0x4c, + 0xf1, 0x5d, 0x3b, 0x10, 0x82, 0x0a, 0xb8, 0x52, + 0x86, 0xb1, 0x03, 0xef, 0x7b, 0x27, 0x82, 0x0a, + 0x08, 0x9d, 0x51, 0xa3, 0x4c, 0xb7, 0xbc, 0x40, + 0x02, 0x0a, 0x49, 0xaf, 0xb0, 0x87, 0x3b, 0xfd, + 0x63, 0x61, 0x20, 0x04, 0x5d, 0x01, 0x08, 0x9f, + 0x98, 0xcd, 0x86, 0xec, 0x0f, 0xc0, 0xff, 0xde, + 0x5e, 0x95, 0xe6, 0x34, 0x65, 0xd9, 0xd5, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x6c, 0x65, 0x66, 0x74, 0x2d, + 0x6c, 0x69, 0x74, 0x74, 0x6c, 0x65, 0x2d, 0x66, + 0x69, 0x6e, 0x67, 0x65, 0x72, 0x2e, 0x70, 0x6e, + 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xdc, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x05, 0x59, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xd5, 0x9a, 0x5b, + 0x6c, 0x94, 0x45, 0x14, 0xc7, 0x7f, 0x7b, 0xe9, + 0xf6, 0x0e, 0x96, 0xb4, 0x94, 0xb6, 0x68, 0x55, + 0xe4, 0x22, 0x98, 0x70, 0xc4, 0x9a, 0x48, 0x02, + 0x1a, 0x20, 0x91, 0x44, 0x88, 0x89, 0x44, 0x34, + 0x04, 0x88, 0x46, 0x89, 0x9a, 0x90, 0x90, 0xa8, + 0x89, 0xf1, 0x91, 0x18, 0x5f, 0x50, 0x62, 0xe4, + 0xc1, 0x08, 0x51, 0x7c, 0x50, 0xb9, 0x04, 0x95, + 0x28, 0xb1, 0xc4, 0x80, 0x10, 0x0d, 0x11, 0x88, + 0x6d, 0xf1, 0x90, 0xb4, 0xca, 0xa5, 0x28, 0x97, + 0x02, 0x2d, 0x0d, 0x16, 0x68, 0xa5, 0xd0, 0x6e, + 0x77, 0x7d, 0xd8, 0xdd, 0xf6, 0xeb, 0x74, 0xb6, + 0xfd, 0x2e, 0x4b, 0x8c, 0xff, 0xa7, 0xf9, 0xe6, + 0x5c, 0xe6, 0xfc, 0xe7, 0x9c, 0x9d, 0xef, 0x9b, + 0x99, 0x0d, 0x25, 0x93, 0x49, 0xfe, 0xcf, 0x88, + 0xe6, 0xda, 0xa1, 0x88, 0x44, 0x80, 0x27, 0x81, + 0x02, 0xa0, 0x5e, 0x55, 0xfb, 0x72, 0x3d, 0x86, + 0x13, 0xe1, 0x3b, 0xe0, 0xf3, 0x0d, 0x60, 0x2f, + 0xb0, 0x1b, 0x78, 0xe7, 0x0e, 0xf8, 0x1f, 0x06, + 0x5f, 0x19, 0x10, 0x91, 0xbb, 0x80, 0x1a, 0xe0, + 0x77, 0x55, 0x35, 0x6b, 0x70, 0x85, 0xa3, 0xfd, + 0x2c, 0xf0, 0xb6, 0xc5, 0x7e, 0x21, 0xf0, 0x2a, + 0xd0, 0xa4, 0xaa, 0xef, 0xf9, 0x89, 0x21, 0x03, + 0xcf, 0x19, 0x10, 0x91, 0xe9, 0x40, 0x3b, 0xd0, + 0x0c, 0xbc, 0x6f, 0x51, 0x99, 0xec, 0x68, 0x8f, + 0xb7, 0xd8, 0xd7, 0x00, 0xdf, 0x03, 0xcf, 0x01, + 0x1b, 0x44, 0x64, 0xae, 0xd7, 0x18, 0x9c, 0xf0, + 0x53, 0x42, 0xcf, 0x03, 0xf9, 0xe9, 0xf6, 0x6a, + 0x23, 0xb8, 0x7c, 0xa0, 0xdc, 0xd1, 0x35, 0xce, + 0x62, 0xbf, 0x14, 0x28, 0x74, 0x3c, 0x57, 0xf9, + 0x88, 0x61, 0x10, 0x7e, 0x08, 0x38, 0xcb, 0x6e, + 0xa2, 0x88, 0x4c, 0x71, 0x3c, 0x57, 0x03, 0x21, + 0xc7, 0x73, 0x2c, 0x4d, 0xca, 0x89, 0x25, 0xc6, + 0x73, 0xa0, 0x1f, 0x79, 0x56, 0x02, 0x73, 0x76, + 0x87, 0x6a, 0xe5, 0xab, 0x50, 0x8d, 0x0b, 0x1b, + 0x67, 0x09, 0xd8, 0x66, 0x7c, 0xb0, 0x4f, 0x44, + 0xf2, 0x80, 0x45, 0x86, 0x3c, 0xb7, 0x04, 0x66, + 0xef, 0x8d, 0xae, 0xa9, 0x3b, 0x58, 0xda, 0x52, + 0x3a, 0xb9, 0xf6, 0x68, 0x59, 0xed, 0x7d, 0x0d, + 0x8f, 0x1d, 0x2c, 0x6b, 0x7e, 0xa4, 0x3e, 0xba, + 0x6c, 0x14, 0x9b, 0x3a, 0x47, 0xbb, 0x90, 0x91, + 0x28, 0x71, 0xb4, 0x67, 0x00, 0x45, 0x86, 0xfc, + 0xa6, 0xa7, 0x88, 0x0d, 0x0c, 0x5b, 0x85, 0x1e, + 0xfe, 0x21, 0x6f, 0x7d, 0x51, 0x65, 0xe5, 0xba, + 0xda, 0x4a, 0x29, 0x2b, 0x8f, 0x56, 0x90, 0x1f, + 0x2a, 0xe0, 0x56, 0xa2, 0xb7, 0xea, 0x74, 0xdb, + 0xd1, 0xcd, 0x73, 0xea, 0x0b, 0x2a, 0x8f, 0x2d, + 0xb9, 0xf5, 0x31, 0x30, 0x60, 0xf8, 0x98, 0xee, + 0x68, 0x9b, 0xc1, 0x01, 0x14, 0x3b, 0xda, 0xb3, + 0x2d, 0xf2, 0xcb, 0xfe, 0x42, 0x4f, 0x61, 0x70, + 0x36, 0xe7, 0xec, 0x09, 0x55, 0x27, 0x0b, 0x62, + 0x2f, 0x56, 0x4f, 0x9c, 0x59, 0x56, 0x35, 0x30, + 0x99, 0x81, 0x1f, 0x23, 0x14, 0x34, 0x97, 0x72, + 0x6f, 0x6c, 0x0a, 0xb3, 0xee, 0x7e, 0xa2, 0xa2, + 0xb0, 0x78, 0xdc, 0xeb, 0x33, 0xf6, 0x84, 0x4a, + 0x81, 0x6b, 0x86, 0x8f, 0x69, 0x8e, 0xf6, 0x58, + 0x19, 0x10, 0x8b, 0xfc, 0xa2, 0xff, 0xf0, 0x1d, + 0x04, 0x12, 0x79, 0xd1, 0x75, 0x45, 0xd5, 0x35, + 0xb5, 0x13, 0xa2, 0xe5, 0x74, 0x6c, 0xef, 0xe2, + 0xc8, 0xc6, 0x26, 0xea, 0xdf, 0xdc, 0x4f, 0x5f, + 0x43, 0x82, 0x49, 0xd1, 0x6a, 0xee, 0xa9, 0x91, + 0xa9, 0x25, 0x91, 0xfc, 0xd5, 0x40, 0x97, 0xe1, + 0xa3, 0x56, 0x44, 0x62, 0xe9, 0xb6, 0x2d, 0x03, + 0x4e, 0x02, 0x66, 0x06, 0xae, 0xaa, 0xea, 0xad, + 0x9c, 0x10, 0x20, 0xc4, 0x43, 0xc5, 0xf9, 0x65, + 0x94, 0x86, 0xc7, 0x11, 0xbe, 0x19, 0x19, 0xec, + 0xd6, 0x5d, 0xcd, 0x94, 0x45, 0x26, 0x50, 0x5e, + 0x52, 0x43, 0x28, 0x2f, 0x3c, 0x97, 0x91, 0x04, + 0x22, 0xc0, 0xfd, 0xe9, 0xf6, 0x58, 0x19, 0x30, + 0x09, 0x04, 0x9a, 0x7d, 0x70, 0x12, 0x08, 0x93, + 0x17, 0x0d, 0x45, 0xc9, 0x23, 0xc6, 0xf8, 0xf2, + 0xa1, 0xc5, 0xa4, 0x55, 0xcf, 0xd0, 0xdf, 0x19, + 0x27, 0x16, 0x8e, 0x11, 0x26, 0x52, 0xc0, 0x48, + 0x02, 0x30, 0x54, 0x46, 0x59, 0x09, 0x88, 0x48, + 0x15, 0x50, 0x61, 0xc8, 0xda, 0x82, 0x04, 0x9f, + 0x0a, 0x3b, 0x8d, 0x50, 0x3c, 0xd9, 0x1a, 0x8f, + 0xdf, 0x66, 0x80, 0x38, 0x85, 0xe5, 0x43, 0x71, + 0x24, 0x13, 0x49, 0x5a, 0xf6, 0xff, 0x41, 0x4f, + 0xef, 0x35, 0x92, 0x89, 0x81, 0x26, 0xe0, 0x6f, + 0x8b, 0x9f, 0x0c, 0x81, 0x88, 0x45, 0x96, 0xc9, + 0xc0, 0x2c, 0x8b, 0x2c, 0x77, 0x19, 0x88, 0x24, + 0x06, 0xb6, 0x76, 0x5f, 0x69, 0xeb, 0xf8, 0x27, + 0xd1, 0x43, 0xb4, 0x7a, 0xf8, 0x4a, 0xd9, 0xb2, + 0xef, 0x24, 0xe7, 0x3b, 0x8e, 0x5f, 0x48, 0xc4, + 0x7b, 0xb7, 0x63, 0xcf, 0xc0, 0x83, 0x19, 0x37, + 0x16, 0x59, 0x66, 0x15, 0x9a, 0x66, 0x91, 0x05, + 0x5a, 0x81, 0xc0, 0x41, 0xa0, 0x71, 0x69, 0xf2, + 0x58, 0x5f, 0x57, 0xd7, 0x4f, 0xed, 0x3d, 0x67, + 0xfb, 0x99, 0xd6, 0x4f, 0x24, 0x7f, 0x28, 0x96, + 0xeb, 0xe7, 0x6e, 0x70, 0xf5, 0xf0, 0xb5, 0xc3, + 0x8d, 0x4b, 0x93, 0xe7, 0xd3, 0x83, 0xc6, 0x0d, + 0x3f, 0x8f, 0x9a, 0xfe, 0x1c, 0xc8, 0x64, 0x60, + 0xba, 0x45, 0xd6, 0xeb, 0x3f, 0x74, 0xcb, 0x80, + 0x0f, 0xf4, 0xf4, 0xad, 0x6c, 0xfb, 0xb3, 0xf1, + 0x8b, 0xdf, 0xda, 0xf6, 0xb5, 0x17, 0xcf, 0x88, + 0x0d, 0x53, 0xec, 0xfb, 0x7c, 0x52, 0x07, 0x80, + 0xaa, 0xc6, 0x81, 0xbf, 0x0c, 0x3f, 0xb3, 0x44, + 0xa4, 0x94, 0xd1, 0x4b, 0xc8, 0x96, 0x81, 0x40, + 0x2b, 0x10, 0x18, 0x04, 0x76, 0x2d, 0x4f, 0x0e, + 0x34, 0x2c, 0xee, 0x7d, 0xb9, 0xe3, 0xfc, 0xa9, + 0xba, 0x9e, 0xdb, 0x9d, 0x5f, 0x0f, 0xd3, 0x4c, + 0xb2, 0x42, 0x44, 0x32, 0x2f, 0xbe, 0x56, 0x8b, + 0x9f, 0x3a, 0x46, 0x27, 0x60, 0xcb, 0x40, 0x6e, + 0x09, 0x64, 0xa0, 0xcb, 0x93, 0x17, 0x13, 0x27, + 0x4a, 0x36, 0x18, 0xdd, 0x15, 0xc0, 0xe2, 0x74, + 0xfb, 0xb4, 0xc5, 0xec, 0x71, 0x60, 0x92, 0xa5, + 0x7f, 0x91, 0x88, 0xac, 0x04, 0x6a, 0x2d, 0xb2, + 0xdb, 0x6e, 0x03, 0xcd, 0x86, 0xd1, 0x36, 0x34, + 0xc7, 0x80, 0x0e, 0xa0, 0xd2, 0xd1, 0xb7, 0x0a, + 0xa8, 0x07, 0xce, 0x59, 0xf4, 0xd7, 0x67, 0xf1, + 0x33, 0x15, 0xf8, 0x32, 0x8b, 0x2c, 0x6b, 0x06, + 0x44, 0x24, 0x04, 0xbc, 0x92, 0x1e, 0x73, 0x2a, + 0x70, 0x18, 0x78, 0x41, 0x55, 0xbb, 0x9d, 0x7a, + 0x59, 0xbf, 0x46, 0x55, 0x35, 0x01, 0xec, 0x30, + 0xba, 0x97, 0x89, 0xc8, 0x4c, 0xe0, 0x4a, 0x36, + 0x3b, 0x8f, 0xb0, 0x12, 0x10, 0x91, 0x22, 0xe0, + 0x00, 0xb0, 0x19, 0x98, 0x47, 0x6a, 0x12, 0x9f, + 0x01, 0x9e, 0x36, 0x75, 0xc7, 0xda, 0x0f, 0x98, + 0x33, 0x17, 0x03, 0xb6, 0x01, 0x66, 0x79, 0xf9, + 0xc5, 0x88, 0x12, 0x4a, 0x1f, 0x0a, 0xec, 0x00, + 0x16, 0x18, 0xa2, 0x04, 0xd0, 0x68, 0xea, 0x8f, + 0x4a, 0x40, 0x55, 0x9b, 0x80, 0x13, 0xe6, 0x18, + 0xa4, 0x36, 0x2e, 0xb9, 0x80, 0x2d, 0x03, 0x9b, + 0xb0, 0xcc, 0x34, 0xf0, 0xa9, 0xaa, 0x9e, 0x34, + 0x3b, 0xdd, 0xec, 0xc8, 0x0e, 0x78, 0x8d, 0xca, + 0x03, 0x86, 0x11, 0x10, 0x91, 0x25, 0xc0, 0x5a, + 0x8b, 0xde, 0x25, 0xe0, 0x2d, 0x9b, 0x03, 0x37, + 0x04, 0x1a, 0xbc, 0xc7, 0xe5, 0x1a, 0x83, 0x25, + 0x24, 0x22, 0xe3, 0x81, 0x2d, 0x59, 0xf4, 0xd6, + 0xaa, 0xea, 0x75, 0x9b, 0xc0, 0x0d, 0x81, 0x5f, + 0x7d, 0x04, 0xe6, 0x16, 0xce, 0x13, 0x8c, 0x8d, + 0xa4, 0x8e, 0x6a, 0x4c, 0x7c, 0xa3, 0xaa, 0xdf, + 0x66, 0x73, 0xe0, 0x86, 0xc0, 0x49, 0xa0, 0x7b, + 0x4c, 0x2d, 0x7f, 0x98, 0x0f, 0x20, 0x22, 0xf3, + 0x81, 0x35, 0x16, 0x79, 0x3f, 0x59, 0x4a, 0x27, + 0x83, 0x90, 0x9b, 0xb3, 0x51, 0x11, 0x51, 0xec, + 0xdb, 0xc1, 0xa0, 0xe8, 0x06, 0x9e, 0x02, 0x3e, + 0x23, 0xb5, 0xd6, 0x9b, 0xd8, 0xa2, 0xaa, 0xaf, + 0x8d, 0xe6, 0xc0, 0xed, 0xb1, 0xca, 0x25, 0x8f, + 0x81, 0xb9, 0x45, 0x29, 0x70, 0x08, 0x7b, 0xf0, + 0x7d, 0xc0, 0xbb, 0x63, 0x39, 0xf8, 0xaf, 0x09, + 0x8c, 0x86, 0x9d, 0xaa, 0x3a, 0xe6, 0x86, 0xc7, + 0x2d, 0x81, 0xc0, 0xdf, 0xed, 0x3e, 0xf0, 0x81, + 0x1b, 0x25, 0xb7, 0x04, 0x9a, 0x02, 0x04, 0xe2, + 0x07, 0x87, 0x54, 0xf5, 0xb8, 0x1b, 0x45, 0xb7, + 0x04, 0x0e, 0x32, 0x72, 0x13, 0x73, 0x27, 0xb1, + 0xd3, 0xad, 0xa2, 0x2b, 0x02, 0xaa, 0x7a, 0x03, + 0x38, 0xe2, 0x3b, 0x1c, 0x6f, 0x48, 0x90, 0xba, + 0x5b, 0x70, 0x05, 0x2f, 0x87, 0xbb, 0xdf, 0x79, + 0x8f, 0xc5, 0x17, 0x7e, 0x56, 0xd5, 0x76, 0xb7, + 0xca, 0x5e, 0x08, 0x7c, 0x02, 0x58, 0x5f, 0xe7, + 0x39, 0xc4, 0x05, 0xe0, 0x25, 0x2f, 0x06, 0xae, + 0x09, 0xa4, 0xcb, 0xe8, 0x23, 0xaf, 0x11, 0x79, + 0xc0, 0x45, 0x60, 0x81, 0xaa, 0x9e, 0xf5, 0x62, + 0xe4, 0xf5, 0x7e, 0xe0, 0x43, 0x72, 0x70, 0x92, + 0x60, 0xc1, 0x65, 0x60, 0xa1, 0xaa, 0x9e, 0xf1, + 0x6a, 0xe8, 0x89, 0x80, 0xaa, 0x76, 0x02, 0x5b, + 0xbd, 0x0e, 0x32, 0x06, 0xda, 0x48, 0xcd, 0xfc, + 0x29, 0x3f, 0xc6, 0x7e, 0x6e, 0x68, 0x36, 0x01, + 0xb9, 0xba, 0x5c, 0x3e, 0x0b, 0xcc, 0xb3, 0x6d, + 0x54, 0xdc, 0xc2, 0x33, 0x01, 0x55, 0x6d, 0x25, + 0x75, 0x8d, 0x1a, 0x14, 0x09, 0x60, 0x95, 0xaa, + 0xda, 0x0e, 0x08, 0x5c, 0xc3, 0xef, 0x3d, 0xf1, + 0xb6, 0x20, 0x83, 0xa6, 0xd1, 0xa2, 0xaa, 0xbf, + 0x04, 0x75, 0xe2, 0x97, 0x40, 0xe0, 0x81, 0x19, + 0xb9, 0xd7, 0xf6, 0x05, 0xbf, 0x04, 0x3a, 0x73, + 0x30, 0xb6, 0xef, 0xba, 0x77, 0xc2, 0x2f, 0x81, + 0xc0, 0x27, 0x6a, 0xe4, 0x68, 0x97, 0xe7, 0x8b, + 0x40, 0xfa, 0xd0, 0x2b, 0xe8, 0xc7, 0x9d, 0x79, + 0x59, 0xe8, 0x0b, 0x41, 0xfe, 0xec, 0x11, 0xf4, + 0x60, 0x36, 0x11, 0xd0, 0x1e, 0x80, 0x7f, 0x01, + 0xb6, 0x0f, 0x73, 0x65, 0xf5, 0x45, 0xca, 0xbe, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, + 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0xff, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, + 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, + 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x2d, 0x6e, 0x61, 0x6d, 0x69, + 0x6e, 0x67, 0x2d, 0x70, 0x6f, 0x6c, 0x69, 0x63, + 0x79, 0x20, 0x74, 0x6f, 0x70, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x78, 0x74, 0x75, 0x61, 0x6c, 0x20, 0x2d, 0x2d, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, + 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, + 0x61, 0x6d, 0x65, 0x20, 0x67, 0x63, 0x68, 0x61, + 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x2d, + 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x55, 0x6d, 0x41, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x22, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, - 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, - 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x72, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, - 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, - 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, - 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x36, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, + 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x64, 0x65, 0x73, 0x74, 0x72, + 0x6f, 0x79, 0x5f, 0x77, 0x69, 0x74, 0x68, 0x5f, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, + 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, - 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, 0x64, + 0x20, 0x55, 0x73, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x2d, 0x75, 0x73, 0x65, 0x72, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, + 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, + 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x31, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x70, + 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x46, - 0x75, 0x6c, 0x6c, 0x20, 0x4e, 0x61, 0x6d, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, - 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, - 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, - 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, - 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x2d, 0x61, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, - 0x3e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x2d, 0x74, 0x79, 0x70, 0x65, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, - 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, - 0x65, 0x2d, 0x63, 0x65, 0x6c, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, - 0x78, 0x74, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, + 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x41, 0x64, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x37, 0x22, 0x3e, 0x3c, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x61, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x5f, 0x54, 0x79, - 0x70, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, + 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, 0x63, + 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x2d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, + 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, + 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x74, 0x6b, 0x53, 0x70, 0x69, 0x6e, 0x6e, 0x65, + 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, + 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, 0x3c, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, + 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x78, 0x31, 0x39, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, + 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x74, + 0x61, 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -7989,92 +8015,133 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, - 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x6e, 0x6f, 0x6e, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x2d, 0x72, - 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x75, 0x73, - 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x65, - 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x20, 0x77, 0x68, 0x65, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x6e, - 0x65, 0x78, 0x74, 0x20, 0x5f, 0x6c, 0x6f, 0x67, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, + 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x54, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x75, 0x73, + 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, - 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x68, 0x61, 0x73, 0x5f, 0x65, 0x6e, 0x74, 0x72, + 0x79, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x5f, + 0x74, 0x65, 0x78, 0x74, 0x5f, 0x63, 0x6f, 0x6c, + 0x75, 0x6d, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, + 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2d, - 0x6e, 0x6f, 0x77, 0x2d, 0x72, 0x61, 0x64, 0x69, - 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, 0x74, - 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x20, 0x5f, 0x6e, 0x6f, 0x77, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x68, 0x69, 0x6e, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -8082,68 +8149,177 @@ 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, - 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, - 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, - 0x2d, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, + 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x36, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, + 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, + 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, @@ -8152,7 +8328,7 @@ 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x32, 0x22, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -8160,8 +8336,196 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x46, 0x75, 0x6c, 0x6c, 0x20, 0x4e, 0x61, 0x6d, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, + 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, + 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x69, 0x6e, + 0x6b, 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, + 0x61, 0x64, 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x61, + 0x6e, 0x64, 0x61, 0x72, 0x64, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x53, 0x74, 0x61, 0x6e, 0x64, + 0x61, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, + 0x69, 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, + 0x70, 0x65, 0x2d, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x33, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x22, 0x3e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, + 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, @@ -8173,21 +8537,22 @@ 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, - 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6c, 0x6f, 0x63, - 0x61, 0x6c, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x20, 0x5f, 0x54, 0x79, 0x70, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, + 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, + 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, + 0x79, 0x70, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, @@ -8210,154 +8575,7 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x61, 0x73, 0x5f, 0x74, - 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, - 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, - 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, - 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, - 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, - 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x42, - 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x73, 0x74, - 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x2d, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, - 0x64, 0x69, 0x73, 0x63, 0x72, 0x65, 0x74, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x34, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, - 0x74, 0x73, 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, - 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x6f, 0x77, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x22, 0x2f, - 0x3e, 0x3c, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x69, 0x67, 0x68, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x33, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, - 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, @@ -8365,178 +8583,92 @@ 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, - 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, - 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, - 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, - 0x68, 0x74, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, - 0x3e, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, - 0x61, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, - 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, - 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x31, 0x39, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x56, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x2d, 0x76, 0x65, 0x72, 0x69, - 0x66, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, - 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, - 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x39, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x5f, + 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x75, + 0x73, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x73, + 0x65, 0x74, 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x20, 0x77, 0x68, + 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, + 0x6e, 0x65, 0x78, 0x74, 0x20, 0x5f, 0x6c, 0x6f, + 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x76, 0x65, - 0x72, 0x69, 0x66, 0x79, 0x22, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, @@ -8548,163 +8680,143 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, - 0x61, 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, - 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, - 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x39, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, + 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, + 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x2d, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, - 0x2d, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, + 0x6f, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x5f, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x65, 0x74, + 0x20, 0x61, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x20, 0x5f, 0x6e, 0x6f, 0x77, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, + 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, - 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, - 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, - 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, 0x74, + 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, - 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, - 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, - 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, - 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x5f, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x61, 0x72, - 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -8716,76 +8828,35 @@ 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x20, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x61, - 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x61, 0x6e, - 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e, - 0x67, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, - 0x6c, 0x6c, 0x79, 0x20, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x64, 0x20, 0x75, 0x73, 0x65, 0x72, - 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, - 0x73, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, - 0x68, 0x69, 0x73, 0x20, 0x64, 0x65, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, - 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, - 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -8802,11 +8873,11 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -8818,9 +8889,10 @@ 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -8828,56 +8900,118 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x73, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, + 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x69, + 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, + 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, 0x26, 0x23, + 0x78, 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, + 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, + 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x44, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, - 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x2d, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x3c, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x65, 0x76, + 0x65, 0x6c, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, + 0x68, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, + 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, + 0x65, 0x22, 0x3e, 0x64, 0x69, 0x73, 0x63, 0x72, + 0x65, 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, + 0x78, 0x2d, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, + 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x6f, 0x66, + 0x66, 0x73, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x6f, + 0x66, 0x66, 0x73, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x77, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x66, 0x66, + 0x73, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x69, 0x67, 0x68, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x33, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x66, 0x66, + 0x73, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -8894,65 +9028,84 @@ 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, + 0x61, 0x6c, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x55, - 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, - 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, - 0x3e, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x73, 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, + 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x72, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x35, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, 0x6f, + 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, 0x64, + 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, 0x61, + 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, 0x33, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, @@ -8970,7 +9123,7 @@ 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x39, 0x22, 0x3e, 0x3c, + 0x61, 0x62, 0x65, 0x6c, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, @@ -8991,21 +9144,20 @@ 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, + 0x5f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, + 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -9028,7 +9180,7 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x39, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, @@ -9044,179 +9196,79 @@ 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x68, - 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x2d, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, - 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, - 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, - 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, + 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, + 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, - 0x74, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, - 0x70, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, - 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, - 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, - 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x2d, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x73, 0x5f, - 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, - 0x74, 0x72, 0x79, 0x5f, 0x74, 0x65, 0x78, 0x74, - 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x62, 0x6f, 0x78, - 0x2d, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, - 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, + 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, - 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, + 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x39, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x2d, 0x68, 0x69, 0x6e, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x76, 0x65, + 0x72, 0x69, 0x66, 0x79, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, @@ -9255,192 +9307,250 @@ 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, - 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x61, 0x70, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, + 0x61, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x30, 0x2e, 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, - 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, - 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, - 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, + 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x2d, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x73, 0x65, 0x2d, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, + 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x31, 0x30, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, - 0x68, 0x61, 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, - 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, - 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, - 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, - 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, - 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, - 0x65, 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, + 0x72, 0x69, 0x73, 0x65, 0x20, 0x6c, 0x6f, 0x67, + 0x69, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, + 0x73, 0x20, 0x61, 0x6e, 0x20, 0x65, 0x78, 0x69, + 0x73, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x65, + 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x20, + 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x20, + 0x75, 0x73, 0x65, 0x72, 0x20, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20, + 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64, 0x20, + 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, + 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x20, + 0x59, 0x6f, 0x75, 0x20, 0x63, 0x61, 0x6e, 0x20, + 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x75, 0x73, 0x65, + 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x20, 0x74, 0x6f, + 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, + 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x20, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, + 0x74, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, + 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, - 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, - 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, 0x6d, + 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, 0x72, + 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, + 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, - 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, - 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, - 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x44, 0x6f, 0x6d, + 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x5f, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, + 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, @@ -9453,24 +9563,12 @@ 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, - 0x5f, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x6f, 0x66, - 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x61, 0x72, - 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -9482,111 +9580,147 @@ 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x55, 0x73, + 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, + 0x73, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x38, 0x22, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, + 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x20, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x61, - 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x61, 0x6e, - 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e, - 0x67, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, - 0x6c, 0x6c, 0x79, 0x20, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x64, 0x20, 0x75, 0x73, 0x65, 0x72, - 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, - 0x73, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, - 0x68, 0x69, 0x73, 0x20, 0x64, 0x65, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x39, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, - 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, - 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, - 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, + 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x22, 0x3e, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, + 0x72, 0x69, 0x73, 0x65, 0x5f, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x78, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, - 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x35, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, - 0x65, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x68, 0x69, + 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, @@ -9598,67 +9732,90 @@ 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, - 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x3e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x2d, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, - 0x65, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, - 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x69, 0x78, - 0x65, 0x6c, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, - 0x3e, 0x36, 0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, - 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, + 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, + 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, + 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x22, 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, + 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, + 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, + 0x38, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x31, 0x37, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, + 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x5f, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -9671,536 +9828,354 @@ 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x47, 0x6f, 0x20, - 0x6f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x74, - 0x6f, 0x20, 0x61, 0x64, 0x64, 0x0a, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x20, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6a, - 0x75, 0x73, 0x74, 0x69, 0x66, 0x79, 0x22, 0x3e, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x63, - 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, 0x32, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x3d, 0x22, 0x68, 0x61, 0x73, 0x5f, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, - 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x3e, 0x5f, 0x6f, 0x66, 0x66, 0x6c, - 0x69, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x78, 0x33, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x6f, 0x67, 0x67, 0x6c, - 0x65, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x72, 0x79, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, + 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x45, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x20, 0x4c, 0x6f, - 0x67, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x70, 0x72, 0x69, 0x73, 0x65, 0x5f, 0x64, 0x6f, + 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x68, 0x69, 0x6e, + 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x70, 0x69, 0x6e, 0x6e, 0x65, 0x72, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x70, - 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, 0x2d, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x63, 0x68, 0x61, + 0x72, 0x73, 0x22, 0x3e, 0x33, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6a, 0x6f, 0x69, 0x6e, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x30, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x2d, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, + 0x3e, 0x35, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x69, 0x7a, - 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, - 0x64, 0x61, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x65, 0x3d, 0x22, 0x77, 0x72, 0x61, 0x70, 0x5f, + 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x77, 0x6f, + 0x72, 0x64, 0x2d, 0x63, 0x68, 0x61, 0x72, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, + 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x30, 0x2e, 0x38, + 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x73, 0x74, - 0x72, 0x6f, 0x79, 0x5f, 0x77, 0x69, 0x74, 0x68, - 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, - 0x74, 0x22, 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x64, - 0x64, 0x20, 0x55, 0x73, 0x65, 0x72, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, - 0x64, 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, - 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6a, 0x6f, 0x69, 0x6e, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2d, 0x68, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x2d, 0x62, 0x61, 0x72, 0x22, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x73, 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x69, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x5f, - 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x43, - 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x22, 0x3e, 0x26, 0x23, 0x78, + 0x32, 0x35, 0x43, 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, + 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x70, + 0x75, 0x74, 0x5f, 0x70, 0x75, 0x72, 0x70, 0x6f, + 0x73, 0x65, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, - 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, - 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, - 0x54, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x6f, 0x72, 0x73, 0x3a, 0x20, 0x54, 0x68, 0x69, - 0x73, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x20, 0x65, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x73, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, - 0x70, 0x75, 0x74, 0x65, 0x72, 0x20, 0x69, 0x6e, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x6f, 0x6d, - 0x61, 0x69, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, - 0x75, 0x73, 0x65, 0x20, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x20, 0x6c, - 0x6f, 0x67, 0x69, 0x6e, 0x73, 0x2e, 0x22, 0x3e, - 0x5f, 0x45, 0x6e, 0x72, 0x6f, 0x6c, 0x6c, 0x3c, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x61, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, - 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x61, 0x6e, - 0x63, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, - 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, - 0x74, 0x65, 0x64, 0x2d, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, - 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, - 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, - 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, - 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, - 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, 0x32, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, - 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, - 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, - 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, + 0x22, 0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, + 0x46, 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, + 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, + 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, + 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, + 0x5f, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x6f, 0x66, + 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x61, 0x72, + 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, + 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x37, 0x31, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x38, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, @@ -10216,109 +10191,148 @@ 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x44, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x20, 0x41, 0x64, 0x6d, - 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x20, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x62, - 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, 0x32, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x45, 0x6e, + 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, + 0x20, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x20, 0x61, + 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x61, 0x6e, + 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e, + 0x67, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, + 0x6c, 0x6c, 0x79, 0x20, 0x6d, 0x61, 0x6e, 0x61, + 0x67, 0x65, 0x64, 0x20, 0x75, 0x73, 0x65, 0x72, + 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x75, + 0x73, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x74, + 0x68, 0x69, 0x73, 0x20, 0x64, 0x65, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x20, 0x59, 0x6f, 0x75, 0x20, + 0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x73, 0x6f, + 0x20, 0x75, 0x73, 0x65, 0x20, 0x74, 0x68, 0x69, + 0x73, 0x20, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x20, 0x63, 0x6f, 0x6d, 0x70, + 0x61, 0x6e, 0x79, 0x20, 0x72, 0x65, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x73, 0x20, 0x6f, 0x6e, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x72, 0x61, 0x70, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x72, + 0x61, 0x70, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x77, 0x6f, 0x72, 0x64, 0x2d, 0x63, 0x68, + 0x61, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, + 0x67, 0x69, 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, + 0x22, 0x3e, 0x35, 0x35, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x31, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, - 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, - 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x79, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x49, 0x6e, 0x20, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, - 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, - 0x69, 0x73, 0x65, 0x20, 0x6c, 0x6f, 0x67, 0x69, - 0x6e, 0x73, 0x2c, 0x20, 0x74, 0x68, 0x69, 0x73, - 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, - 0x72, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x20, - 0x74, 0x6f, 0x20, 0x62, 0x65, 0x0a, 0x65, 0x6e, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x69, - 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x20, 0x50, 0x6c, - 0x65, 0x61, 0x73, 0x65, 0x20, 0x68, 0x61, 0x76, - 0x65, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x69, 0x73, 0x74, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x0a, 0x74, 0x79, 0x70, - 0x65, 0x20, 0x74, 0x68, 0x65, 0x69, 0x72, 0x20, - 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x20, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x20, - 0x68, 0x65, 0x72, 0x65, 0x2e, 0x3c, 0x2f, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x2d, 0x6f, 0x66, 0x66, + 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x73, 0x79, 0x6d, + 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x69, 0x78, 0x65, 0x6c, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x36, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, + 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x65, 0x6e, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, + 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, + 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, @@ -10326,86 +10340,49 @@ 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, - 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x33, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x5f, 0x44, 0x6f, 0x6d, 0x61, - 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, - 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, - 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, - 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x22, 0x3e, 0x6a, 0x6f, 0x69, 0x6e, - 0x2d, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x3c, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x59, 0x6f, 0x75, 0x20, + 0x61, 0x72, 0x65, 0x20, 0x4f, 0x66, 0x66, 0x6c, + 0x69, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, - 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, - 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, 0x66, + 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, + 0x2e, 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, @@ -10416,11 +10393,11 @@ 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, @@ -10433,239 +10410,59 @@ 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, 0x64, - 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, 0x35, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, - 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, - 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, + 0x37, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x34, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x64, 0x6d, 0x69, 0x6e, - 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x20, 0x5f, 0x4e, 0x61, 0x6d, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, - 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, - 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, - 0x6a, 0x6f, 0x69, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, - 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, - 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6a, 0x6f, 0x69, 0x6e, - 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, - 0x3e, 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, 0x46, - 0x3b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, - 0x61, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x59, 0x6f, 0x75, 0x20, 0x6d, 0x75, 0x73, 0x74, + 0x20, 0x62, 0x65, 0x20, 0x6f, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x61, + 0x64, 0x64, 0x20, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x70, 0x72, 0x69, 0x73, 0x65, 0x20, 0x75, 0x73, + 0x65, 0x72, 0x73, 0x2e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, - 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x31, 0x35, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6a, 0x75, 0x73, 0x74, 0x69, + 0x66, 0x79, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x41, 0x64, 0x6d, 0x69, 0x6e, - 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x20, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, - 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x22, 0x3e, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, - 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, - 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, - 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x31, 0x2e, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, @@ -10676,11 +10473,11 @@ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, @@ -10689,13 +10486,67 @@ 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6a, 0x6f, 0x69, 0x6e, 0x2d, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x5f, + 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, + 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, + 0x69, 0x73, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x45, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x20, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, @@ -10707,83 +10558,22 @@ 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x22, 0x3e, - 0x26, 0x23, 0x78, 0x32, 0x35, 0x43, 0x46, 0x3b, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, - 0x61, 0x74, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, - 0x68, 0x61, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x70, 0x75, - 0x72, 0x70, 0x6f, 0x73, 0x65, 0x22, 0x3e, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, @@ -10798,6 +10588,25 @@ 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, @@ -10822,85 +10631,652 @@ 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x5f, 0x73, - 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, + 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x36, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x36, 0x22, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x37, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x22, 0x2f, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x37, 0x22, 0x2f, 0x3e, + 0x61, 0x62, 0x65, 0x6c, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x34, 0x22, 0x2f, 0x3e, 0x3c, + 0x62, 0x65, 0x6c, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x38, 0x22, 0x2f, 0x3e, 0x3c, 0x77, + 0x65, 0x6c, 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x39, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, + 0x6c, 0x33, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x73, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, + 0x6c, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x32, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x33, + 0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, + 0x63, 0x61, 0x6c, 0x2d, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, + 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x76, 0x65, + 0x72, 0x69, 0x66, 0x79, 0x22, 0x2f, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x5f, + 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, + 0x65, 0x5f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, + 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, + 0x73, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, + 0x64, 0x65, 0x22, 0x3e, 0x68, 0x6f, 0x72, 0x69, + 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, + 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x5f, 0x73, 0x74, 0x61, + 0x6e, 0x64, 0x61, 0x72, 0x64, 0x22, 0x2f, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2d, 0x74, 0x79, + 0x70, 0x65, 0x2d, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x69, 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x5f, - 0x73, 0x69, 0x7a, 0x65, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x22, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, - 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x61, - 0x6c, 0x2d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x2d, 0x74, 0x79, 0x70, 0x65, 0x22, 0x2f, - 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x6f, 0x63, 0x61, 0x6c, 0x2d, 0x70, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x2f, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, - 0x63, 0x61, 0x6c, 0x2d, 0x76, 0x65, 0x72, 0x69, - 0x66, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, 0x64, 0x6f, - 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, + 0x70, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x22, + 0x3e, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, + 0x74, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x2d, - 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, 0x2f, 0x3e, - 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, - 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, - 0x2d, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, - 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29 + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, + 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x32, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x5f, 0x65, 0x72, 0x72, + 0x6f, 0x72, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, + 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x30, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x57, 0x02, 0xf9, + 0x87, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x0f, 0xbd, 0x49, + 0x44, 0x41, 0x54, 0x68, 0x81, 0xbd, 0x9a, 0x79, + 0x74, 0x5c, 0xd5, 0x7d, 0xc7, 0x3f, 0xf7, 0xcd, + 0x9b, 0x45, 0xdb, 0xc8, 0xda, 0x25, 0x4b, 0xb6, + 0x64, 0x1b, 0xd9, 0xc2, 0xd8, 0xb1, 0x03, 0x05, + 0xb3, 0x64, 0xa1, 0x71, 0xc9, 0x62, 0x48, 0x4b, + 0x49, 0x49, 0x02, 0x4e, 0xc6, 0xd0, 0x90, 0x23, + 0x38, 0x07, 0x4a, 0x1d, 0x48, 0x70, 0x81, 0x98, + 0x10, 0xd6, 0x10, 0x63, 0x68, 0x9b, 0x06, 0x94, + 0x00, 0x21, 0x53, 0x9b, 0xb2, 0xd3, 0x50, 0xe3, + 0x84, 0xcd, 0xc1, 0xb1, 0xcd, 0x6e, 0x56, 0x19, + 0x6f, 0xd8, 0x42, 0x58, 0xd6, 0x3a, 0x92, 0x66, + 0x34, 0x33, 0x1a, 0xcd, 0xbc, 0xad, 0x7f, 0xfc, + 0xee, 0x68, 0x31, 0x24, 0xd8, 0x40, 0x7b, 0xcf, + 0x79, 0xe7, 0x5a, 0xf3, 0xee, 0xbc, 0xf9, 0x7e, + 0x7f, 0xfb, 0xef, 0xf7, 0xac, 0x3c, 0xcf, 0xe3, + 0xe3, 0xac, 0x68, 0x34, 0xea, 0x07, 0xa6, 0x03, + 0x35, 0xfa, 0xaa, 0x04, 0x12, 0x40, 0x37, 0xd0, + 0x03, 0xf4, 0x44, 0x22, 0x91, 0xdc, 0xc7, 0x7a, + 0xf8, 0x11, 0x2c, 0x75, 0x24, 0x04, 0xa2, 0xd1, + 0x68, 0x35, 0xb0, 0x0c, 0x38, 0x03, 0xf8, 0x32, + 0x50, 0xa2, 0x6f, 0x39, 0x40, 0x5c, 0x5f, 0x2e, + 0x30, 0x0b, 0xf0, 0x01, 0xaf, 0x00, 0x77, 0x01, + 0xf7, 0x47, 0x22, 0x91, 0xe4, 0xa7, 0x07, 0x7b, + 0x62, 0x1d, 0x16, 0x81, 0x68, 0x34, 0x5a, 0x0b, + 0xdc, 0x06, 0x7c, 0x13, 0x30, 0xf4, 0xc7, 0x07, + 0x80, 0x5f, 0x22, 0x12, 0x9f, 0x01, 0x2c, 0x44, + 0x40, 0x6f, 0x07, 0x9e, 0x02, 0x4e, 0x47, 0x08, + 0x7e, 0x0d, 0x21, 0xf4, 0x20, 0x70, 0x4d, 0x24, + 0x12, 0x39, 0xf0, 0xff, 0x46, 0x20, 0x1a, 0x8d, + 0x1a, 0xc0, 0x85, 0x88, 0xc4, 0x9f, 0x02, 0xbe, + 0x01, 0x7c, 0x4e, 0x83, 0x79, 0x10, 0xb8, 0x05, + 0x98, 0x0d, 0xec, 0x01, 0x9e, 0x03, 0xfc, 0x1a, + 0x74, 0x2f, 0x70, 0x03, 0x70, 0x3b, 0x90, 0x04, + 0x36, 0x6b, 0x82, 0x5f, 0x01, 0x2e, 0x8a, 0x44, + 0x22, 0x2f, 0x7c, 0x5a, 0x04, 0x8c, 0x3f, 0x77, + 0x23, 0x1a, 0x8d, 0x06, 0x34, 0xe8, 0x1a, 0x44, + 0xfa, 0xa7, 0x68, 0xf0, 0x0f, 0x00, 0xaf, 0x03, + 0x0f, 0x6b, 0xa0, 0x67, 0x01, 0x6d, 0x40, 0x03, + 0x70, 0x2a, 0xa2, 0x8d, 0x06, 0xe0, 0xfb, 0xc0, + 0xb5, 0xc0, 0x36, 0x44, 0x53, 0x15, 0xc0, 0x09, + 0xc0, 0x9c, 0x68, 0x34, 0xda, 0xfc, 0x7f, 0x4e, + 0x00, 0xf8, 0x57, 0x0d, 0x76, 0x3e, 0xf0, 0x55, + 0xe0, 0x1f, 0x80, 0x3f, 0x01, 0x1d, 0xc0, 0x4d, + 0x88, 0x84, 0x1f, 0xd7, 0x67, 0x2e, 0x43, 0xec, + 0xff, 0x4e, 0xe0, 0x7f, 0xf4, 0xf7, 0x5b, 0x81, + 0x77, 0x80, 0x0b, 0x80, 0xe5, 0xc0, 0x67, 0x80, + 0xff, 0x06, 0x5e, 0x06, 0xb6, 0x44, 0xa3, 0xd1, + 0x53, 0x3e, 0x0d, 0x02, 0x1f, 0x6a, 0x42, 0xd1, + 0x68, 0xb4, 0x15, 0x38, 0x1a, 0xf8, 0xbc, 0x06, + 0x78, 0x25, 0xd0, 0x07, 0xfc, 0x1b, 0xf0, 0x0b, + 0x44, 0xa2, 0x4d, 0x88, 0x43, 0x8f, 0x22, 0xce, + 0x5a, 0x05, 0xd4, 0xe9, 0x73, 0x6f, 0xe9, 0xcf, + 0x5e, 0x02, 0xd6, 0x22, 0xe6, 0xf3, 0x5d, 0xe0, + 0x7c, 0xc0, 0x03, 0x9e, 0x07, 0xfe, 0x11, 0x58, + 0x14, 0x89, 0x44, 0x52, 0x9f, 0x84, 0x80, 0xf9, + 0x21, 0xe0, 0x97, 0x00, 0x97, 0x00, 0x0f, 0x21, + 0x4e, 0x59, 0x0e, 0x94, 0x02, 0xab, 0x81, 0x9f, + 0x01, 0xbf, 0xd7, 0x9f, 0x2d, 0xd3, 0x5f, 0xe9, + 0x46, 0x34, 0xb1, 0x1b, 0x38, 0x49, 0x03, 0xec, + 0x04, 0x2e, 0x42, 0x34, 0x73, 0x15, 0xe2, 0x3b, + 0xf7, 0x02, 0x67, 0x03, 0xf7, 0x03, 0xf7, 0xe9, + 0xdf, 0x5e, 0x05, 0x5c, 0x9d, 0xff, 0xed, 0xd6, + 0xd6, 0x56, 0x1f, 0xe2, 0x6f, 0x8f, 0xb7, 0xb5, + 0xb5, 0x1d, 0x56, 0x78, 0xfc, 0x00, 0x01, 0xe0, + 0x3a, 0x60, 0x0d, 0xf0, 0x1f, 0xc0, 0x0a, 0x0d, + 0xe2, 0x0d, 0x44, 0x23, 0x71, 0xc4, 0x8c, 0x6e, + 0x02, 0xda, 0x81, 0x6b, 0x80, 0x16, 0xc4, 0xbc, + 0x96, 0x30, 0x61, 0x92, 0xef, 0x6b, 0x70, 0x55, + 0xc0, 0xaf, 0x10, 0x69, 0xcf, 0x46, 0x02, 0xc2, + 0x95, 0xc0, 0x8d, 0x88, 0x16, 0xcf, 0x8d, 0x46, + 0xa3, 0xd7, 0x47, 0x22, 0x91, 0xb1, 0xd6, 0xd6, + 0xd6, 0x62, 0xc4, 0x67, 0x8e, 0xd5, 0xdf, 0xbb, + 0xeb, 0x70, 0x08, 0x4c, 0xf1, 0x81, 0x68, 0x34, + 0xda, 0x02, 0x14, 0x23, 0xd1, 0x22, 0x06, 0x6c, + 0x04, 0x3e, 0x8b, 0x44, 0x9c, 0x08, 0x22, 0xbd, + 0x9f, 0x20, 0x66, 0x73, 0x3e, 0x70, 0x29, 0xe2, + 0x0b, 0x0b, 0x80, 0x3f, 0x22, 0xd2, 0xbc, 0x02, + 0x18, 0x06, 0xfe, 0x13, 0x71, 0xf2, 0xeb, 0x11, + 0x7f, 0xfa, 0x39, 0x22, 0xdd, 0x57, 0x81, 0x5a, + 0x7d, 0xe6, 0x68, 0xe0, 0xac, 0x5b, 0x6e, 0xb9, + 0xe5, 0x4b, 0x9a, 0xd0, 0xb1, 0x40, 0xbf, 0x7e, + 0xd6, 0x61, 0xad, 0x43, 0x35, 0xb0, 0x0c, 0x89, + 0x28, 0xbf, 0x00, 0x7e, 0x03, 0xcc, 0x03, 0x82, + 0x48, 0x28, 0x2c, 0x44, 0x42, 0x64, 0x10, 0xf8, + 0x17, 0xc4, 0x1f, 0x4e, 0xd2, 0xdf, 0xdb, 0x0d, + 0xe4, 0x10, 0xe9, 0x06, 0x10, 0x53, 0xdb, 0x07, + 0xac, 0x03, 0xbe, 0xa8, 0x9f, 0x6b, 0x21, 0xbe, + 0xf1, 0x7d, 0x44, 0x8b, 0x47, 0x01, 0x8f, 0xf7, + 0xf6, 0xf6, 0xd6, 0xf6, 0xf7, 0xf7, 0xff, 0x1c, + 0x09, 0xc5, 0xbb, 0x80, 0xab, 0xda, 0xda, 0xda, + 0x86, 0x0e, 0x97, 0xc0, 0xa1, 0x51, 0x68, 0x0c, + 0x18, 0xd0, 0xc4, 0x76, 0x03, 0x27, 0xea, 0xcf, + 0xf3, 0x25, 0xc1, 0x57, 0x11, 0xad, 0x84, 0x35, + 0xf8, 0x04, 0x12, 0x1a, 0xcf, 0x02, 0x7e, 0x8c, + 0x98, 0xc9, 0x36, 0xc4, 0xee, 0x5f, 0xd1, 0xcf, + 0xba, 0x0a, 0x31, 0xa3, 0xd3, 0x81, 0x67, 0x80, + 0xc5, 0xc0, 0x93, 0xc0, 0x29, 0xbb, 0x76, 0xed, + 0x7a, 0xa6, 0xa3, 0xa3, 0xe3, 0x6f, 0x0d, 0xc3, + 0xa8, 0x0b, 0x85, 0x42, 0xef, 0x00, 0xff, 0x7c, + 0x24, 0xe0, 0xa7, 0x10, 0xd0, 0xb5, 0xcd, 0x56, + 0xa4, 0x44, 0x78, 0x82, 0x89, 0xa8, 0x02, 0x10, + 0xd2, 0xfb, 0x4c, 0xe0, 0x47, 0x48, 0x68, 0xf4, + 0x10, 0xe7, 0xbc, 0x0c, 0x71, 0xda, 0x57, 0x91, + 0x2c, 0xdc, 0x8a, 0x38, 0xf6, 0xc5, 0x48, 0x04, + 0x3a, 0x5d, 0x0b, 0xe3, 0xaf, 0x81, 0x9d, 0xc0, + 0x2c, 0xcf, 0xf3, 0x3a, 0x7b, 0x7b, 0x7b, 0x4f, + 0x18, 0x1c, 0x1c, 0x3c, 0x07, 0xf0, 0x57, 0x54, + 0x54, 0xf4, 0x1f, 0x77, 0xdc, 0x71, 0x5d, 0x6d, + 0x6d, 0x6d, 0xd9, 0x23, 0x01, 0x3f, 0x85, 0x00, + 0xf0, 0x77, 0x88, 0x34, 0xbf, 0x82, 0xc4, 0xfa, + 0xa3, 0x99, 0x30, 0xb1, 0x11, 0xbd, 0x1f, 0x00, + 0x8e, 0xd3, 0xe4, 0x7e, 0x87, 0x38, 0xee, 0xb7, + 0x90, 0x78, 0x7f, 0x3f, 0x50, 0x0d, 0x5c, 0x8e, + 0x38, 0x60, 0x3d, 0x12, 0x52, 0x41, 0x7c, 0x64, + 0x0f, 0xb0, 0xdf, 0x75, 0xdd, 0xb2, 0xf6, 0xf6, + 0xf6, 0xb3, 0x62, 0xb1, 0x98, 0xe9, 0xf3, 0xf9, + 0x8c, 0xd9, 0xb3, 0x67, 0x8f, 0xd4, 0xd5, 0xd5, + 0x3d, 0x87, 0xe4, 0x89, 0x23, 0x5e, 0x93, 0x09, + 0xac, 0x00, 0x6c, 0xc4, 0x36, 0x7b, 0x90, 0xe8, + 0x92, 0x27, 0x30, 0xa8, 0xf7, 0xcd, 0x4c, 0xd8, + 0xfd, 0x1a, 0x24, 0xfa, 0xa4, 0x81, 0x33, 0x91, + 0xb0, 0xfb, 0xb0, 0x7e, 0xce, 0x53, 0xfa, 0x8c, + 0x05, 0x1c, 0x04, 0x8e, 0x01, 0xb6, 0xa5, 0xd3, + 0xe9, 0xe6, 0xfd, 0xfb, 0xf7, 0xdb, 0xa3, 0xa3, + 0xa3, 0x2d, 0x3e, 0x9f, 0x8f, 0x8a, 0x8a, 0x8a, + 0x9b, 0x6a, 0x6a, 0x6a, 0xe6, 0x23, 0x9a, 0xf9, + 0xc4, 0x04, 0xe6, 0x23, 0x92, 0x35, 0x35, 0xa8, + 0xb2, 0x49, 0xf7, 0xfb, 0xf5, 0xbe, 0x05, 0x29, + 0xa1, 0x53, 0x40, 0x17, 0x12, 0xa1, 0x7e, 0x0f, + 0x2c, 0x02, 0x6e, 0x46, 0x42, 0xab, 0x1f, 0x31, + 0x2f, 0x10, 0xc7, 0x4f, 0x00, 0x8d, 0x3b, 0x77, + 0xee, 0x7c, 0xa8, 0xb3, 0xb3, 0xf3, 0xe6, 0x74, + 0x3a, 0x3d, 0x62, 0x9a, 0xe6, 0xe0, 0x9c, 0x39, + 0x73, 0x68, 0x6e, 0x6e, 0xde, 0x8d, 0xe4, 0x94, + 0x83, 0xc0, 0xdc, 0x68, 0x34, 0x1a, 0xfc, 0x58, + 0x04, 0x74, 0xd1, 0x36, 0x43, 0x03, 0x03, 0x29, + 0x89, 0xfd, 0x93, 0x08, 0x14, 0xe9, 0xbd, 0x1b, + 0xf1, 0x8b, 0x57, 0x90, 0xe8, 0x02, 0xf0, 0x18, + 0x62, 0xe7, 0xa3, 0x48, 0x78, 0x04, 0x28, 0xd0, + 0x7b, 0x0e, 0xc8, 0x0e, 0x0d, 0x0d, 0x15, 0x24, + 0x93, 0xc9, 0x7f, 0x77, 0x5d, 0xb7, 0xcc, 0x34, + 0xcd, 0xb7, 0x16, 0x2c, 0x58, 0xf0, 0x60, 0x20, + 0x10, 0xc8, 0x9f, 0x2b, 0x46, 0xea, 0x24, 0x93, + 0x09, 0x5f, 0x3b, 0xec, 0x95, 0x37, 0x91, 0x3a, + 0x0d, 0x78, 0x3f, 0x22, 0x3d, 0x57, 0xdf, 0xcb, + 0x13, 0x28, 0xd3, 0xbb, 0xa5, 0xcf, 0x6e, 0x44, + 0x7c, 0xc4, 0x46, 0x42, 0xe2, 0x9d, 0x48, 0xd8, + 0xad, 0x3f, 0xe4, 0xfc, 0xce, 0x81, 0x81, 0x81, + 0xb9, 0x5d, 0x5d, 0x5d, 0x23, 0x7e, 0xbf, 0x5f, + 0x4d, 0x9b, 0x36, 0x6d, 0xb4, 0xbe, 0xbe, 0x7e, + 0xb3, 0x52, 0x6a, 0x9a, 0xbe, 0x5f, 0xad, 0xf7, + 0x72, 0xa0, 0x2b, 0x12, 0x89, 0x24, 0x8e, 0x94, + 0x40, 0x1e, 0x60, 0x93, 0xde, 0xc7, 0x10, 0x73, + 0x71, 0x99, 0x88, 0xff, 0x00, 0xf9, 0x1f, 0xb4, + 0x11, 0x29, 0xf7, 0x21, 0x39, 0x62, 0x33, 0x52, + 0x76, 0x94, 0x20, 0xe5, 0xf4, 0x69, 0x88, 0xa3, + 0xcf, 0xf6, 0x3c, 0xcf, 0xdb, 0xbe, 0x7d, 0xfb, + 0x59, 0x7d, 0x7d, 0x7d, 0x45, 0xae, 0xeb, 0xa6, + 0x1a, 0x1a, 0x1a, 0xc2, 0x0d, 0x0d, 0x0d, 0x6b, + 0x95, 0x52, 0xc7, 0x4f, 0x7a, 0x5e, 0xa9, 0xde, + 0xbf, 0x0c, 0xbc, 0x1e, 0x8d, 0x46, 0xf3, 0x02, + 0x38, 0xec, 0x95, 0xd7, 0x40, 0xa3, 0xde, 0x17, + 0x69, 0x00, 0x15, 0x1a, 0xd4, 0xa8, 0xfe, 0x3c, + 0x2f, 0xd1, 0x12, 0xfd, 0x9d, 0x18, 0xf0, 0x57, + 0x80, 0x02, 0x96, 0x02, 0xff, 0x05, 0xfc, 0x3d, + 0x92, 0x1f, 0x6e, 0xb5, 0x6d, 0x7b, 0x69, 0x67, + 0x67, 0x67, 0x02, 0xf8, 0x96, 0x61, 0x18, 0x54, + 0x55, 0x55, 0xfd, 0xb2, 0xaa, 0xaa, 0xea, 0x36, + 0xc4, 0x87, 0x4e, 0x65, 0x6c, 0xac, 0x56, 0xbd, + 0xfd, 0x76, 0x8f, 0xda, 0xb4, 0x69, 0x25, 0x45, + 0x45, 0x10, 0x8f, 0x2f, 0x56, 0x89, 0x44, 0xb5, + 0x17, 0x0a, 0xfd, 0x61, 0xfd, 0x8a, 0x15, 0x4f, + 0x03, 0x4f, 0x03, 0x9b, 0x96, 0x7b, 0xde, 0x47, + 0x86, 0xd5, 0x3c, 0x81, 0xbc, 0xf3, 0x9c, 0x82, + 0x54, 0x90, 0xf9, 0x2f, 0x66, 0xf4, 0x9e, 0xb7, + 0xe9, 0x42, 0xbd, 0x7f, 0x09, 0xf1, 0x19, 0x90, + 0x32, 0xe3, 0x01, 0xc4, 0x17, 0xc6, 0x06, 0x07, + 0x07, 0xdf, 0x1e, 0x1a, 0x1a, 0xba, 0x36, 0x99, + 0x4c, 0x76, 0x16, 0x16, 0x16, 0x4e, 0x6f, 0x6c, + 0x6c, 0x7c, 0xb3, 0xb0, 0xb0, 0x30, 0x01, 0xec, + 0x22, 0x93, 0x69, 0x31, 0xee, 0xbd, 0xb7, 0x58, + 0x6d, 0xdf, 0xbe, 0x02, 0xcb, 0x32, 0x80, 0x3a, + 0xc3, 0x30, 0x08, 0x05, 0x4c, 0x14, 0x4c, 0xcf, + 0x0c, 0x58, 0x75, 0xae, 0x84, 0xdc, 0x95, 0x40, + 0x7a, 0xbd, 0x52, 0xb7, 0x01, 0x3f, 0x5d, 0xee, + 0x79, 0xd6, 0x47, 0x11, 0x48, 0x22, 0x66, 0x71, + 0x32, 0xd2, 0x36, 0x9e, 0x08, 0x0c, 0x21, 0xce, + 0xbb, 0x73, 0xd2, 0xb9, 0xbc, 0x93, 0x9f, 0x8e, + 0x64, 0xd9, 0xd5, 0x48, 0xf6, 0x7d, 0x14, 0xe8, + 0xef, 0xe9, 0xe9, 0xb9, 0x7e, 0x70, 0x70, 0xf0, + 0x57, 0x80, 0xeb, 0xf7, 0xfb, 0x7b, 0x9a, 0x9b, + 0x9b, 0x1b, 0x4d, 0xd3, 0xbc, 0x0f, 0x38, 0x47, + 0xbd, 0xfe, 0xfa, 0x16, 0x63, 0xfd, 0xfa, 0x1b, + 0x19, 0x18, 0x28, 0x2a, 0x2b, 0x0a, 0x51, 0x5e, + 0x5a, 0x48, 0x71, 0x30, 0x80, 0x3f, 0xe8, 0x47, + 0x19, 0x62, 0xc9, 0x9e, 0xeb, 0x2a, 0x2b, 0x67, + 0x91, 0x1a, 0xb3, 0x18, 0xca, 0x64, 0x8b, 0x86, + 0xd3, 0x99, 0xab, 0x81, 0x33, 0xd6, 0x2b, 0xf5, + 0x9d, 0xe5, 0x9e, 0xb7, 0xe3, 0x2f, 0x11, 0x48, + 0x21, 0xce, 0x78, 0x36, 0x52, 0xc3, 0x5c, 0x00, + 0xfc, 0x01, 0xc9, 0x9e, 0xcf, 0x21, 0x13, 0x87, + 0x1e, 0x26, 0xa2, 0x51, 0x0f, 0x52, 0xdf, 0xaf, + 0x41, 0x4c, 0x69, 0xeb, 0xae, 0x5d, 0xbb, 0xd6, + 0xe5, 0x72, 0xb9, 0x5b, 0x0c, 0xc3, 0x08, 0x9b, + 0xa6, 0xf9, 0xec, 0xdc, 0xb9, 0x73, 0xeb, 0x0c, + 0xc3, 0x80, 0x5c, 0x6e, 0xb7, 0x7a, 0xf2, 0xc9, + 0x9b, 0x8d, 0x47, 0x1e, 0x71, 0x4c, 0x9f, 0x61, + 0x36, 0xd5, 0x96, 0x53, 0x16, 0x2e, 0xc6, 0xac, + 0x9d, 0x8e, 0x59, 0x37, 0x1d, 0xa3, 0xb4, 0x0c, + 0x15, 0x16, 0x57, 0xf0, 0x46, 0x12, 0xb8, 0x89, + 0x61, 0x0a, 0x7b, 0xba, 0x29, 0xef, 0xed, 0x66, + 0x78, 0x24, 0xc5, 0x7b, 0x03, 0xf1, 0x45, 0xb6, + 0xe3, 0xbe, 0xb6, 0x5e, 0xa9, 0x2b, 0x81, 0xdb, + 0x96, 0x7b, 0x9e, 0xfb, 0xe7, 0x08, 0xec, 0x43, + 0x4c, 0xe7, 0x58, 0x24, 0xdb, 0xde, 0x8a, 0x64, + 0xd4, 0x5f, 0x23, 0x65, 0xc1, 0x5e, 0xa0, 0x19, + 0x49, 0x6a, 0xdf, 0x01, 0xee, 0x01, 0xe6, 0x00, + 0xb7, 0xbf, 0xf9, 0xe6, 0x9b, 0x83, 0x4a, 0xa9, + 0xb5, 0x86, 0x61, 0x14, 0x86, 0xc3, 0xe1, 0xe7, + 0x67, 0xce, 0x9c, 0xb9, 0x15, 0x29, 0xb5, 0x1f, + 0x30, 0xee, 0xbe, 0xfb, 0x0e, 0xf5, 0xe2, 0x8b, + 0xaa, 0xac, 0x28, 0xe4, 0x6b, 0xac, 0x9c, 0x46, + 0xc1, 0x8c, 0x19, 0x98, 0x73, 0x8f, 0x81, 0x90, + 0x58, 0xa3, 0x1b, 0x0c, 0x12, 0x38, 0x66, 0x21, + 0x4e, 0x32, 0x89, 0xbb, 0x7b, 0x37, 0x54, 0xd4, + 0x62, 0x56, 0xd4, 0x62, 0x1e, 0xd5, 0x42, 0xe5, + 0x9e, 0x1d, 0x14, 0x87, 0x0e, 0xa8, 0xce, 0x81, + 0x84, 0x7f, 0x38, 0x9d, 0x59, 0x83, 0xb4, 0xaa, + 0x2b, 0x27, 0x13, 0xc8, 0x47, 0xa1, 0x24, 0x12, + 0x19, 0xfa, 0xf5, 0xa1, 0xf9, 0x48, 0x0c, 0x0f, + 0x20, 0xfd, 0xef, 0x89, 0x48, 0x3d, 0xf3, 0x39, + 0xa4, 0xbe, 0xf9, 0x31, 0xd0, 0x60, 0xdb, 0xf6, + 0x05, 0xed, 0xed, 0xed, 0x33, 0x0c, 0xc3, 0xf8, + 0x89, 0xcf, 0xe7, 0x2b, 0x28, 0x2f, 0x2f, 0x8f, + 0xce, 0x9c, 0x39, 0xf3, 0x31, 0x0d, 0xbe, 0x4f, + 0x6d, 0xda, 0x34, 0xa6, 0x5e, 0x7c, 0xb1, 0xae, + 0x3a, 0x5c, 0xc4, 0x9c, 0x9a, 0x72, 0x15, 0xa8, + 0x9f, 0x81, 0x31, 0x6b, 0x1e, 0xae, 0xe5, 0xe0, + 0x26, 0x93, 0x38, 0x89, 0x04, 0xe6, 0xf1, 0xc7, + 0x53, 0x7b, 0xde, 0x79, 0xd4, 0x5f, 0x72, 0x09, + 0xb9, 0x9a, 0x1a, 0xdc, 0x64, 0x52, 0x2e, 0xcb, + 0xc1, 0x6c, 0x9a, 0x47, 0xb0, 0xae, 0x81, 0x39, + 0x35, 0x65, 0xaa, 0x3a, 0x5c, 0x04, 0x70, 0xe9, + 0x7a, 0xa5, 0x4e, 0xfe, 0x4b, 0x04, 0x62, 0x48, + 0x32, 0xd9, 0x87, 0xc4, 0xf9, 0xbc, 0xd4, 0x4d, + 0xa4, 0x0d, 0x5c, 0x0c, 0xbc, 0x09, 0x2c, 0x4d, + 0xa5, 0x52, 0xe7, 0xef, 0xdd, 0xbb, 0xf7, 0x72, + 0xe0, 0x1b, 0x86, 0x61, 0x64, 0xab, 0xaa, 0xaa, + 0x56, 0x4f, 0x9f, 0x3e, 0xbd, 0x0e, 0xa9, 0xfb, + 0x07, 0x19, 0x1a, 0xba, 0xca, 0x78, 0xe2, 0x89, + 0x48, 0x30, 0xe0, 0xa7, 0xbe, 0x22, 0x8c, 0x93, + 0x73, 0x31, 0xaa, 0xeb, 0x71, 0x92, 0x29, 0x9c, + 0x64, 0x12, 0x27, 0x99, 0x24, 0xd5, 0xdd, 0xcd, + 0xb4, 0x25, 0x4b, 0xc6, 0xc1, 0x84, 0x1a, 0x1b, + 0xb1, 0x86, 0x87, 0xc7, 0xef, 0xdb, 0xa9, 0x14, + 0xaa, 0xa6, 0x01, 0x27, 0xeb, 0x50, 0x5f, 0x11, + 0x26, 0xe8, 0x37, 0x3d, 0xe0, 0xde, 0xf5, 0x4a, + 0x8d, 0x27, 0xbc, 0xbc, 0x09, 0x75, 0x22, 0x51, + 0xe5, 0x80, 0x26, 0xb3, 0x5b, 0x9b, 0xd1, 0x1b, + 0xc0, 0x5c, 0x24, 0xb9, 0x25, 0x11, 0x67, 0x6d, + 0x4d, 0xa5, 0x52, 0x0f, 0x75, 0x74, 0x74, 0xdc, + 0xa4, 0x94, 0x6a, 0x04, 0xf6, 0x36, 0x35, 0x35, + 0x3d, 0x56, 0x54, 0x54, 0xb4, 0x0a, 0xf1, 0x91, + 0xd7, 0x80, 0x4b, 0x8d, 0x47, 0x1f, 0x7d, 0x84, + 0x58, 0x4c, 0x35, 0x4d, 0xaf, 0x44, 0xd9, 0x0e, + 0x8e, 0x59, 0x88, 0x93, 0x9c, 0x3a, 0xdb, 0x1a, + 0x8b, 0xc7, 0x71, 0xad, 0x89, 0x00, 0x63, 0x16, + 0x17, 0x33, 0x36, 0x34, 0x44, 0xb0, 0xa0, 0x60, + 0xca, 0x39, 0xc7, 0x1f, 0xc2, 0xb4, 0x46, 0x69, + 0xaa, 0x9a, 0x66, 0xec, 0xee, 0x8e, 0x35, 0x23, + 0x9d, 0xdb, 0x15, 0xe3, 0x1a, 0x88, 0x44, 0x22, + 0x0e, 0x32, 0x5d, 0xdb, 0x88, 0x24, 0xab, 0xb0, + 0xfe, 0x7b, 0x27, 0x32, 0x94, 0x8a, 0x23, 0xe1, + 0xed, 0xb9, 0x91, 0x91, 0x91, 0xcf, 0xef, 0xd9, + 0xb3, 0x67, 0xb1, 0x52, 0xaa, 0xd1, 0xf3, 0xbc, + 0xa7, 0x5b, 0x5a, 0x5a, 0x5e, 0x29, 0x2a, 0x2a, + 0xfa, 0x11, 0x12, 0xb5, 0x22, 0xc0, 0xad, 0xaa, + 0xab, 0xeb, 0x31, 0xb5, 0x75, 0x6b, 0x75, 0x75, + 0xb8, 0x88, 0x92, 0x50, 0x80, 0xb1, 0xfe, 0x38, + 0x76, 0x22, 0x81, 0x3b, 0x32, 0x32, 0xe5, 0x52, + 0x99, 0x0c, 0x6e, 0x3a, 0x3d, 0x0e, 0xd4, 0x4e, + 0x26, 0x71, 0x53, 0xa9, 0x0f, 0x9c, 0x73, 0x12, + 0x23, 0x64, 0xfb, 0xe3, 0x94, 0x84, 0x02, 0x54, + 0x85, 0x8b, 0x3c, 0xe0, 0xf2, 0xf5, 0x4a, 0xcd, + 0x9e, 0x6c, 0x42, 0x68, 0xc9, 0x0d, 0x20, 0xb1, + 0x7f, 0x01, 0xd2, 0xd7, 0x16, 0x20, 0x6d, 0xa1, + 0x03, 0x6c, 0xee, 0xed, 0xed, 0x5d, 0xb5, 0x77, + 0xef, 0xde, 0x98, 0xdf, 0xef, 0x9f, 0x15, 0x0a, + 0x85, 0x36, 0x2d, 0x58, 0xb0, 0xe0, 0x65, 0xd3, + 0x34, 0xcf, 0x05, 0x76, 0x20, 0xe5, 0xf8, 0x25, + 0xc0, 0x3a, 0xf5, 0xc4, 0x13, 0xed, 0x78, 0x1e, + 0xd5, 0xe1, 0x42, 0xec, 0xe4, 0x28, 0x6e, 0x36, + 0x87, 0x13, 0x8f, 0x63, 0xc7, 0xe3, 0xe3, 0xe6, + 0xe1, 0x24, 0x93, 0x78, 0x99, 0x0c, 0x56, 0x3c, + 0x3e, 0x0e, 0x20, 0xdb, 0xdb, 0x8b, 0x37, 0x3a, + 0x3a, 0xe5, 0x8c, 0x1d, 0x8f, 0xe3, 0xc4, 0xe3, + 0x38, 0x39, 0x0b, 0x6b, 0x24, 0x4d, 0x4d, 0xb8, + 0x50, 0x69, 0xdc, 0x67, 0x1e, 0x4a, 0xe0, 0x65, + 0xc4, 0x7e, 0x9f, 0x47, 0x9c, 0xf7, 0x34, 0xa4, + 0xc4, 0xd8, 0xea, 0x79, 0x9e, 0xd1, 0xd1, 0xd1, + 0xb1, 0xb6, 0xbf, 0xbf, 0x7f, 0x0e, 0x40, 0x6d, + 0x6d, 0xad, 0x73, 0xd4, 0x51, 0x47, 0xdd, 0xa7, + 0x94, 0xba, 0x4a, 0x9b, 0xd9, 0x45, 0x48, 0x7f, + 0x30, 0x17, 0x38, 0x43, 0xed, 0xd9, 0xd3, 0x6c, + 0x1a, 0x06, 0xa1, 0x80, 0x1f, 0x3b, 0xa3, 0x73, + 0xa2, 0xe7, 0x91, 0xeb, 0xe8, 0x10, 0x30, 0x93, + 0x09, 0x0c, 0x0e, 0x8e, 0x03, 0xc8, 0x76, 0x77, + 0xa3, 0x26, 0x13, 0x88, 0xc7, 0xc9, 0x75, 0x74, + 0x80, 0x1e, 0xfd, 0x38, 0x99, 0x1c, 0xc1, 0x80, + 0x1f, 0x53, 0x29, 0x17, 0xf8, 0x3a, 0x4c, 0xed, + 0x89, 0x5f, 0x41, 0x92, 0xd2, 0x75, 0xc0, 0xdd, + 0xc0, 0x0f, 0x80, 0xd9, 0x89, 0x44, 0xe2, 0xa7, + 0x43, 0x43, 0x43, 0xa5, 0xc9, 0x64, 0x72, 0xee, + 0xd8, 0xd8, 0xd8, 0x8e, 0x79, 0xf3, 0xe6, 0xcd, + 0x29, 0x2d, 0x2d, 0x7d, 0x0f, 0x99, 0xd6, 0xbd, + 0x0a, 0xfc, 0x10, 0xe9, 0x03, 0x02, 0x48, 0xcb, + 0x79, 0x0e, 0x89, 0x44, 0x7d, 0xd8, 0xef, 0x03, + 0xc0, 0xcd, 0x4e, 0xd8, 0xb8, 0x67, 0xdb, 0x58, + 0x7d, 0x7d, 0xa8, 0x40, 0x00, 0x23, 0x10, 0x10, + 0x52, 0x93, 0x08, 0x8c, 0x75, 0x75, 0x61, 0xa4, + 0x52, 0x78, 0x9e, 0x87, 0x9b, 0xcb, 0xe1, 0xe5, + 0x72, 0xe3, 0xe0, 0x01, 0x9c, 0x9c, 0x85, 0x02, + 0xc2, 0x01, 0xd3, 0x18, 0xca, 0x5a, 0x8b, 0xa7, + 0x68, 0x20, 0x12, 0x89, 0xbc, 0x8b, 0xb4, 0x87, + 0xf3, 0x91, 0x62, 0xee, 0xbb, 0xd9, 0x6c, 0xf6, + 0x60, 0x67, 0x67, 0xe7, 0x6f, 0xfb, 0xfb, 0xfb, + 0xdf, 0xb0, 0x6d, 0xbb, 0x7d, 0xe1, 0xc2, 0x85, + 0x4d, 0xa5, 0xa5, 0xa5, 0x15, 0x5a, 0x33, 0xeb, + 0x90, 0x49, 0xc2, 0x23, 0x48, 0xc7, 0x76, 0x32, + 0xf0, 0x3d, 0x32, 0x99, 0x7f, 0xc2, 0xb2, 0x08, + 0x05, 0xfc, 0x02, 0xc4, 0xb2, 0x99, 0xb2, 0x3c, + 0x0f, 0x2f, 0x9b, 0x15, 0x0d, 0xa4, 0x52, 0x58, + 0xb1, 0xd8, 0x84, 0x06, 0xba, 0xba, 0x70, 0x46, + 0x46, 0xe4, 0x5e, 0x36, 0x3b, 0x05, 0x3c, 0x80, + 0x67, 0xd9, 0xe0, 0x79, 0x84, 0x82, 0x01, 0x80, + 0x69, 0xeb, 0x95, 0x0a, 0x1e, 0x3a, 0x95, 0xa8, + 0x06, 0x9e, 0x05, 0xde, 0xed, 0xeb, 0xeb, 0xab, + 0xeb, 0xea, 0xea, 0x1a, 0x74, 0x5d, 0x37, 0xe4, + 0xf7, 0xfb, 0xdf, 0x6f, 0x69, 0x69, 0xd9, 0x58, + 0x50, 0x50, 0xe0, 0xd3, 0xa4, 0x73, 0xc0, 0xb7, + 0x11, 0xd3, 0xd9, 0x84, 0x64, 0xf0, 0xd5, 0xc0, + 0xf7, 0x54, 0x47, 0xc7, 0xcd, 0xc0, 0xaa, 0x40, + 0xc0, 0x94, 0x1f, 0xfc, 0x90, 0xa5, 0x14, 0x28, + 0x03, 0x4c, 0x05, 0xd6, 0xf0, 0x44, 0x0f, 0xef, + 0xf6, 0xf7, 0x60, 0xfa, 0x05, 0xb7, 0xe7, 0x81, + 0xe7, 0x7e, 0x80, 0x03, 0xae, 0x65, 0x13, 0x08, + 0x8c, 0xc3, 0xae, 0x3c, 0x94, 0xc0, 0x3a, 0xe0, + 0x9a, 0xa1, 0xa1, 0xa1, 0x8b, 0x62, 0xb1, 0x58, + 0x65, 0x30, 0x18, 0x24, 0x1c, 0x0e, 0xd3, 0xd0, + 0xd0, 0xb0, 0xc0, 0x30, 0x8c, 0x65, 0x4c, 0x24, + 0xb7, 0x1c, 0xf0, 0x02, 0xd2, 0xe0, 0x6f, 0x45, + 0x0a, 0x3a, 0x1b, 0x38, 0xd9, 0x2b, 0x2f, 0x3f, + 0x15, 0xc0, 0xb2, 0x1c, 0x8c, 0x92, 0xa9, 0x8f, + 0x57, 0x0a, 0x0c, 0x1f, 0x18, 0x86, 0x5c, 0x9e, + 0x01, 0x99, 0x7d, 0x7b, 0x00, 0x70, 0x52, 0x29, + 0xbc, 0xfe, 0x6e, 0xfc, 0x81, 0x09, 0xf0, 0x6e, + 0xfe, 0x72, 0x26, 0x88, 0x18, 0xa6, 0x89, 0x65, + 0xe5, 0x8b, 0x64, 0x86, 0xa7, 0xfc, 0xc2, 0xb6, + 0x6d, 0xdb, 0x76, 0x94, 0x95, 0x95, 0xbd, 0x37, + 0x3a, 0x3a, 0x1a, 0x03, 0x86, 0x4a, 0x4a, 0x4a, + 0x36, 0xcf, 0x98, 0x31, 0xe3, 0x11, 0xa5, 0xd4, + 0x22, 0xa4, 0x59, 0xaf, 0x42, 0x66, 0x37, 0x37, + 0x20, 0x2d, 0x65, 0x19, 0x32, 0x04, 0x58, 0x87, + 0x44, 0xac, 0xb5, 0xd4, 0xd6, 0x9e, 0x84, 0xcf, + 0xc7, 0x58, 0x36, 0x07, 0x86, 0xc2, 0xf0, 0x9b, + 0xb8, 0x96, 0x8d, 0xcf, 0x27, 0xe0, 0xf3, 0xbb, + 0x61, 0x08, 0xa1, 0xc4, 0x4b, 0xdb, 0xc8, 0x1e, + 0xec, 0x62, 0x78, 0xd3, 0x33, 0x04, 0x0d, 0x07, + 0xbf, 0x7f, 0x42, 0xf2, 0xae, 0x23, 0x04, 0x1c, + 0x03, 0x1c, 0x07, 0x50, 0x3e, 0x30, 0x14, 0x19, + 0xf1, 0xab, 0xd4, 0x72, 0xcf, 0x1b, 0x1d, 0x27, + 0xd0, 0xda, 0xda, 0x1a, 0x04, 0x56, 0x8d, 0x8e, + 0x8e, 0x9e, 0x11, 0x08, 0x04, 0xaa, 0x6b, 0x6a, + 0x6a, 0x5e, 0xaa, 0xa9, 0xa9, 0xc9, 0x20, 0xe5, + 0xc3, 0xe3, 0x88, 0xbd, 0x5f, 0x8c, 0xd4, 0xfd, + 0xb7, 0x23, 0x3d, 0xc3, 0xa1, 0xab, 0x1d, 0x58, + 0x49, 0x20, 0xb0, 0x32, 0x99, 0xcd, 0xce, 0x04, + 0x30, 0x82, 0x7e, 0x94, 0x27, 0x04, 0x7c, 0xe6, + 0x54, 0x02, 0x86, 0x01, 0xa1, 0x4c, 0x9c, 0x97, + 0x16, 0xce, 0xc1, 0xcd, 0xe5, 0xa8, 0x29, 0x00, + 0xbf, 0x6f, 0x92, 0xf4, 0x7d, 0x42, 0x42, 0x69, + 0xb2, 0x04, 0xfd, 0x00, 0x24, 0xb3, 0x96, 0x8b, + 0x24, 0x5b, 0x89, 0x42, 0xad, 0xad, 0xad, 0xe5, + 0x5a, 0xaa, 0x2d, 0xd9, 0x6c, 0x76, 0x6f, 0x53, + 0x53, 0xd3, 0x86, 0xca, 0xca, 0xca, 0xb0, 0x96, + 0xf8, 0x2c, 0x4d, 0xa2, 0x18, 0x69, 0xd0, 0xdb, + 0x91, 0x84, 0x97, 0x60, 0xa2, 0x81, 0xcf, 0x6a, + 0x13, 0x5a, 0x04, 0xfc, 0xd0, 0x5b, 0xba, 0x74, + 0x7a, 0x6e, 0xc3, 0x06, 0x72, 0x39, 0x0b, 0x7f, + 0x61, 0x00, 0xc7, 0xca, 0xe0, 0x33, 0xc1, 0x9c, + 0x44, 0x20, 0xbf, 0xd7, 0x05, 0x21, 0x6d, 0xe7, + 0x08, 0x14, 0x42, 0xc0, 0x98, 0x6a, 0x3e, 0x8e, + 0x03, 0xae, 0xd2, 0xe0, 0x01, 0x5f, 0x61, 0x90, + 0x9c, 0x65, 0x63, 0x79, 0x9e, 0x81, 0x1e, 0xe3, + 0x9b, 0xad, 0xad, 0xad, 0x0a, 0x99, 0x28, 0x34, + 0x6b, 0xb3, 0x58, 0x55, 0x59, 0x59, 0xb9, 0x08, + 0xf8, 0x02, 0xf0, 0x2e, 0x52, 0x7d, 0x5a, 0xfa, + 0x0a, 0x22, 0x6d, 0x60, 0xad, 0xbe, 0xdf, 0x82, + 0x74, 0x73, 0xf9, 0x46, 0x07, 0x00, 0xef, 0xd8, + 0x63, 0x51, 0x1b, 0x36, 0x10, 0x4b, 0x67, 0x98, + 0x51, 0x19, 0xc6, 0xce, 0x8e, 0xa2, 0x3c, 0x6b, + 0x42, 0x0b, 0x93, 0x88, 0x78, 0x9f, 0x59, 0xc2, + 0xf4, 0x2b, 0x7e, 0x86, 0x33, 0xd0, 0xcb, 0xe8, + 0xf5, 0x97, 0x62, 0x0e, 0xf5, 0x8d, 0xdb, 0xbd, + 0x32, 0xc0, 0xd1, 0xe0, 0xf1, 0x99, 0x98, 0xa5, + 0x45, 0x74, 0x0f, 0xe4, 0x47, 0x54, 0xfc, 0x0e, + 0xf4, 0xfb, 0x81, 0xd6, 0xd6, 0xd6, 0x85, 0xc8, + 0x4b, 0x88, 0x1b, 0xda, 0xda, 0xda, 0x92, 0x00, + 0xd1, 0x68, 0xf4, 0x06, 0xa4, 0xb9, 0xa9, 0x43, + 0x6a, 0x1c, 0x0f, 0xc9, 0xd4, 0x07, 0x0e, 0xb9, + 0xde, 0x47, 0x86, 0x01, 0xbd, 0x5a, 0x23, 0x41, + 0xa0, 0xdb, 0x77, 0xe1, 0x85, 0x0f, 0x93, 0xc9, + 0xfc, 0xcd, 0xc2, 0xc6, 0x2a, 0x8a, 0xfc, 0xe0, + 0x0d, 0x0d, 0xe0, 0xf3, 0x69, 0x2d, 0xe8, 0xcb, + 0x55, 0x50, 0xf8, 0x9b, 0x67, 0x28, 0xfd, 0xc2, + 0x52, 0x00, 0xba, 0x6f, 0xbd, 0x8e, 0xd0, 0xaf, + 0x57, 0xe3, 0x3a, 0x22, 0x7d, 0xc7, 0x96, 0xcb, + 0xb6, 0x81, 0xb2, 0x4a, 0x52, 0x96, 0xe2, 0xad, + 0x8e, 0x01, 0x80, 0x07, 0x96, 0x7b, 0xde, 0xb7, + 0xc7, 0x4d, 0xa8, 0xad, 0xad, 0xed, 0x6d, 0x64, + 0x1c, 0x3e, 0x79, 0xdd, 0x89, 0xd4, 0x42, 0x47, + 0x23, 0xf6, 0x9e, 0xd2, 0x92, 0x77, 0x90, 0xe6, + 0xdf, 0x43, 0x4a, 0x8e, 0x4b, 0x90, 0x42, 0xd0, + 0xd3, 0x64, 0x76, 0x01, 0x7b, 0x9d, 0x6b, 0xaf, + 0x1d, 0xf6, 0xad, 0x5e, 0x6d, 0xef, 0xeb, 0x8b, + 0x9b, 0x8b, 0x66, 0x55, 0x61, 0x94, 0x14, 0x63, + 0x8c, 0xa5, 0xc6, 0xcd, 0xc7, 0xe7, 0x83, 0x74, + 0x0e, 0xd4, 0xee, 0x1d, 0xe3, 0x04, 0x46, 0xf7, + 0xee, 0xc4, 0xe7, 0xc1, 0x78, 0x70, 0xd7, 0xe1, + 0xd4, 0x0c, 0x15, 0x63, 0x07, 0x02, 0xbc, 0xdb, + 0xd9, 0xef, 0x22, 0x35, 0xd7, 0xc5, 0x79, 0x90, + 0x1f, 0xf5, 0x92, 0xef, 0x6b, 0x88, 0xad, 0xf9, + 0x90, 0xf1, 0xe1, 0x4e, 0xc4, 0xa4, 0xf2, 0xd3, + 0xea, 0x0c, 0x32, 0x3a, 0x0f, 0x22, 0x73, 0xa2, + 0xf9, 0xc8, 0xb4, 0x62, 0x2e, 0x30, 0x53, 0x6d, + 0xd9, 0x92, 0x35, 0xee, 0xba, 0xab, 0xa4, 0xb1, + 0xaa, 0x98, 0x99, 0xb5, 0x61, 0x54, 0x36, 0x85, + 0x6f, 0x2c, 0x89, 0x69, 0x7a, 0x98, 0x7e, 0xd1, + 0xc0, 0x7b, 0xe9, 0x10, 0xd3, 0x4e, 0x5b, 0x86, + 0x33, 0x32, 0x4c, 0xfa, 0xf9, 0xe7, 0x98, 0x57, + 0xe9, 0xe1, 0x38, 0x60, 0x5b, 0x60, 0x3b, 0x0a, + 0xdb, 0x5f, 0x82, 0x1b, 0x2c, 0xe6, 0xbd, 0x9e, + 0x11, 0x3a, 0xfb, 0x53, 0x00, 0x67, 0x2f, 0xf7, + 0xbc, 0x87, 0x0f, 0x8b, 0x80, 0x26, 0xf1, 0x79, + 0x2d, 0xf5, 0x13, 0x90, 0xfa, 0x63, 0x26, 0x62, + 0x56, 0x0a, 0xe9, 0x1f, 0x62, 0x9a, 0x54, 0x0c, + 0xa9, 0x5a, 0x93, 0x48, 0x66, 0x4e, 0x02, 0x23, + 0xc6, 0xaa, 0x55, 0x97, 0xa9, 0x9e, 0x9e, 0x05, + 0x0d, 0x15, 0x85, 0x34, 0xd5, 0x97, 0x12, 0xc0, + 0xc1, 0x97, 0x19, 0xc6, 0x34, 0x2c, 0x4c, 0x13, + 0xd2, 0x36, 0xc4, 0xc7, 0x20, 0x60, 0x42, 0x79, + 0x21, 0x04, 0x7d, 0x02, 0xde, 0xf2, 0x4c, 0xac, + 0x60, 0x19, 0xb6, 0x67, 0xb2, 0xff, 0xe0, 0x08, + 0x07, 0x06, 0xd2, 0x00, 0x0f, 0x2d, 0xf7, 0xbc, + 0x6f, 0x4e, 0xc6, 0x77, 0xb8, 0xef, 0x89, 0xcf, + 0x45, 0xc2, 0xe8, 0x20, 0xe2, 0xe8, 0x07, 0xf5, + 0x2d, 0x03, 0x19, 0xb5, 0xd4, 0x21, 0x7d, 0x73, + 0x15, 0x93, 0xa6, 0x6b, 0x9e, 0xe7, 0xe1, 0x24, + 0x93, 0x7d, 0xbe, 0x3b, 0xee, 0xc8, 0x9a, 0xef, + 0xbc, 0x33, 0xb3, 0x30, 0xe8, 0xf3, 0x16, 0x34, + 0x95, 0xa9, 0x92, 0xe2, 0x00, 0xa6, 0x9b, 0xc5, + 0xc0, 0xc2, 0x4f, 0x0e, 0x43, 0x49, 0x8d, 0xe3, + 0x28, 0x3f, 0x2e, 0x7e, 0x6c, 0x02, 0xb8, 0x46, + 0x80, 0x44, 0xda, 0xa2, 0x7d, 0x7f, 0xdc, 0x4d, + 0x8f, 0xd9, 0x86, 0x05, 0xd1, 0xb7, 0xe1, 0x07, + 0x6b, 0x61, 0xc8, 0x9b, 0x04, 0xfa, 0xb0, 0xdf, + 0xd4, 0x47, 0xa3, 0xd1, 0xc5, 0xc0, 0x6f, 0x99, + 0x18, 0xc2, 0x26, 0x11, 0xe7, 0x5d, 0x89, 0x38, + 0xf9, 0x99, 0xfa, 0xef, 0x34, 0x7a, 0x36, 0x6a, + 0x59, 0xd6, 0x60, 0x2c, 0x16, 0xab, 0x1b, 0x19, + 0x19, 0x99, 0x16, 0xbc, 0xe7, 0x1e, 0x6f, 0x56, + 0x6f, 0xef, 0xa5, 0x06, 0x94, 0xcc, 0xae, 0x29, + 0xa4, 0xb6, 0x2c, 0x48, 0x71, 0xb1, 0x1f, 0xe5, + 0x33, 0xc7, 0xc3, 0x24, 0x80, 0xe7, 0x3a, 0x24, + 0x53, 0x39, 0x7a, 0x86, 0x73, 0x74, 0xf4, 0xa4, + 0x71, 0x21, 0xbe, 0x13, 0xae, 0xbe, 0x09, 0x36, + 0x20, 0x9a, 0x1d, 0xf1, 0x3c, 0xcf, 0x39, 0x62, + 0x02, 0x9a, 0x84, 0x1f, 0x71, 0xd8, 0xcf, 0x22, + 0xce, 0xed, 0x6a, 0xb0, 0xf9, 0x61, 0xd8, 0x32, + 0xe4, 0xcd, 0x66, 0x01, 0x60, 0xd9, 0xb6, 0xfd, + 0xc7, 0x7d, 0xfb, 0xf6, 0x3d, 0xbe, 0x66, 0xcd, + 0x9a, 0x3f, 0xe5, 0x72, 0xb9, 0xe0, 0x12, 0xa8, + 0x39, 0x0f, 0xae, 0x2a, 0xd1, 0x13, 0x6e, 0xbf, + 0x0f, 0xb7, 0x38, 0x68, 0x18, 0xc5, 0x05, 0x7e, + 0x14, 0x90, 0xcc, 0x58, 0xa4, 0xc6, 0x5c, 0xcf, + 0x72, 0x51, 0x08, 0xda, 0x2d, 0x77, 0xc1, 0x8d, + 0xaf, 0x89, 0x79, 0x66, 0x10, 0x07, 0x8e, 0x79, + 0x93, 0xe6, 0x44, 0x47, 0x44, 0xe0, 0x10, 0x32, + 0xcd, 0xc8, 0x9b, 0x99, 0x19, 0x48, 0x6e, 0x30, + 0x91, 0xe1, 0xd6, 0x46, 0x24, 0xa1, 0xed, 0x5c, + 0xb1, 0x62, 0x45, 0x02, 0x29, 0x37, 0x4a, 0x35, + 0x29, 0x1f, 0xe0, 0xfb, 0x3a, 0x34, 0x9e, 0x04, + 0x4b, 0x2b, 0xe0, 0xa4, 0x00, 0xd4, 0x98, 0x62, + 0x7e, 0xd8, 0x10, 0xcb, 0x41, 0x6f, 0x0c, 0x5e, + 0xd8, 0x06, 0xcf, 0x6e, 0x94, 0x56, 0xd7, 0x45, + 0x7c, 0x30, 0x83, 0xfe, 0xff, 0x18, 0x1f, 0x5b, + 0x03, 0x47, 0xba, 0x94, 0x92, 0x02, 0x00, 0xf1, + 0x8b, 0x20, 0x92, 0x27, 0xf2, 0x15, 0xad, 0x71, + 0xc8, 0xbf, 0x99, 0x04, 0x76, 0xf2, 0xee, 0x22, + 0x49, 0x34, 0x8b, 0x84, 0xef, 0xec, 0xc7, 0xf2, + 0x81, 0x4f, 0x40, 0x62, 0x32, 0xd8, 0x3c, 0x60, + 0xf5, 0x21, 0x7b, 0x9e, 0x80, 0xc7, 0xc4, 0x84, + 0x3c, 0xff, 0x77, 0xbe, 0x67, 0x77, 0xbd, 0x43, + 0x06, 0x5b, 0xff, 0x0b, 0xc0, 0xbf, 0xa6, 0x42, + 0x9c, 0xfa, 0x3c, 0xe7, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x6f, 0x72, 0x67, 0x2f, 0x16, 0x00, 0x00, 0x00, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { um_resource_data.data, sizeof (um_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-user-panel.c gnome-control-center-3.22.1/panels/user-accounts/um-user-panel.c --- gnome-control-center-3.20.2/panels/user-accounts/um-user-panel.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-user-panel.c 2016-10-10 16:16:39.000000000 +0000 @@ -39,10 +39,6 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include -#include "shell/cc-editable-entry.h" - -#include "um-editable-button.h" -#include "um-editable-combo.h" #include "um-user-image.h" #include "um-cell-renderer-user-image.h" @@ -74,6 +70,7 @@ GtkWidget *notification; GSettings *login_screen_settings; + GtkWidget *headerbar_buttons; GtkWidget *main_box; GPermission *permission; GtkWidget *language_chooser; @@ -94,6 +91,9 @@ return (GtkWidget *)gtk_builder_get_object (d->builder, name); } +#define PAGE_LOCK "_lock" +#define PAGE_ADDUSER "_adduser" + enum { USER_COL, NAME_COL, @@ -184,6 +184,8 @@ act_user_get_user_name (user)); } +static void show_user (ActUser *user, CcUserPanelPrivate *d); + static void user_added (ActUserManager *um, ActUser *user, CcUserPanelPrivate *d) { @@ -330,8 +332,6 @@ } } -static void show_user (ActUser *user, CcUserPanelPrivate *d); - static void user_changed (ActUserManager *um, ActUser *user, CcUserPanelPrivate *d) { @@ -887,14 +887,19 @@ um_photo_dialog_set_user (d->photo_dialog, user); widget = get_widget (d, "full-name-entry"); - cc_editable_entry_set_text (CC_EDITABLE_ENTRY (widget), act_user_get_real_name (user)); + gtk_entry_set_text (GTK_ENTRY (widget), act_user_get_real_name (user)); gtk_widget_set_tooltip_text (widget, act_user_get_user_name (user)); - widget = get_widget (d, "account-type-combo"); - um_editable_combo_set_active (UM_EDITABLE_COMBO (widget), act_user_get_account_type (user)); + widget = get_widget (d, act_user_get_account_type (user) ? "account-type-admin" : "account-type-standard"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - widget = get_widget (d, "account-password-button"); - um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), get_password_mode_text (user)); + /* Do not show the "Account Type" option when there's a single user account. */ + show = (d->other_accounts != 0); + gtk_widget_set_visible (get_widget (d, "account-type-label"), show); + gtk_widget_set_visible (get_widget (d, "account-type-box"), show); + + widget = get_widget (d, "account-password-button-label"); + gtk_label_set_label (GTK_LABEL (widget), get_password_mode_text (user)); enable = act_user_is_local_account (user); gtk_widget_set_sensitive (widget, enable); @@ -904,7 +909,7 @@ g_signal_handlers_unblock_by_func (widget, autologin_changed, d); gtk_widget_set_sensitive (widget, get_autologin_possible (user)); - widget = get_widget (d, "account-language-button"); + widget = get_widget (d, "account-language-button-label"); name = NULL; lang = g_strdup (act_user_get_language (user)); @@ -915,8 +920,11 @@ if (lang && *lang != '\0') { name = gnome_get_language_from_locale (lang, NULL); + } else { + name = g_strdup ("—"); } - um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), name); + + gtk_label_set_label (GTK_LABEL (widget), name); g_free (lang); g_free (name); @@ -938,24 +946,30 @@ gtk_widget_set_visible (widget, show); gtk_widget_set_visible (label, show); + /* Language: do not show for current user */ + widget = get_widget (d, "account-language-button"); + label = get_widget (d, "language-label"); + show = act_user_get_uid (user) != getuid(); + gtk_widget_set_visible (widget, show); + gtk_widget_set_visible (label, show); + /* Last login: show when administrator or current user */ - widget = get_widget (d, "last-login-value-label"); - label = get_widget (d, "last-login-label"); + widget = get_widget (d, "last-login-button"); + label = get_widget (d, "last-login-button-label"); current = act_user_manager_get_user_by_id (d->um, getuid ()); show = act_user_get_uid (user) == getuid () || act_user_get_account_type (current) == ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR; if (show) { text = get_login_time_text (user); - gtk_label_set_text (GTK_LABEL (widget), text); + gtk_label_set_label (GTK_LABEL (label), text); g_free (text); } + label = get_widget (d, "last-login-label"); gtk_widget_set_visible (widget, show); gtk_widget_set_visible (label, show); enable = act_user_get_login_history (user) != NULL; - widget = get_widget (d, "last-login-history-button"); - gtk_widget_set_visible (widget, show); gtk_widget_set_sensitive (widget, enable); if (d->permission != NULL) @@ -988,7 +1002,7 @@ user = get_selected_user (d); - text = cc_editable_entry_get_text (CC_EDITABLE_ENTRY (entry)); + text = gtk_entry_get_text (GTK_ENTRY (entry)); if (g_strcmp0 (text, act_user_get_real_name (user)) != 0 && is_valid_name (text)) { act_user_set_real_name (user, text); @@ -998,21 +1012,25 @@ } static void -account_type_changed (UmEditableCombo *combo, +change_name_focus_out (GtkWidget *entry, + GdkEvent *event, + CcUserPanelPrivate *d) +{ + change_name_done (entry, d); +} + +static void +account_type_changed (GtkToggleButton *button, CcUserPanelPrivate *d) { ActUser *user; - GtkTreeModel *model; - GtkTreeIter iter; gint account_type; gboolean self_selected; user = get_selected_user (d); self_selected = act_user_get_uid (user) == geteuid (); - model = um_editable_combo_get_model (combo); - um_editable_combo_get_active_iter (combo, &iter); - gtk_tree_model_get (model, &iter, 1, &account_type, -1); + account_type = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)) ? ACT_USER_ACCOUNT_TYPE_STANDARD : ACT_USER_ACCOUNT_TYPE_ADMINISTRATOR; if (account_type != act_user_get_account_type (user)) { act_user_set_account_type (user, account_type); @@ -1120,9 +1138,9 @@ g_free (current_language); } - button = get_widget (d, "account-language-button"); + button = get_widget (d, "account-language-button-label"); name = gnome_get_language_from_locale (lang, NULL); - um_editable_button_set_text (UM_EDITABLE_BUTTON (button), name); + gtk_label_set_label (GTK_LABEL (button), name); g_free (name); } @@ -1291,6 +1309,7 @@ g_debug ("adding user %s\n", get_real_or_user_name (user)); user_added (d->um, user, d); } + show_user (list->data, d); g_slist_free (list); g_signal_connect (d->um, "user-added", G_CALLBACK (user_added), d); @@ -1347,6 +1366,8 @@ is_authorized = g_permission_get_allowed (G_PERMISSION (d->permission)); self_selected = act_user_get_uid (user) == geteuid (); + gtk_stack_set_visible_child_name (GTK_STACK (d->headerbar_buttons), is_authorized ? PAGE_ADDUSER : PAGE_LOCK); + widget = get_widget (d, "add-user-toolbutton"); gtk_widget_set_sensitive (widget, is_authorized); if (is_authorized) { @@ -1390,28 +1411,28 @@ } if (!act_user_is_local_account (user)) { - um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE); - remove_unlock_tooltip (get_widget (d, "account-type-combo")); + gtk_widget_set_sensitive (get_widget (d, "account-type-box"), FALSE); + remove_unlock_tooltip (get_widget (d, "account-type-box")); gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), FALSE); remove_unlock_tooltip (get_widget (d, "autologin-switch")); } else if (is_authorized && act_user_is_local_account (user)) { if (would_demote_only_admin (user)) { - um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE); + gtk_widget_set_sensitive (get_widget (d, "account-type-box"), FALSE); } else { - um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), TRUE); + gtk_widget_set_sensitive (get_widget (d, "account-type-box"), TRUE); } - remove_unlock_tooltip (get_widget (d, "account-type-combo")); + remove_unlock_tooltip (get_widget (d, "account-type-box")); gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), get_autologin_possible (user)); remove_unlock_tooltip (get_widget (d, "autologin-switch")); } else { - um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-type-combo")), FALSE); + gtk_widget_set_sensitive (get_widget (d, "account-type-box"), FALSE); if (would_demote_only_admin (user)) { - remove_unlock_tooltip (get_widget (d, "account-type-combo")); + remove_unlock_tooltip (get_widget (d, "account-type-box")); } else { - add_unlock_tooltip (get_widget (d, "account-type-combo")); + add_unlock_tooltip (get_widget (d, "account-type-box")); } gtk_widget_set_sensitive (GTK_WIDGET (get_widget (d, "autologin-switch")), FALSE); add_unlock_tooltip (get_widget (d, "autologin-switch")); @@ -1420,15 +1441,15 @@ /* The full name entry: insensitive if remote or not authorized and not self */ widget = get_widget (d, "full-name-entry"); if (!act_user_is_local_account (user)) { - cc_editable_entry_set_editable (CC_EDITABLE_ENTRY (widget), FALSE); + gtk_widget_set_sensitive (widget, FALSE); remove_unlock_tooltip (widget); } else if (is_authorized || self_selected) { - cc_editable_entry_set_editable (CC_EDITABLE_ENTRY (widget), TRUE); + gtk_widget_set_sensitive (widget, TRUE); remove_unlock_tooltip (widget); } else { - cc_editable_entry_set_editable (CC_EDITABLE_ENTRY (widget), FALSE); + gtk_widget_set_sensitive (widget, FALSE); add_unlock_tooltip (widget); } @@ -1436,26 +1457,26 @@ gtk_widget_show (get_widget (d, "user-icon-button")); gtk_widget_hide (get_widget (d, "user-icon-image")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-language-button")), TRUE); + gtk_widget_set_sensitive (get_widget (d, "account-language-button"), TRUE); remove_unlock_tooltip (get_widget (d, "account-language-button")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-password-button")), TRUE); + gtk_widget_set_sensitive (get_widget (d, "account-password-button"), TRUE); remove_unlock_tooltip (get_widget (d, "account-password-button")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-fingerprint-button")), TRUE); + gtk_widget_set_sensitive (get_widget (d, "account-fingerprint-button"), TRUE); remove_unlock_tooltip (get_widget (d, "account-fingerprint-button")); } else { gtk_widget_hide (get_widget (d, "user-icon-button")); gtk_widget_show (get_widget (d, "user-icon-image")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-language-button")), FALSE); + gtk_widget_set_sensitive (get_widget (d, "account-language-button"), FALSE); add_unlock_tooltip (get_widget (d, "account-language-button")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-password-button")), FALSE); + gtk_widget_set_sensitive (get_widget (d, "account-password-button"), FALSE); add_unlock_tooltip (get_widget (d, "account-password-button")); - um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, "account-fingerprint-button")), FALSE); + gtk_widget_set_sensitive (get_widget (d, "account-fingerprint-button"), FALSE); add_unlock_tooltip (get_widget (d, "account-fingerprint-button")); } @@ -1529,26 +1550,6 @@ } static void -update_padding (GtkWidget *button, GtkWidget *label) -{ - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder padding, border; - gint offset; - - context = gtk_widget_get_style_context (button); - state = gtk_style_context_get_state (context); - - gtk_style_context_get_padding (context, state, &padding); - gtk_style_context_get_border (context, state, &border); - - offset = padding.left + border.left; - - gtk_widget_set_margin_start (label, offset); - gtk_widget_set_margin_end (label, offset); -} - -static void setup_main_window (CcUserPanel *self) { CcUserPanelPrivate *d = self->priv; @@ -1634,28 +1635,28 @@ add_unlock_tooltip (button); button = get_widget (d, "full-name-entry"); - g_signal_connect (button, "editing-done", G_CALLBACK (change_name_done), d); + g_signal_connect (button, "activate", G_CALLBACK (change_name_done), d); + g_signal_connect (button, "focus-out-event", G_CALLBACK (change_name_focus_out), d); - button = get_widget (d, "account-type-combo"); - g_signal_connect (button, "editing-done", G_CALLBACK (account_type_changed), d); + button = get_widget (d, "account-type-standard"); + g_signal_connect (button, "toggled", G_CALLBACK (account_type_changed), d); button = get_widget (d, "account-password-button"); - g_signal_connect (button, "start-editing", G_CALLBACK (change_password), d); + g_signal_connect (button, "clicked", G_CALLBACK (change_password), d); button = get_widget (d, "account-language-button"); - g_signal_connect (button, "start-editing", G_CALLBACK (change_language), d); + g_signal_connect (button, "clicked", G_CALLBACK (change_language), d); button = get_widget (d, "autologin-switch"); g_signal_connect (button, "notify::active", G_CALLBACK (autologin_changed), d); button = get_widget (d, "account-fingerprint-button"); - g_signal_connect (button, "start-editing", + g_signal_connect (button, "clicked", G_CALLBACK (change_fingerprint), d); - button = get_widget (d, "last-login-history-button"); + button = get_widget (d, "last-login-button"); g_signal_connect (button, "clicked", G_CALLBACK (show_history), d); - g_signal_connect (button, "style-updated", G_CALLBACK (update_padding), get_widget (d, "last-login-value-label")); d->permission = (GPermission *)polkit_permission_new_sync (USER_ACCOUNTS_PERMISSION, NULL, NULL, &error); if (d->permission != NULL) { @@ -1714,21 +1715,35 @@ } static void +cc_user_panel_constructed (GObject *object) +{ + CcUserPanelPrivate *d; + CcUserPanel *self = UM_USER_PANEL (object); + GtkWidget *button; + CcShell *shell; + + G_OBJECT_CLASS (cc_user_panel_parent_class)->constructed (object); + d = self->priv; + + shell = cc_panel_get_shell (CC_PANEL (self)); + cc_shell_embed_widget_in_header (shell, d->headerbar_buttons); + + button = get_widget (d, "lock-button"); + gtk_lock_button_set_permission (GTK_LOCK_BUTTON (button), d->permission); +} + +static void cc_user_panel_init (CcUserPanel *self) { CcUserPanelPrivate *d; GError *error; volatile GType type G_GNUC_UNUSED; GtkWidget *button; - GtkStyleContext *context; d = self->priv = UM_USER_PANEL_PRIVATE (self); g_resources_register (um_get_resource ()); /* register types that the builder might need */ - type = um_editable_button_get_type (); - type = cc_editable_entry_get_type (); - type = um_editable_combo_get_type (); type = um_user_image_get_type (); type = um_cell_renderer_user_image_get_type (); @@ -1747,6 +1762,7 @@ return; } + d->headerbar_buttons = get_widget (d, "headerbar-buttons"); d->login_screen_settings = settings_or_null ("org.gnome.login-screen"); d->password_dialog = um_password_dialog_new (); @@ -1756,11 +1772,6 @@ gtk_container_add (GTK_CONTAINER (self), get_widget (d, "overlay")); d->history_dialog = um_history_dialog_new (); setup_main_window (self); - - context = gtk_widget_get_style_context (get_widget (d, "list-scrolledwindow")); - gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM); - context = gtk_widget_get_style_context (get_widget (d, "add-remove-toolbar")); - gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); } static void @@ -1812,14 +1823,6 @@ G_OBJECT_CLASS (cc_user_panel_parent_class)->dispose (object); } -static GPermission * -cc_user_panel_get_permission (CcPanel *panel) -{ - CcUserPanelPrivate *priv = UM_USER_PANEL (panel)->priv; - - return priv->permission; -} - static const char * cc_user_panel_get_help_uri (CcPanel *panel) { @@ -1833,8 +1836,8 @@ CcPanelClass *panel_class = CC_PANEL_CLASS (klass); object_class->dispose = cc_user_panel_dispose; + object_class->constructed = cc_user_panel_constructed; - panel_class->get_permission = cc_user_panel_get_permission; panel_class->get_help_uri = cc_user_panel_get_help_uri; g_type_class_add_private (klass, sizeof (CcUserPanelPrivate)); diff -Nru gnome-control-center-3.20.2/panels/user-accounts/um-utils.c gnome-control-center-3.22.1/panels/user-accounts/um-utils.c --- gnome-control-center-3.20.2/panels/user-accounts/um-utils.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/um-utils.c 2016-10-10 16:16:39.000000000 +0000 @@ -560,8 +560,7 @@ if (!empty && (in_use || too_long || !valid)) { if (in_use) { - *tip = g_strdup_printf (_("A user with the username '%s' already exists."), - username); + *tip = g_strdup (_("Sorry, that user name isn't available. Please try another.")); } else if (too_long) { *tip = g_strdup_printf (_("The username is too long.")); @@ -570,7 +569,7 @@ *tip = g_strdup (_("The username cannot start with a '-'.")); } else { - *tip = g_strdup (_("The username should only consist of lower and upper case letters from a-z, digits and any of characters '.', '-' and '_'.")); + *tip = g_strdup (_("The username should only consist of upper and lower case letters from a-z, digits and the following characters: . - _")); } } else { diff -Nru gnome-control-center-3.20.2/panels/user-accounts/user-accounts.gresource.xml gnome-control-center-3.22.1/panels/user-accounts/user-accounts.gresource.xml --- gnome-control-center-3.20.2/panels/user-accounts/user-accounts.gresource.xml 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/user-accounts/user-accounts.gresource.xml 2016-08-12 12:43:57.000000000 +0000 @@ -2,6 +2,7 @@ data/account-dialog.ui + data/join-dialog.ui data/account-fingerprint.ui data/password-dialog.ui data/history-dialog.ui diff -Nru gnome-control-center-3.20.2/panels/wacom/calibrator/Makefile.in gnome-control-center-3.22.1/panels/wacom/calibrator/Makefile.in --- gnome-control-center-3.20.2/panels/wacom/calibrator/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/wacom/calibrator/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -312,8 +312,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -564,22 +562,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_calibrator-main.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/panels/wacom/gnome-wacom-panel.desktop.in.in gnome-control-center-3.22.1/panels/wacom/gnome-wacom-panel.desktop.in.in --- gnome-control-center-3.20.2/panels/wacom/gnome-wacom-panel.desktop.in.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/panels/wacom/gnome-wacom-panel.desktop.in.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,5 +1,6 @@ [Desktop Entry] -_Name=Wacom Tablet +# Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +_Name=Wa­com Tab­let _Comment=Set button mappings and adjust stylus sensitivity for graphics tablets Exec=gnome-control-center wacom Icon=input-tablet @@ -7,7 +8,7 @@ Type=Application NoDisplay=true StartupNotify=true -Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; +Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-DevicesSettings; OnlyShowIn=GNOME;Unity; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff -Nru gnome-control-center-3.20.2/panels/wacom/Makefile.in gnome-control-center-3.22.1/panels/wacom/Makefile.in --- gnome-control-center-3.20.2/panels/wacom/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/panels/wacom/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -378,8 +378,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -663,22 +661,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wacom-test-wacom.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< diff -Nru gnome-control-center-3.20.2/po/am.po gnome-control-center-3.22.1/po/am.po --- gnome-control-center-3.20.2/po/am.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/am.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2003-02-03 10:16+EDT\n" "Last-Translator: Ge'ez Frontier Foundation \n" "Language-Team: Amharic \n" +"Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/ar.po gnome-control-center-3.22.1/po/ar.po --- gnome-control-center-3.20.2/po/ar.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ar.po 2016-09-27 12:37:36.000000000 +0000 @@ -13,9 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-28 10:51+0400\n" -"PO-Revision-Date: 2016-03-30 01:19+0400\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-20 14:55+0000\n" +"PO-Revision-Date: 2016-09-21 14:40+0200\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -97,7 +98,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "البداية" @@ -112,25 +113,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -161,16 +161,18 @@ msgid "Current background" msgstr "الخلفية الحالية" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#| msgid "Background" +msgid "Back­ground" msgstr "الخلفية" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "غيّر صورة الخلفية" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "خلفية;شاشة;سطح المكتب;" @@ -210,18 +212,18 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "عطّل وضع الطائرة لتفعيل بلوتوث." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#| msgid "Bluetooth" +msgid "Blue­tooth" msgstr "بلوتوث" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "شغّل أو أغلق بلوتوث لتوصيل جهازك بالأجهزة الأخرى" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;مشاركة;شارك;بلوتوث;" @@ -390,7 +392,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "كلّ الملفات" @@ -429,7 +431,7 @@ msgstr "احفظ الإعداد" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "ا_حفظ" @@ -677,7 +679,7 @@ "\">ميكروسوفت وندوز." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "ملخّص" @@ -689,11 +691,11 @@ msgid "_Import File…" msgstr "ا_ستورد ملفًا…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "أ_ضف" @@ -840,17 +842,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "الألوان" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "عاير ألوان أجهزتك، مثل أجهزة العرض و الكمرات و الطابعات" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "لون;ألوان;إعداد;تشكيل;معايرة;طابعة;شاشة;" @@ -868,23 +871,23 @@ msgid "No languages found" msgstr "لا يوجد أي لغات" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "اليوم" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "الأمس" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %B" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %B، %Y" @@ -1004,8 +1007,9 @@ msgid "December" msgstr "ديسمبر" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "التاريخ والوقت" @@ -1062,12 +1066,12 @@ msgid "AM / PM" msgstr "ص \\ م" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "غيّر الوقت والتاريخ، بما فيها المنطقة الزمنية" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "ساعة;توقيت;منطقة زمنية;منطقة;" @@ -1079,207 +1083,223 @@ msgid "To change time or date settings, you need to authenticate." msgstr "لتغيير إعدادات الوقت والتاريخ، تحتاج للاستيثاق." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "الغطاء مغلق" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "متطابقة" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "الأساسي" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "معطّل" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "الثانوي" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "رتب الشاشات المركبة" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_طبّق" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "اسحب الشاشات لترتيبها" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d هرتز (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d هرتز" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "أدِر ٩٠° عكس عقارب الساعة" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "أدِر ١٨٠°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "أدِر ٩٠° باتجاه عقارب الساعة" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "الحجم" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "نسبة العرض" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "الميز" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "اضبط للتلفاز" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "تردد التحديث" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "اعرض الشريط العلوي و تجميعة الأنشطة على هذه الشاشة" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "شاشة ثانوية" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "ضم هذه الشاشة على شاشة أخرى لإنشاء مساحة عمل إضافية" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "العروض التقديمة" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "اعرض عروض الشرائح و الوسائط فقط" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "طابق" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "اعرض المنظور الخالي على الشاشتين" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "أطفئ" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "لا تستخدم هذه الشاشة" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "تعذّرت معرفة معلومات الشاشة" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "ر_تب الشاشات المركبة" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#| msgid "Displays" +msgid "Dis­plays" msgstr "الشاشات" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "اختر كيف تستخدم الشاشات و أجهزة عرض الشرائح" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "لوحة;عرض;شاشة;ميز;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "وايلاند" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "غير معروف" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "‏%s ‏%d-بتة (معرف البناء: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "‏%d-بتة (معرف البناء: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "‏%s‏ %d بتة" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d بتة" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "اسأل ما الذي يجب فعله" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "لا تفعل شيئا" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "افتح المجلّد" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "وسائط أخرى" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "اختر تطبيقا لاسطوانات الصوت" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "اختر تطبيقا لاسطوانات الفديو" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "اختر تطبيقا لتشغيله عند توصيل مشغّل موسيقى" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "اختر تطبيقا لتشغيله عند توصيل كمرة" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "اختر تطبيقا لاسطوانات البرامج" @@ -1288,88 +1308,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "دي‌ڤي‌دي صوتي" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "قرص Blu-Ray فارغ" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "اسطوانة فارغة" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "قرص دي‌ڤي‌دي فارغ" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "قرص دي‌ڤي‌دي إتش‌دي فارغ" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "قرص Blu-Ray فديو فارغ" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "قارئ كتب إلكتروني" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "قرص دي‌ڤي‌دي إتش‌دي فديو فارغ" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "اسطوانة صور" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "اسطوانة فديو فائقة" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "اسطوانة فديو" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "برمجيات وندوز" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "القسم" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "عام" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "التطبيقات المبدئية" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "الوسائط المنفصلة" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "الإصدارة %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "تفاصيل" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#| msgid "Details" +msgid "De­tails" +msgstr "التفاصيل" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "اعرض معلومات عن نظامك" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1543,8 +1562,9 @@ msgid "Launch help browser" msgstr "شغّل متصفّح المساعدة" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "الإعدادات" @@ -1617,7 +1637,6 @@ msgstr "أوصد الشاشة" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "الإتاحة" @@ -1653,11 +1672,21 @@ msgid "High contrast on or off" msgstr "شغّل أو عطّل التباين العال" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "اختصارات مخصصة" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1685,120 +1714,140 @@ msgid "Modifiers-only switch to next source" msgstr "تحول إلى المصدر التالي" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "لوحة المفاتيح" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "أعِد الاختصار إلى قيمته المبدئية" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "الاختصار %s مستخدم حاليا من أجل %s. إذا استبدلته، فيُعطّل %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcut" +msgid "Set Custom Shortcut" +msgstr "حدد اختصارًا مخصصًا" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "حدد اختصارًا" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "أدخل اختصارًا جديدًا لتغيير %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +#| msgid "Custom Shortcut" +msgid "Add Custom Shortcut" +msgstr "أضف اختصارًا مخصصًا" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#| msgid "Keyboard" +msgid "Key­board" +msgstr "لوحة المفاتيح" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "اعرض و غيّر اختصارات لوحة المفاتيح و اضبط خيارات الكتابة" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "اختصار;تكرار;وميض;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "اختصار مخصص" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "الا_سم:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "الأ_مر:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "أضف اختصارًا" +#| msgid "Keyboard Shortcuts" +msgid "No keyboard shortcut found" +msgstr "لم يُعثر على أي اختصارات للوحة المفاتيح" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "أزِل اختصارًا" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"لتعديل مفتاح اختصار، انقر على السّطر ثم اضغط على الأزرار الجديدة أو اضغط " -"مفتاح التّراجع لمسحها." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "اختصارات مخصصة" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "جرب بحثًا آخر" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<إجراء غير معروف>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "اضغط Esc للإلغاء." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"الاختصار \"%s\" لا يمكن استخدامه لأن الطباعة بهذا المفتاح ستصبح متعذرة.\n" -"حاول رجاءً استخدام مفتاح مع Ctrl أو Alt أو Shift في نفس الوقت." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "الاسم" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"الاختصار \"%s\" مستخدم في:\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +#| msgid "C_ommand:" +msgid "Command" +msgstr "الأمر" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "الاختصار" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "حرِّر" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "إذا أعدت تعيين الاختصار \"%s\" فسيُعطّل الاختصار \"%s\"." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "لا شيء" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "أعِد ال_تعيين" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#| msgid "_Remove" +msgid "Remove" +msgstr "أزل" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#| msgid "Error saving the new shortcut" +msgid "Enter the new shortcut" +msgstr "أدخِل اختصارًا جديدًا" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"الاختصار \"%s\" مرتبط بالاختصار \"%s\". هل تريد ضبطه تلقائيا إلى \"%s\"؟" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "ألغِ" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"الاختصار \"%s\" مرتبط حاليًا بالاختصار \"%s\"، سيُعطّل الاختصار إذا أكملت." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "أضف" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "ا_ضبط" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +#| msgid "_Replace" +msgid "Replace" +msgstr "استبدل" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "حدد" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "اختبر إ_عداداتك" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#| msgid "Mouse & Touchpad" +msgid "Mouse & Touch­pad" msgstr "الفأرة و لوحة اللمس" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "غيّر حساسية الشاشة و لوح اللمس و اختر اليد اليمنى أم اليسرى" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "فأرة;مؤشر;نقر;مزدوج;زر;لمس;" @@ -1856,6 +1905,11 @@ msgstr "النقر بالإصبع" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +#| msgid "Two _finger scroll" +msgid "Two-finger Scrolling" +msgstr "اللف بأصبعين" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "التمرير عند الحافة" @@ -1894,11 +1948,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "وضع ال_طائرة" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "وسيط الشبكة" @@ -1906,17 +1960,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "ش‌خ‌ف %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "نأسف، حدث عطل ما. من فضلك اتصل بالدعم الفني." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "يجب أن يكون NetworkManager شغّالًا." @@ -1932,7 +1986,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1949,59 +2003,64 @@ msgid "page 2" msgstr "صفحة 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "الأمن" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "تلقائي" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "إعداد %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "مؤسسة" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "بدون" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "أبدًا" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2013,179 +2072,179 @@ msgstr[5] "منذ %i يوم" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d م.بايت\\ث" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "لا إشارة" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "ضعيفة" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "معقولة" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "جيّدة" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "ممتازة" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "تفاصيل" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "الهوية" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "العنوان" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "قناع الشّبكة" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "البوّابة" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "احذف العنوان" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "أضف" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "الخادوم" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "احذف خادوك DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "المعيار" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "احذق السبيل" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "تلقائي (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "يدوي" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "السابقة" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "تلقائي" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "تلقائي، DHCP فقط" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "صفّر" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "لا شيء" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "عبارة سر WEP‏ 128-بتة" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "‏WPA و WPA2 شخصي" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "‏WPA و WPA2 للمؤسسات" @@ -2200,30 +2259,30 @@ msgstr "سرعة الوصلة" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "عنوان IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "عنوان IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "عنوان العتاد" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2233,7 +2292,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2316,13 +2375,13 @@ msgid "Firewall _Zone" msgstr "_طبقة الجدار الناري" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "المبدئية" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "تحدد الطبقة مستوى الثقة في الاتصال" @@ -2364,45 +2423,26 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "تعذّر فتح محرر الاتصالات" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "إعداد جديد" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "ش‌خ‌ف" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "فريق" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "جسر" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "شبكة محلية ظاهرية" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "تعذّر تحميل ملحقات VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "استورد من ملف…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "أضف اتصالًا شبكيّا" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +#| msgid "%s VPN" +msgid "Add VPN" +msgstr "أضف ش‌خ‌ف (VPN)" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2410,7 +2450,7 @@ msgstr "_صفّر" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "ان_سَ" @@ -2433,11 +2473,11 @@ msgid "S_ecurity" msgstr "الأ_من" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "تعذّر استيراد اتصال VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2446,36 +2486,36 @@ "Error: %s." msgstr "" -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "اختر ملفا لاستيراده" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "ا_فتح" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "يوجد فعلا ملف بالاسم \"%s\"." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "ا_ستبدل" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "هل تريد استبدال %s باتصال VPN الذي تحفظه؟" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "تعذّر تصدير اتصال VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2483,7 +2523,7 @@ "Error: %s." msgstr "" -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "صدّر اتصال VPN" @@ -2510,58 +2550,48 @@ msgid "Make available to _other users" msgstr "اجعله م_تاحا للمستخدمين الآخرين" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#| msgid "Network" +msgid "Net­work" msgstr "الشبكة" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "تحكم في اتصالك بالإنترنت" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +#| msgid "" +#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" +#| "vpn;vlan;bridge;bond;DNS;" msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "شبكة;لاسلكي;واي فاي;بلوتوث;محمول;وسيط;شبكة محلية;مودم;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "أجهزة تابعة للربط" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(لا شيء)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "تابعي الجسر" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "أبدًا" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "اليوم" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "الأمس" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "عنوان IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "آخر استخدام" @@ -2571,34 +2601,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "سلكية" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "الخيارات…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "إعداد %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "أضف اتصالًا جديدا" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "تابعي الفريق" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2606,45 +2627,45 @@ "إذا كان لديك اتصال بالإنترنت غير الاتصال اللاسلكي فيمكنك إعداد نقطة بث " "لمشاركة اتصالك بالإنترنت مع الآخرين." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "تشغيل نقطة بث اللاسلكي ستفصلك عن %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" "لا يمكن استخدام الاتصال اللاسلكي للوصول إلى الإنترنت عند تفعيل نقطة البث." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "إيقاف نقطة البث وقطع الاتصال عن أي مستخدمين؟" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "أو_قف نقطة البث" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "تمنع سياسة النظام استخدامه نقطة بث" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "لا يدعم جهاز اللاسلكي وضع نقطة البث" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "ستُفقد تفاصيل الشبكة، بما في ذلك كلمات السر وأي إعدادات مُخصصة." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "التأريخ" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2652,7 +2673,7 @@ msgstr "أ_غلق" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "إن_س" @@ -2687,6 +2708,10 @@ msgid "Provider" msgstr "مقدم الخدمة" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "الشبكة" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2793,15 +2818,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "كلمة ال_سر" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "لا شيء" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "أ_ظهر كلمة السر" @@ -2892,7 +2913,6 @@ msgstr "اتّ_صل بشبكة مخفية…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "ال_تأريخ" @@ -2914,361 +2934,337 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "كلمة السر" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "لا مركزية" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "مركزية" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "الحالة غير معروفة" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "غير مُدار" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "غير متاح" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "يتّصل" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "الاستيثاق مطلوب" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "متّصل" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "يقطع الاتصال" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "فشل الاتصال" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "الحالة غير معروفة (مفقودة)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "غير متّصِل" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "فشل الإعداد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "فشل إعداد رقم الإنترنت (IP)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "انتهت صلاحية إعداد رقم الإنترنت (IP)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "الأسرار مطلوبة لكن لم تُعطَ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "فشل بدء خدمة PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "فصلت خدمة PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "فشل PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "فشل بدء عميل DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "خطأ من عميل DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "فشل عميل DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "فشل بدء خدمة الاتصال المشترك" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "فشلت خدمة الاتصال المشترك" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "فشل بدء خدمة AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "عطل في خدمة AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "فشلت خدمة AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "الخط مشغول" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "الخط مقطوع" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "انتهت مهلة الاتصال الهاتفي" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "فشل الاتصال الهاتفي" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "فشلت تهيئة المودم" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "تعذّر اختيار APN المحدد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "لن يبحث عن شبكة" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "رُفض تسجيل الشبكة" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "انتهت مهلة تسجيل الشبكة" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "فشل تسجيل الشبكة المطلوبة" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "فضل فحص PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "البرمجيات المضمنة التي يحتاجها الجهاز غير متاحة" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "اختفى الاتصال" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "المودم غير موجود" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "فشل اتصال بلوتوث" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "لم تُدرج شريحة الهاتف" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "فشلت اعتمادية الاتصال" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "البرمجية المغروسة غير متاحة" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "الكبل مفصول" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "لم تُختر أي شهادة سُلْطة استيثاق" - -#: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" msgstr "" -"عدم استخدام شهادة أمنيّة من جهة معتمدة قد يتسبّب باتصالات لا سلكية غير آمنة " -"واحتيالية. هل تريد اختيار شهادة أمنية من جهة معتمدة؟" -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "تجاهل" +#: ../panels/network/wireless-security/eap-method.c:245 +#| msgid "No input source selected" +msgid "no file selected" +msgstr "لم تحدد أي ملف" -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "اختر شهادة سُلْطة استيثاق" +#: ../panels/network/wireless-security/eap-method.c:276 +msgid "unspecified error validating eap-method file" +msgstr "" -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" msgstr "" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "" -#: ../panels/network/wireless-security/eap-method-fast.c:409 -#, fuzzy +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" -msgstr "اختر مجلّدًا" +msgstr "اختر ملف PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" -msgstr "" +msgstr "ملفات PAC‏ (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -#, fuzzy -msgid "PAC _file" -msgstr "كلّ الملفات" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "الاستيثاق ال_داخلي" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3277,41 +3273,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "مجهول" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "مستوثَق" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "كلاهما" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_ملفات PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "الاستيثاق ال_داخلي" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "ا_سم المستخدم" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "أظهر _كلمة السر" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "اختر شهادة \"سلطة شهادات\"" @@ -3329,19 +3357,58 @@ msgid "C_A certificate" msgstr "شهادة _سُلْطة استيثاق" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#| msgid "Authentication required" +msgid "No CA certificate is _required" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "إ_صدارة PEAP:" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "ا_طلب كلمة السر هذه في كل مرة" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +#| msgid "Wrong password" +msgid "missing EAP password" +msgstr "" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "المفاتيح السرية غير المُعمّاة ليست آمنة" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3350,11 +3417,11 @@ "(You can password-protect your private key with openssl)" msgstr "" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "اختر شهادتك الشخصية" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "اختر مفتاحك السري" @@ -3366,51 +3433,56 @@ msgid "_User certificate" msgstr "شهادة المست_خدم" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "المفتاح ال_سري" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "كل_مة سر المفتاح السري" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "لا _تنبهني ثانيةً" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "لا" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "نعم" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "‏TLS عبر نفق" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "‏EAP ‏(PEAP) محمي" @@ -3420,21 +3492,60 @@ msgid "Au_thentication" msgstr "الا_ستيثاق" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "" + +#: ../panels/network/wireless-security/ws-leap.c:74 +#| msgid "Wrong password" +msgid "missing leap-password" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" -msgstr "1 (المبدئي)" +msgstr "١ (المبدئي)" #: ../panels/network/wireless-security/ws-wep-key.ui.h:2 msgid "2" -msgstr "2" +msgstr "٢" #: ../panels/network/wireless-security/ws-wep-key.ui.h:3 msgid "3" -msgstr "3" +msgstr "٣" #: ../panels/network/wireless-security/ws-wep-key.ui.h:4 msgid "4" -msgstr "4" +msgstr "٤" #: ../panels/network/wireless-security/ws-wep-key.ui.h:5 msgid "Open System" @@ -3456,19 +3567,30 @@ msgid "WEP inde_x" msgstr "_فهرس WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "ال_نوع" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "مفعّل" @@ -3505,16 +3627,18 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "أظهر محتوى الر_سالة في شاشة القفل" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#| msgid "Notifications" +msgid "No­ti­fi­ca­tions" msgstr "التنبيهات" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "تحكم في أي التنبيهات تُعرض و ماذا تعرِض" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "تنبيهات;لوحة;رسالة;منبثق;" @@ -3532,79 +3656,70 @@ msgid "Applications" msgstr "التطبيقات" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "أخرى" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "أضف حسابا" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "البريد" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +#| msgid "_Calendar" +msgid "Calendar" +msgstr "التقويم" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "المتراسلين" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "الدردشة" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "الموارد" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "خطأ عند الولوج إلى الحساب" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "انتهت صلاحية بيانات الاستيثاق." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "ادخل لتفعيل هذا الحساب." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "اد_خل" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "خطأ أثناء إنشاء الحساب" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "خطأ أثناء إزالة الحساب" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "أمتأكد أنك تريد إزالة الحساب؟" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "هذا لن يزيل الحساب على الخادوم." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "أ_زل" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#| msgid "Online Accounts" +msgid "On­line Accounts" msgstr "حسابات الإنترنت" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "اتصل بحساباتك على الإنترنت و اختر ما الذي تستخدمه منهم" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3615,6 +3730,7 @@ msgstr "لم تُعد أي حسابات إنترنت" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "أزِل الحساب" @@ -3773,7 +3889,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "بطارية" @@ -3821,101 +3937,102 @@ msgid "When _idle" msgstr "عند عدم الا_ستخدام" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "حفظ الطاقة" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "س_طوع الشاشة" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "سطوع تلقائي" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "سطوع _لوحة المفاتيح" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "أ_خفض ضوء الشاشة عند الخمول" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "شاشة _فارغة" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "واي فاي" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "عطل واي فاي لتوفير الطاقة" -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "شبكة هاتف م_حمول" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "عطّل شبكات الهاتف المحمول (٣ج، ٤ج، واي‌ماك، إلخ.) لتوفير الطاقة." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "بلو_توث" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "عندما تكون على طاقة البطارية" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "عند توصيل الكبل" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "علِّق" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "أسبِت" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "لا تفعل شيئا" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "التعليق و زر الطاقة" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "ت_عليق تلقائي" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "تعليق تلقائي" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "عند _ضغط زر الطاقة" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "الأجهزة" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "الطاقة" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "اعرض حالة البطارية و غيّر إعدادات توفير الطاقة" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "طاقة;سبات;تعليق;بطارية;إضاءة;شاشة;إسبات;" @@ -3992,11 +4109,6 @@ msgid "Delay" msgstr "التأخير" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "ألغِ" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "استوثق" @@ -4006,138 +4118,138 @@ msgstr "الاستيثاق مطلوب" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "الحبر قليل" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "نفد الحبر" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "المُحمِّض قليل" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "نفد المُحمِّض" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "اللون قليل" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "نفد اللون" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "الغطاء مفتوح" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "الباب مفنوح" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "الورق قليل" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "نفد الورق" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "غير متصلة" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "متوقفة" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "حاوية النفايات على وشك الامتلاء" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "حاوية النفايات ممتلئة" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "قاربت صلاحية المقاوم الضوئي على الانتهاء" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "لم يعد المقاوم الضوئي يعمل" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "تُضبط" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "جاهزة" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "لا تقبل المهام" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "تُعالِج" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "مستوى الحبر" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "مستوى الحبر" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "مستوى المداد" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "تُثبّت" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4149,62 +4261,60 @@ msgstr[5] "%u نشطة" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "تعذّر إضافة طابعة جديدة." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "اختر ملف PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "ملفت وصف طابعة بوست‌سكربت (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "لم يعثر على أي طابعة مناسبة" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "يبحث عن المُشغّلات المُفضّلة…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "اختر من قاعدة بيانات…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "وفر ملف PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "صفحة اختبار" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "لا طابعات" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "تعذّر تحميل الواجهة: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#| msgid "Printers" +msgid "Prin­ters" msgstr "الطابعات" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "أضف الطابعات و اعرض مهام الطباعة و اختر ما الذي تطبعه" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "طابعة;طباعة;طبع;ورق;حبر;" @@ -4366,6 +4476,11 @@ msgid "Parallel Port" msgstr "منفذ متواز" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "بلوتوث" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4576,13 +4691,17 @@ msgid "_Options" msgstr "ال_خيارات" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "لا طابعات" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "أضِف طابعة" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4590,70 +4709,70 @@ "آسف، يبدو أن خدمة الطباعة\n" "في النظام غير متاحة." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "قفل الشاشة" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "قيد الاستعمال" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "مشغلة" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "مغلقة" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "خدمات التموضع" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "الاستخدام والتأريخ" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "أأحذف كل العناصر من المهملات؟" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "ستحذف نهائيا كل العناصر الموجودة في المهملات." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "أ_فرغ المهملات" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "أأحذف كل الملفات المؤقتة؟" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "ستُحذف كل الملفات المؤقتة نهائيًا." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "ت_خلّص من الملفات المؤقتة" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "أفرغ المهملات والملفات المؤقتة" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "استخدام البرمجيات" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "الإبلاغ عن المشاكل" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4662,20 +4781,21 @@ "الإبلاغ عن المشاكل التقنية يساعدنا على تحسين %s. ترسل البلاغات مُجهّلة بدون أي " "معلومات شخصية." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "سياسة الخصوصية" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "الخصوصية" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "احمِ بياناتك الشخصية و تحكم في ما يمكن للآخرين الاطلاع عليه منها" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4808,8 +4928,8 @@ "Location services allow applications to know your location. Using Wi-Fi and " "mobile broadband increases accuracy." msgstr "" -"تسمح خدمات التموضع للتطبيقات بمعرفة مكانك. استخدام الشبكات اللاسلكية و " -"الهاتف المحمول يزيد من دقة هذه الخدمات." +"تسمح خدمات التموضع للتطبيقات بمعرفة مكانك. استخدام الشبكات اللاسلكية " +"و الهاتف المحمول يزيد من دقة هذه الخدمات." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4842,21 +4962,21 @@ msgid "Other" msgstr "أخرى" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "يجب إعادة تشغيل الجلسة لتطبيق التغييرات" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "أعِد التشغيل الآن" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "لم تحدد أي مصادر إدخال" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "شاشة الو_لوج" @@ -4888,17 +5008,19 @@ msgid "Paper" msgstr "الورق" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "المنطقة واللغة" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#| msgid "Region & Language" +msgid "Re­gion & Lan­guage" +msgstr "المنطقة و اللغة" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "اختر لغة العرض و التنسيق و تخطيط لوحة المفاتيح و مصادر الإدخال" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "اللغة;التخطيط;مفاتيح;" @@ -4955,7 +5077,7 @@ msgstr "Left+Right Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "الل_غة" @@ -5003,26 +5125,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "يستخدم إعدادات الولوج كل المستخدمين أثناء الولوج إلى النظام" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "الأماكن" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "العلامات" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "أخرى" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "اختر مكانًا" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_نعم" @@ -5030,17 +5137,18 @@ msgid "No applications found" msgstr "لا يوجد أي تطبيقات" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "البحث" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "تحكم في التطبيقات التي ستُعرض نتائج البحث منها في منظور الأنشطة" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "بحث;إخفاء;نتائج;خصوصية;" @@ -5048,6 +5156,24 @@ msgid "Search Locations" msgstr "أماكن البحث" +#: ../panels/search/search-locations-dialog.ui.h:2 +#| msgctxt "Search Location" +#| msgid "Places" +msgid "Places" +msgstr "الأماكن" + +#: ../panels/search/search-locations-dialog.ui.h:3 +#| msgctxt "Search Location" +#| msgid "Bookmarks" +msgid "Bookmarks" +msgstr "العلامات" + +#: ../panels/search/search-locations-dialog.ui.h:4 +#| msgctxt "Online Account" +#| msgid "Other" +msgid "Other" +msgstr "أخرى" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "انقل لأعلى" @@ -5060,6 +5186,11 @@ msgid "Preferences" msgstr "التفضيلات" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "لم تختر أي شبكة لمشاركتها" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5096,42 +5227,59 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format +#| msgid "" +#| "Allow remote users to connect using the Secure Shell command:\n" +#| "ssh %s" msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"اسمح بالولوج عن بعد باستخدام أمر الصدفة الآمنة:\n" +"عند تفعيل بالولوج عن بعد، يمكن للمستخدمين الولوج عن بعد باستخدام أمر الصدفة " +"الآمنة:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format +#| msgid "" +#| "Allow remote users to view or control your screen by connecting to: vnc://%s" msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"اسمح للمستخدمين عن بعد بالتحكم في شاشتك باستخدام: ‪vnc://" -"%s‬" +"مشاركة الشاشة تسمح للمستخدمين عن بعد بالتحكم في شاشتك باستخدام: ‪vnc://%s‬" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "انسخ" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "المشاركة" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +#| msgid "Sharing" +msgid "Sha­ring" +msgstr "المشاركة" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "تحكم في ما تريد مشاركته مع الآخرين" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "مشاركة;شارك;اسم;مكتب;بعيد;بلوتوث;صوت;صورة;وسائط;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "الشبكات" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "فعّل أو عطّل الولوج عن بعد" @@ -5140,25 +5288,14 @@ msgid "Authentication is required to enable or disable remote login" msgstr "الاستيثاق مطلوب لتفعيل أو تعطيل الولوج عن بعد" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "لم تختر أي شبكة لمشاركتها" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "الشبكات" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "ا_سم الحاسوب" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "م_شاركة الملفات الشخصية" +#| msgid "_Personal File Sharing" +msgid "_File Sharing" +msgstr "م_شاركة الملفات" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5177,8 +5314,9 @@ msgstr "بعض الأجهزة معطل لتعذّر الوصول الشبكي." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "مشاركة الملفات الشخصية" +#| msgid "Sharing" +msgid "File Sharing" +msgstr "مشاركة الملفات" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5193,8 +5331,8 @@ msgstr "مشاركة الشاشة" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "اسمح بالتحكم عن بع_د" +msgid "_Allow connections to control the screen" +msgstr "ا_سمح للاتصالات بالتحكم في الشاشة" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5221,10 +5359,11 @@ msgstr "مشاركة الوسائط" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"تسمح لك مشاركة الوسائط بشارك الموسيقى و الصور و الڤديو مع الآخرين على الشبكة." +#| msgid "" +#| "Media sharing allows you to share music, photos and videos over the " +#| "network." +msgid "Share music, photos and videos over the network." +msgstr "شارك الموسيقى و الصور و الڤديو مع الآخرين على الشبكة." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5362,11 +5501,6 @@ msgid "Peak detect" msgstr "التعرف على الذروة" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "الاسم" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "الجهاز" @@ -5461,16 +5595,22 @@ msgid "Subwoofer" msgstr "سماعات كبيرة" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "مخصص" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +#| msgid "Universal Access" +msgid "Uni­ver­sal Access" +msgstr "الإتاحة" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "اجعل الرؤية و السماع و الكتابة و المؤشر أسهل" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5568,8 +5708,9 @@ msgstr "مفاتيح الصوت" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "أصدر صفيرًا عندما يكون قفل الأرقام أو الحروف الكبيرة مُفعّلًا." +#| msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "أصدر صفيرًا عند تفعيل أو تعطيل قفل الأرقام أو الحروف الكبيرة." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5950,92 +6091,79 @@ msgstr "المؤثرات اللونية" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "أضف مستخدما" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "الاسم بال_كامل" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#| msgctxt "Account type" +#| msgid "Standard" msgid "Standard" msgstr "عادي" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#| msgctxt "Account type" +#| msgid "Administrator" msgid "Administrator" msgstr "إداري" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "الاسم بال_كامل" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_نوع الحساب" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "اسمح للمستخدم بوضع كلمة سر عند الولوج ال_تالي" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_ضع كلمة سر الآن" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +#| msgid "_Configure…" +msgid "_Confirm" msgstr "أ_كّد" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +#| msgid "" +#| "Enterprise login allows an existing centrally managed user account to be " +#| "used on this device." msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." -msgstr "ولوج المؤسسات يسمح باستخدام حساب مستخدم مدار مركزيًا على هذا الجهاز." - -#: ../panels/user-accounts/data/account-dialog.ui.h:12 -msgid "_Domain" -msgstr "الن_طاق" - -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"اتّصل لأضافة\n" -"حسابات ولوج مؤسسات." +"ولوج المؤسسات يسمح باستخدام حساب مستخدم مدار مركزيًا على هذا الجهاز. يمكنك " +"أيضًا استخدام هذا الحساب للوصول إلى موارد الشركة على الإنترنت." #: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "ولوج ال_مؤسسات" +#: ../panels/user-accounts/data/join-dialog.ui.h:9 +msgid "_Domain" +msgstr "الن_طاق" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "أضف مستخدما" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_سجّل" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "ولوج مدير النطاق" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"تحتاج أن تكون مسجّلا في النطاق لاستخدام ولوج المؤسسات على هذا الحاسوب.\n" -"من فضلك اطلب من مدير الشبكة أن يكتب كلمة سر النطاق هنا." +#| msgctxt "printer state" +#| msgid "Offline" +msgid "You are Offline" +msgstr "لست متّصلا" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "ا_سم المدير" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#| msgid "" +#| "Go online to add\n" +#| "enterprise login accounts." +msgid "You must be online in order to add enterprise users." +msgstr "يجب أن تكون متصلا لإضافة حسابات ولوج مؤسسات." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "كلمة سر المدير" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "ولوج ال_مؤسسات" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6070,7 +6198,7 @@ msgstr "الخنصر الأيمن" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "فعّل الولوج بالبصمة" @@ -6105,9 +6233,31 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "ولوج;اسم;بصمة;أيقونة;شعار;وجه;كلمة سر;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "تأريخ الولوج" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_سجّل" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "ولوج مدير النطاق" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"تحتاج أن تكون مسجّلا في النطاق لاستخدام ولوج المؤسسات على هذا الحاسوب.\n" +"من فضلك اطلب من مدير الشبكة أن يكتب كلمة سر النطاق هنا." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "ا_سم المدير" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "كلمة سر المدير" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6130,38 +6280,32 @@ msgstr "كلمة السر ال_حالية" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "اسمح للمستخدم بوضع كلمة سر عند الولوج التالي" +#| msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" +msgstr "اسمح للمستخدم بتغيير كلمة السر عند الولوج التالي" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "ضع كلمة سر الآن" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "أضِف حساب مستخدِم" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "أزِل حساب مستخدِم" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "أ_ضف مستخدمًا…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "خيارات الولوج" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "الولوج الت_لقائي" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "الولوج بال_بصمة" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "أيقونة المستخدم" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "آخر ولوج" @@ -6263,8 +6407,10 @@ msgstr "حاول إضافة حروف و أرقام و رموز أكثر." #: ../panels/user-accounts/pw-utils.c:117 +#| msgctxt "Password hint" +#| msgid "Mix uppercase and lowercase and use a number or two." msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "اخلط الحروف الكبيرة مع الصغيرة و استخدم رقمًا أو اثنين." #: ../panels/user-accounts/pw-utils.c:119 @@ -6355,32 +6501,33 @@ msgstr "عطل غير معروف" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "يجب أن تطابق عنوان الوب لمُزود الحساب." +#| msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." +msgstr "يجب أن تطابق عنوان الوب لمُزود الولوج." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "فشلت إضافة الحساب" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "لا تتطابق كلمتا السر." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "فشل تسجيل المستخدم" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "لا توجد طريقة مدعومة للاستيثاق مع هذا النطاق" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "فشل الانضمام إلى النطاق" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6388,7 +6535,7 @@ "اسم الولوج لم يعمل.\n" "من فضلك أعد المحاولة" -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6396,14 +6543,24 @@ "كلمة سر الولوج لم تعمل.\n" "من فضلك أعد المحاولة" -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "فشل الولوج إلى النطاق" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "تعذّر العثور على النطاق. هل أخطأت في كتابته؟" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "عادي" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "إداري" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6421,29 +6578,29 @@ msgid "Enabled" msgstr "مفعّل" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "أأحذف البصمات المسجّلة؟" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "ا_حذف البصمات" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "أتريد حذف بصماتك المسجلة بحيث يُعطل الولوج بالبصمة؟" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "تم!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "تعذر الوصول إلى الجهاز ‪'%s'‬" @@ -6451,16 +6608,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "تعذّر بدء التقاط الأصابع على الجهاز ‪'%s'‬" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "تعذّر الوصول إلى أي قارئ بصمة" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "من فضلك راجع مدير النظام للمساعدة." @@ -6469,18 +6626,18 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "لتفعيل الولوج بالبصمة، ستحتاج لحفظ إحدى بصماتك باستخدام الجهاز ‪'%s'‬." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "اصبع الاختيار" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "يسجّل البصمات" @@ -6534,14 +6691,21 @@ msgid "%s, %s" msgstr "%s، %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "انتهت الجلسة" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "بدأت الجلسة" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "‏%s – نشاط الحساب" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "رجاء اختر كلمة سر أخرى." @@ -6603,7 +6767,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "تعذّر الاتصال بالنطاق %s:‏ %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "الحسابات الأخرى" @@ -6681,15 +6845,15 @@ msgid "Logged in" msgstr "والِج" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "فشل الاتصال بخدمة الحسابات" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "رجاء تأكّد من أن AccountService مثبّتة ومفعّلة." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6697,12 +6861,12 @@ "انقر على أيقونة *\n" "لعمل أي تغييرات" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "أنشئ حساب مستخدِم" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6710,12 +6874,12 @@ "لإنشاء حساب مستخدِم،\n" "انقر أولًا على أيقونة *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "احذف حساب المستخدِم المختار" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6723,33 +6887,35 @@ "لحذف حساب المستخدم المختار،\n" "انقر أولًا على أيقونة *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "حسابي" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "اسم المستخدم '%s' موجود بالفعل." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "اسم المستخدم هذا غير متاح. جرب اسمًا آخر." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "اسم المستخدم طويل جدا." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "لا يمكن أن يبدأ اسم المستخدم بعلامة '-'." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 +#| msgid "" +#| "The username should only consist of lower and upper case letters from a-" +#| "z, digits and any of characters '.', '-' and '_'." msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"يجب أن لا يتعدى اسم المستخدم الحروف الإنجليزية الكبيرة و الصغيرة، و الأرقام " -"و أي من الحروف '.' و '-' و '_'." +"يجب أن لا يتعدى اسم المستخدم الحروف الإنجليزية الكبيرة و الصغيرة من a-z، و " +"الأرقام و أي من الحروف '.' و '-' و '_'." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "سيُستخدم هذا لتسمية مجلد المنزل ولا يمكن تغييره." @@ -6836,17 +7002,18 @@ msgid "Button" msgstr "زر" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#| msgid "Wacom Tablet" +msgid "Wa­com Tab­let" msgstr "لوح واكوم" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "اضبط استخدام أزرار و حساسية قلم ألواح الرسوميات" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "لوحة;واكوم;قلم;ممحاة;فأرة;" @@ -6878,6 +7045,10 @@ msgid "Bluetooth Settings" msgstr "إعدادات بلوتوث" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "لوح واكوم" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "تعيين شاشة عرض…" @@ -7063,6 +7234,11 @@ msgid "Tip Pressure Feel" msgstr "الشعور بضغط السن" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "كل الإعدادات" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "مركز تحكم جنوم" @@ -7117,22 +7293,18 @@ msgid "Quit" msgstr "أنهِ" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "كل الإعدادات" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "شخصي" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "العتاد" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "النظام" @@ -7171,6 +7343,175 @@ msgid "Cancel search" msgstr "ألغِ البحث" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +#| msgid "_Stop Hotspot" +msgctxt "hotspot" +msgid "Hotspot" +msgstr "نقطة بث" + +#~ msgid "Color" +#~ msgstr "الألوان" + +#~ msgid "_Name:" +#~ msgstr "الا_سم:" + +#~ msgid "Add Shortcut" +#~ msgstr "أضف اختصارًا" + +#~ msgid "Remove Shortcut" +#~ msgstr "أزِل اختصارًا" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "لتعديل مفتاح اختصار، انقر على السّطر ثم اضغط على الأزرار الجديدة أو اضغط " +#~ "مفتاح التّراجع لمسحها." + +#~ msgid "" +#~ msgstr "<إجراء غير معروف>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "الاختصار \"%s\" لا يمكن استخدامه لأن الطباعة بهذا المفتاح ستصبح متعذرة.\n" +#~ "حاول رجاءً استخدام مفتاح مع Ctrl أو Alt أو Shift في نفس الوقت." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "الاختصار \"%s\" مستخدم في:\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "إذا أعدت تعيين الاختصار \"%s\" فسيُعطّل الاختصار \"%s\"." + +#~ msgid "_Reassign" +#~ msgstr "أعِد ال_تعيين" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "الاختصار \"%s\" مرتبط بالاختصار \"%s\". هل تريد ضبطه تلقائيا إلى \"%s\"؟" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "الاختصار \"%s\" مرتبط حاليًا بالاختصار \"%s\"، سيُعطّل الاختصار إذا أكملت." + +#~ msgid "_Assign" +#~ msgstr "ا_ضبط" + +#~ msgid "Team" +#~ msgstr "فريق" + +#~ msgid "Bridge" +#~ msgstr "جسر" + +#~ msgid "VLAN" +#~ msgstr "شبكة محلية ظاهرية" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "تعذّر تحميل ملحقات VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "أضف اتصالًا شبكيّا" + +#~ msgid "Bond slaves" +#~ msgstr "أجهزة تابعة للربط" + +#~ msgid "(none)" +#~ msgstr "(لا شيء)" + +#~ msgid "Bridge slaves" +#~ msgstr "تابعي الجسر" + +#~ msgid "Team slaves" +#~ msgstr "تابعي الفريق" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "لم تُختر أي شهادة سُلْطة استيثاق" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "عدم استخدام شهادة أمنيّة من جهة معتمدة قد يتسبّب باتصالات لا سلكية غير آمنة " +#~ "واحتيالية. هل تريد اختيار شهادة أمنية من جهة معتمدة؟" + +#~ msgid "Ignore" +#~ msgstr "تجاهل" + +#~ msgid "Choose CA Certificate" +#~ msgstr "اختر شهادة سُلْطة استيثاق" + +#~ msgid "As_k for this password every time" +#~ msgstr "ا_طلب كلمة السر هذه في كل مرة" + +#~ msgid "Don't _warn me again" +#~ msgstr "لا _تنبهني ثانيةً" + +#~ msgid "No" +#~ msgstr "لا" + +#~ msgid "Yes" +#~ msgstr "نعم" + +#~ msgid "Error logging into the account" +#~ msgstr "خطأ عند الولوج إلى الحساب" + +#~ msgid "Credentials have expired." +#~ msgstr "انتهت صلاحية بيانات الاستيثاق." + +#~ msgid "Sign in to enable this account." +#~ msgstr "ادخل لتفعيل هذا الحساب." + +#~ msgid "_Sign In" +#~ msgstr "اد_خل" + +#~ msgid "Power" +#~ msgstr "الطاقة" + +#~ msgid "Privacy" +#~ msgstr "الخصوصية" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "أخرى" + +#~ msgid "Personal File Sharing" +#~ msgstr "مشاركة الملفات الشخصية" + +#~ msgid "_Allow Remote Control" +#~ msgstr "اسمح بالتحكم عن بع_د" + +#~ msgid "_Verify" +#~ msgstr "أ_كّد" + +#~ msgid "Login History" +#~ msgstr "تأريخ الولوج" + +#~ msgid "Add User Account" +#~ msgstr "أضِف حساب مستخدِم" + +#~ msgid "Remove User Account" +#~ msgstr "أزِل حساب مستخدِم" + +#~ msgid "Login Options" +#~ msgstr "خيارات الولوج" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "اسم المستخدم '%s' موجود بالفعل." + #~ msgid "Done" #~ msgstr "تمّ" @@ -7243,9 +7584,6 @@ #~ msgid "Fast" #~ msgstr "سريع" -#~ msgid "Two _finger scroll" -#~ msgstr "اللف بأ_صبعين" - #~ msgid "No printers available" #~ msgstr "لا تتوفر أي طابعات" @@ -7648,9 +7986,6 @@ #~ msgid "Domain not found." #~ msgstr "المودم غير موجود" -#~ msgid "Wrong password" -#~ msgstr "كلمة سر خاطئة" - #~ msgid "Export" #~ msgstr "صدِّر" @@ -8112,9 +8447,6 @@ #~ msgid "Out of range" #~ msgstr "خارج المدى" -#~ msgid "_Configure…" -#~ msgstr "ا_ضبط…" - #~ msgid "_Disconnect" #~ msgstr "ا_قطع الاتصال" @@ -8451,9 +8783,6 @@ #~ msgid "Take a screenshot" #~ msgstr "التقط صورة للشاشة" -#~ msgid "Shortcut" -#~ msgstr "الاختصار" - #~ msgid "_Right-handed" #~ msgstr "فأرة لليد الي_منى" @@ -8668,9 +8997,6 @@ #~ msgid "The type of accelerator." #~ msgstr "نوع مفتاح الاختصار." -#~ msgid "Error saving the new shortcut" -#~ msgstr "خطأ أثناء حفظ الاختصار الجديد" - #~ msgid "Too many custom shortcuts" #~ msgstr "الكثير من الاختصارات المخصصة" diff -Nru gnome-control-center-3.20.2/po/as.po gnome-control-center-3.22.1/po/as.po --- gnome-control-center-3.20.2/po/as.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/as.po 2016-08-12 12:43:57.000000000 +0000 @@ -15,7 +15,7 @@ "PO-Revision-Date: 2014-08-20 13:00+0530\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: Assamese \n" -"Language: as_IN\n" +"Language: as\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/az.po gnome-control-center-3.22.1/po/az.po --- gnome-control-center-3.20.2/po/az.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/az.po 2016-08-12 12:43:57.000000000 +0000 @@ -13,6 +13,7 @@ "PO-Revision-Date: 2004-09-04 19:45+0300\n" "Last-Translator: Mətin Əmirov \n" "Language-Team: Azerbaijani \n" +"Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/be@latin.po gnome-control-center-3.22.1/po/be@latin.po --- gnome-control-center-3.20.2/po/be@latin.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/be@latin.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2009-02-25 23:01+0200\n" "Last-Translator: Alaksandar Navicki \n" "Language-Team: Polish \n" +"Language: be@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/bg.po gnome-control-center-3.22.1/po/bg.po --- gnome-control-center-3.20.2/po/bg.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/bg.po 2016-09-08 11:48:12.000000000 +0000 @@ -16,10 +16,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-control-center gnome-3-20\n" +"Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-09 07:29+0300\n" -"PO-Revision-Date: 2016-04-09 07:29+0300\n" +"POT-Creation-Date: 2016-09-08 06:18+0300\n" +"PO-Revision-Date: 2016-09-08 06:18+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -98,7 +98,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Домашна папка" @@ -114,25 +114,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -163,16 +162,17 @@ msgid "Current background" msgstr "Текущ фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Смяна на фона да е снимка или картина" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "фон;екран;работен плот;wallpaper;screen;desktop;" @@ -212,18 +212,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Изключване на самолетния режим, за да се включи Bluetoothл" -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Връзка по Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Включване и изключване на Bluetooth и свързване на устройствата" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "" "блутут;син;зъб;споделяне;файл;слушалки;телефон;пренасяне;share;sharing;" @@ -399,7 +398,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Всички файлове" @@ -438,7 +437,7 @@ msgstr "Запазване на профил" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Запазване" @@ -689,11 +688,11 @@ "\">Microsoft Windows systems useful." msgstr "" "Инструкциите как да ползвате профила под различни операционни системи се " -"намират тук: GNU/Linux, Apple OS X " -"и Microsoft Windows." +"намират тук: GNU/Linux, Apple OS X и " +"Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Обобщение" @@ -705,11 +704,11 @@ msgid "_Import File…" msgstr "_Внасяне на файл…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Добавяне" @@ -718,7 +717,7 @@ "Problems detected. The profile may not work correctly. Show " "details." msgstr "" -"Има проблеми и профилът може да не сработи правилно. Повече " +"Има проблеми и профилът може да не сработи правилно. Повече " "детайли." #: ../panels/color/color.ui.h:33 @@ -862,17 +861,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Цвят" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Калибриране на цвета на устройствата като екрани, камери, принтери" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "цвят;профил;калибриране;принтер;екран;color;icc;profile;calibrate;printer;" @@ -892,23 +892,23 @@ msgid "No languages found" msgstr "Не са намерени езици" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "днес" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "вчера" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%е %b %Y" @@ -1028,8 +1028,9 @@ msgid "December" msgstr "декември" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Дата и час" @@ -1086,12 +1087,12 @@ msgid "AM / PM" msgstr "12-часов" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Смяна на датата, часа, часовия пояс" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "" "часовник;часови пояс;местоположение;часова зона;време;clock;timezone;" @@ -1107,211 +1108,226 @@ "Ще трябва да се идентифицирате, за да промените настройките на датата или " "времето." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Затворен екран" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Еднакво изображение" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Основен" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Изключване" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Допълнителен" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Подреждане на обединените екрани" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Прилагане" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Подредете екраните с влачене" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Завъртане на 90° обратно на часовниковата стрелка" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Завъртане на 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Завъртане на 90° по часовниковата стрелка" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Размер" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Съотношение на страните" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Разделителна способност" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "За телевизор" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Честота на опресняване" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Показване на горната лента и прегледа на действията на този екран" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Допълнителен екран" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Съединяване на този екран с друг за по-голям работен плот" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Презентация" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Показване само на прожекции и мултимедия" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Еднакво изображение" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Извеждане на текущия образ и на двата екрана" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Изключване" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Екранът да не се ползва" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Неуспешно получаване на информацията за екрана" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Подреждане на обединените екрани" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ек­ра­ни" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Изберете как да се използват свързаните екрани и проектори" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "панел;проектор;екран;разделителна способност;опресняване;монитор;дисплей;" "panel;projector;xrandr;screen;resolution;refresh;monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Неизвестен" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d бита (изграждане: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d бита (изграждане: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" -msgstr "%s %d-битов" +msgstr "%s %d бита" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" -msgstr "%d-битов" +msgstr "%d бита" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "да се пита за действие" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "нищо да не се прави" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "отваряне на папката" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Други носители" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Изберете програма, с която да отваряте аудио дискове (CD)" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Изберете програма, с която да отваряте видео дискове (DVD)" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Изберете програма, която да се изпълнява при свързване на преносимо " "устройство за музика" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Изберете програма, която да се изпълнява при свързване на камера" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Изберете програма, с която да се отварят дискове с програми" @@ -1320,88 +1336,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "аудио диск – DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "празен диск – Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "празен диск – CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "празен диск – DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "празен диск – HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "видео диск – Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "четец на електронни книги" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "видео диск – HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "диск с изображения – CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "видео диск – Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "видео диск – Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Програми за Уиндоус" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Раздел" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Преглед" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Стандартни програми" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Преносими носители" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Версия %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Подробности" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "Под­роб­нос­ти" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Извеждане на информация за компютъра" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1579,8 +1593,9 @@ msgid "Launch help browser" msgstr "Стартиране на програмата за помощ" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Настройки" @@ -1653,7 +1668,6 @@ msgstr "Заключване на екрана" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Универсален достъп" @@ -1689,11 +1703,21 @@ msgid "High contrast on or off" msgstr "Включване/изключване на високия контраст" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Потребителски клавишни комбинации" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:417 +#: ../panels/keyboard/shortcut-editor.ui.h:1 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1720,42 +1744,46 @@ msgid "Modifiers-only switch to next source" msgstr "Превключване към следващия вход само чрез модификатори" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Кла­ви­а­ту­ра" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Използване на стандартната клавишна комбинация" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:308 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s вече се ползва за %s. Ако го замените, %s ще бъде изключен" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:444 +#, c-format +msgid "Keyboard shortcut for %s. Enter new shortcut to change." +msgstr "" +"Клавишна комбинация за %s. Въведете нова клавишна комбинация, за да я " +"смените." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:799 +msgid "Add Custom Shortcut" +msgstr "Добавяне на клавишна комбинация" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Кла­ви­а­ту­ра" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Преглед и промяна на клавишните комбинации и другите настройки на " "клавиатурата" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "клавишна;комбинация;повторение;мигане;shortcut;repeat;blink;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Потребителска клавишна комбинация" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Име:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "_Команда:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Добавяне на клавишна комбинация" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Премахване на клавишната комбинация" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 msgid "" "To edit a shortcut, click the row and hold down the new keys or press " "Backspace to clear." @@ -1763,78 +1791,73 @@ "За да редактирате клавишната комбинация, натиснете върху съответния ред и " "въведете новата комбинация, или натиснете „Backspace“ за изчистване." -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Потребителски клавишни комбинации" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "No keyboard shortcut found" +msgstr "Няма клавишни комбинации" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Неизвестно действие>" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +msgid "Try a different search" +msgstr "Пробвайте друго търсене" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"„%s“ не може да ползва като клавишна комбинация, защото ще е невъзможно да " -"се въвежда самостоятелно.\n" -"Комбинирайте го с някой от клавишите „Control“, „Alt“ или „Shift“." +#: ../panels/keyboard/shortcut-editor.ui.h:2 +#: ../panels/network/connection-editor/ce-page-reset.c:78 +#: ../panels/network/network-wifi.ui.h:51 +msgid "Reset" +msgstr "Премахване" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Клавишната комбинация „%s“ вече се използва за:\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Име" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Ако прехвърлите клавишната комбинация на „%s“, комбинацията „%s“ ще бъде " -"изключена." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Команда" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Клавишна комбинация" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Редактиране" + +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Без" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Прехвърляне" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +msgid "Remove" +msgstr "Премахване" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Клавишната комбинация „%s“ вече се използва за „%s“. Искате ли да я зададете " -"автоматично да е „%s“?" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Отказ" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Клавишната комбинация „%s“ вече се използва за „%s“. Тази комбинация ще бъде " -"изключена, ако преминете напред." +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Добавяне" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Присвояване" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +msgid "Replace" +msgstr "Замяна" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Изпробване на _настройките" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Миш­ка и сен­зо­рен па­нел" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1842,7 +1865,7 @@ "или дясна ръка" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "сензорен панел;показалец;натискане;кликане;кликване;почукване;двойно " @@ -1903,6 +1926,10 @@ msgstr "Натискане чрез тупване" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Придвижване с два пръста" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Придвижване чрез ръбовете" @@ -1941,11 +1968,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Само_летен режим" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Мрежов сървър-посредник" @@ -1953,17 +1980,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "ВЧМ „%s“" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Възникна грешка, свържете се с доставчика на софтуера." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager трябва да е стартиран." @@ -1979,7 +2006,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1996,59 +2023,64 @@ msgid "page 2" msgstr "страница 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Сигурност" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "автоматично" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Профил %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Корпоративна" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Без" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "никога" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2056,179 +2088,174 @@ msgstr[1] "преди %i дни" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Няма сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Слаб сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Задоволителен сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Добър сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Отличен сигнал" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Подробности" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Идентичност" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Адрес" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Мрежова маска" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Шлюз" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Изтриване на адрес" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Добавяне" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Сървър" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Изтриване на DNS сървър" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Метрика" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Изтриване на маршрут" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Автоматично (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ръчно" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Само локално за връзката (169.254.0.0/16)" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Префикс" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Автоматично" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Автоматично – само DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 -#: ../panels/network/network-wifi.ui.h:51 -msgid "Reset" -msgstr "Премахване" - -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Без" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "40/128 битов ключ за WEP (шестнайсетичен или ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "128 битова парола за WEP" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Динамичен WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Частна WPA & WPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Корпоративна WPA или WPA2" @@ -2243,30 +2270,30 @@ msgstr "Скорост на връзката" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Адрес (IPv4)" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Адрес (IPv6)" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Апаратен адрес" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2276,7 +2303,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2361,13 +2388,13 @@ # На едното място е в женски род — подредба, на другото май е мъжки. # Затова вместо „стандартно“ ползвам „По подразбиране“. -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "По подразбиране" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Зоната определя нивото на доверие към връзката" @@ -2409,45 +2436,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Неуспешно отваряне на редактора на адреси" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Нов профил" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "ВЧМ (VPN)" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Свързване (bond)" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Обединяване (team)" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Мост (bridge)" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "ВЛМ (VLAN)" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Неуспешно зареждане на приставките за ВЧМ" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Внасяне от файл…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Добавяне на мрежова връзка" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Нова ВЧМ" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2455,7 +2462,7 @@ msgstr "_Премахване" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Забравяне" @@ -2481,11 +2488,11 @@ msgid "S_ecurity" msgstr "С_игурност" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Настройките за ВЧМ не могат да бъдат внесени" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2497,36 +2504,36 @@ "\n" "Грешка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Избор на файл за внасяне" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Отваряне" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Вече съществува файл с име „%s“." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Замяна" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Искате ли да замените „%s“ с ВЧМ, която внасяте?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Настройките за ВЧМ не могат да бъдат изнесени" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2537,7 +2544,7 @@ "\n" "Грешка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Изнасяне на настройките за ВЧМ" @@ -2564,62 +2571,48 @@ msgid "Make available to _other users" msgstr "_Достъпна за всички потребители" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Мрежа" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Мре­жа" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Настройки на връзката към Интернет" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "мрежа;безжична;адрес;порт;локален;локална;широколентов;модем;виртуален;" "виртуална;частна;връзка;име;имена;шлюз;маршрутизатор;рутър;network;wireless;" "wi-fi;wifi;ip;lan;proxy;wan;broadband;modem;bluetooth;vpn;vlan;bridge;bond;" "dns;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Свързани подчинени устройства" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(няма)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Свързани устройства за мост" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "никога" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "днес" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "вчера" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Адрес по IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Последно ползване" @@ -2629,34 +2622,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Жична мрежа" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Настройки…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Профил %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Добавяне на нова връзка" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Обединени подчинени устройства" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2665,14 +2649,14 @@ "настроите точка за безжичен достъп и да я използвате за споделяне на " "Интернет с други хора." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Ако включите точката за безжичен достъп, връзката ви към %s ще бъде " "прекъсната." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2680,24 +2664,24 @@ "Не е възможно да ползвате Интернет през безжична мрежа докато точката за " "безжичен достъп е включена." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "" "Спиране на точката за безжичен достъп и изключване на всички потребители?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Спиране на точката за безжичен достъп" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Системните политики забраняват създаването на точка за безжичен достъп" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Безжичното устройство не поддържа режим за точка за безжичен достъп" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2705,11 +2689,11 @@ "Данните за посочените мрежи, включително пароли и потребителски настройки ще " "бъдат изгубени." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "История" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2717,7 +2701,7 @@ msgstr "_Затваряне" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Премахване" @@ -2754,6 +2738,10 @@ msgid "Provider" msgstr "Доставчик" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Мрежа" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2860,15 +2848,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Парола" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Без" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "_Показване на паролата" @@ -2962,7 +2946,6 @@ msgstr "_Свързване към скрита мрежа…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_История" @@ -2984,378 +2967,353 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Парола" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Децентрализирана мрежа (Ad-hoc)" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Инфраструктура" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Неизвестно състояние" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Без управление" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Недостъпна" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Свързване" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Изисква се удостоверяване" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Връзката е осъществена" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Прекъсване на връзката" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Връзката е неуспешна" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Състоянието на връзката е неизвестно (липсва информация)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Без връзка" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Неуспешно настройване" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Неуспешно настройване на IP адреса" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Изтече времето за настройката на IP адреса" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Не бяха предоставени задължителните данни за установяване на връзката" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "" "Връзката (802.1x) беше прекъсната от програмата за удостоверяване " "(supplicant)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "" "Неуспех при настройка на програмата за удостоверяване (supplicant) на " "връзката (802.1x)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "" "Програмата за удостоверяване (supplicant) на връзката (802.1x) приключи " "неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "" "Удостоверяването на връзката (802.1x) отне на програмата (supplicant) повече " "време от стандартното" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Неуспешно стартиране на услугата за връзка чрез PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Услугата за връзка чрез PPP е прекъсната" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Услугата за връзка чрез PPP приключи неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "" "Неуспешно стартиране на клиента за автоматична настройка на връзката (DHCP)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Грешка на клиента за автоматична настройка на връзката (DHCP)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "" "Клиентът за автоматична настройка на връзката (DHCP) приключи неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Неуспешно стартиране на услугата за споделяне на връзката" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Услугата за споделяне на връзката приключи неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "" "Неуспешно стартиране на услугата за локална връзка (AutoIP, 169.254.0.0/16, " "fe80::/10)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "" "Грешка в услугата за локална връзка (AutoIP, 169.254.0.0/16, fe80::/10)" # AutoIP = link-local #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "" "Услугата за локална връзка (AutoIP, 169.254.0.0/16, fe80::/10) приключи " "неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Линията е заета" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Няма сигнал" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Неуспешно установяване на носещата честота" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Времето на заявката за набиране изтече" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Опитът за набиране приключи неуспешно" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Неуспешно инициализиране на модема" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Неуспешно избиране на зададената точка за достъп (APN)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Не се търсят мрежи" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Регистрацията в мрежата е отхвърлена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Времето на заявката за регистрация в мрежата изтече" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Неуспешна регистрация в заявената мрежа" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Неуспешна проверка на кода (PIN)" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Възможно е фърмуерът за устройството да липсва" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Връзката се изгуби" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Предполагаше се съществуваща връзка" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Не е открит модем" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Неуспешна връзка чрез Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr " SIM картата не е поставена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Необходим е код (PIN) за SIM картата" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Необходим е код (PUK) за SIM картата" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Грешна SIM карта" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "" -"Устройството (InfiniBand) не поддържа режима „установена връзка“ (connected " -"mode)" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Неуспешно активиране на зависимост за връзката" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Липсва фърмуер" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Кабелът е изваден" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Не е избран сертификат на удостоверител" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "грешка в сигурността 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "не е избран файл" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Когато не използвате сертификат на удостоверител (CA) е възможно да се " -"свържете с измамна безжична мрежа погрешка. Ще изберете ли сертификат на " -"удостоверител?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Пренебрегване" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Избор на сертификат на удостоверител" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Частни ключове във формат DER, PEM или PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "грешка при проверката на файла за eap" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "" +"Частни ключове във формат DER, PEM или PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Сертификати във формат DER или PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "файлът за EAP-FAST PAC липсва" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC (карта за еднократни пароли)" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2 (предизвикателство и ръкостискане)" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Избор на файл PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Файлове във формат PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Файл за PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Вътрешно удостоверяване" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_Осигуряване на PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3364,41 +3322,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Свободен достъп" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Удостоверяване" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "И двете" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Файл за PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Вътрешно удостоверяване" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "_Автоматично осигуряване На PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "липсва потребителско име за EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "липсва парола за EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Потребителско _име" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Показване на паролата" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "неправилен сертификат на удостоверител за EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"неправилен сертификат на удостоверител за EAP-PEAP: не е указан сертификат" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Избор на сертификат на доставчик на удостоверителски услуги" @@ -3416,19 +3407,57 @@ msgid "C_A certificate" msgstr "_Сертификат на удостоверител" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "_Не се изисква сертификат на удостоверител" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Версия на PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Запитване за парола всеки път" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "липсва потребителско име за EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "липсва парола за EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "липсва идентичност за EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "неправилен сертификат на удостоверител за EAP-TLS: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" +"неправилен сертификат на удостоверител за EAP-TLS: не е указан сертификат" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "неправилна парола за EAP-TLS: липсва" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "неправилен частен ключ за EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "неправилен потребителски сертификат за EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Нешифрираните лични ключове са несигурни" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3441,11 +3470,11 @@ "\n" "(Можете да защитите частния ключ с парола чрез командата „openssl“)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Изберете личния си сертификат" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Изберете частния си ключ" @@ -3457,51 +3486,57 @@ msgid "_User certificate" msgstr "_Личен сертификат" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Частен ключ" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Парола за _частния ключ" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "неправилен сертификат на удостоверител за EAP-TTLS: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"неправилен сертификат на удостоверител за EAP-TTLS: не е указан сертификат" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Без повече предупреждения" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Не" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Да" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Грешка при валидиране на сигурността за 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Тунел по TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Защитен EAP (PEAP)" @@ -3511,6 +3546,50 @@ msgid "Au_thentication" msgstr "_Удостоверяване" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "липсва потребителско име за leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "липсва парола за leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "липсва ключ за wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"неправилен ключ за wep: ключ с дължина от %zu знака трябва да съдържа само " +"шестнадесетични цифри" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"неправилен ключ за wep: ключ с дължина от %zu знака трябва да съдържа само " +"ASCII" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"неправилен ключ за wep: неправилна дължина на ключа — %zu. Той трябва да е " +"дълъг или 5/13 знака за ASCII, или 10/26 знака за шестнадесетични цифри" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "неправилен ключ за wep: празна парола" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "неправилен ключ за wep: паролата трябва да е под 64 знака" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (По подразбиране)" @@ -3547,19 +3626,34 @@ msgid "WEP inde_x" msgstr "Индек_с в WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"неправилен ключ за wpa-psk: дължината на ключа е %zu. Трябва да е от 8 до 63 " +"байта или 64 шестнадесетични цифри" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"неправилен ключ за wpa-psk: ключът е дълъг 64 байта, но не се състои само от " +"шестнадесетични цифри" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Вид" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Включване" @@ -3596,16 +3690,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Показване на _съдържанието на известията при заключен екран" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Известия" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Из­вес­тия" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Управление на известията и тяхната детайлност" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "предупреждения;известия;съобщения;тава;изскачащ;notifications;banner;message;" @@ -3625,95 +3720,85 @@ msgid "Applications" msgstr "Програми" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Друга" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Добавяне на регистрация" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "E-поща" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Календар" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Контакти" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Разговори" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ресурси" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Неуспешно влизане в регистрацията" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Периодът на валидност на данните за идентификация е изтекъл" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Влезте, за да активирате регистрацията." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Вход" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Неуспешно създаване на регистрацията" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Неуспешно премахване на регистрация" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Наистина ли желаете да премахнете регистрацията?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Действието няма да премахне регистрацията на сървъра." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Премахване" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Ре­гис­т­ра­ции в сай­то­ве" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Свързване с регистрациите ви в някои сайтове и задаване за какво да се " "ползват" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" msgstr "" "гугъл;фейсбук;туитър;яху;социален;уеб;мрежа;разговор;календар;поща;контакт;" -"оун;клауд;керберос;имап;smtp;покет;покит;рийд;google;facebook;twitter;yahoo;" -"web;online;chat;calendar;mail;contact;owncloud;kerberos;imap;smtp;pocket;" -"readitlater;" +"оун;клауд;керберос;цербер;имап;smtp;покет;покит;рийд;google;facebook;twitter;" +"yahoo;web;online;chat;calendar;mail;contact;owncloud;kerberos;imap;smtp;" +"pocket;readitlater;" #: ../panels/online-accounts/online-accounts.ui.h:1 msgid "No online accounts configured" msgstr "Няма настроени регистрации в сайтове" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Премахване на регистрация" @@ -3856,7 +3941,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Батерия" @@ -3904,105 +3989,106 @@ msgid "When _idle" msgstr "При _бездействие" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Енергоспестяване" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Яркост на _екрана" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Автоматична яркост" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Яркост на _клавиатурата" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "За_тъмняване на екрана при бездействие" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Изчистване на екрана" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Безжична мрежа" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Изключване на безжичната мрежа за пестене на енергия." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Мобилна мрежа" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Изключване на мобилна, широколентова мрежа (3G, 4G, WiMax, и т.н.) за " "пестене на енергия." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "Връзка по _Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "При работа от батерии" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "При включване на захранването" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "приспиване" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "дълбоко приспиване" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "нищо" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Бутон за приспиване и изключване" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Автоматично приспиване" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Автоматично приспиване" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_При натискане на бутона за приспиване и изключване" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Устройства" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Захранване" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Зах­ран­ва­не" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Преглед на състоянието на батерията и промяна на настройките на " "енергоспестяването" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4082,11 +4168,6 @@ msgid "Delay" msgstr "Закъснение" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Отказ" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Удостоверяване" @@ -4096,138 +4177,138 @@ msgstr "Изисква се удостоверяване" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Тонерът е на привършване" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Тонерът свърши" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Проявителят е на привършване" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Проявителят свърши" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Мастилото е на привършване" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Мастилото свърши" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Отворен капак" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Отворена вратичка" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Хартията е на привършване" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Хартията свърши" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Изключен" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "спрян" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Контейнерът за отпадъчно мастило е почти пълен" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Контейнерът за отпадъчно мастило е пълен" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Барабанът е почти износен" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Барабанът е износен" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Настройване" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "в готовност" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "не приема задачи" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "обработване" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Ниво на тонера" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Ниво на мастилото" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Ниво на консуматива" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Инсталиране" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4235,15 +4316,15 @@ msgstr[1] "%u задачи" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Неуспешно добавяне на нов принтер." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Избор на файл – PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4251,49 +4332,46 @@ "Файлове на PostScript за описание на принтери (*.ppd, *.PPD, *.ppd.gz, *.PPD." "gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Не е открит подходящ драйвер" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Търсене на предпочитани драйвери…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Избор от списък…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Задаване на файла с описанието (PPD)…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Пробна страница" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Няма принтери" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Неуспешно зареждане на файла с потребителския интерфейс „%s“" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Прин­те­ри" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Добавяне на принтери, преглед на задачите за печат, настройки на печата" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "" "принтер;опашка;печат;хартия;мастило;тонер;printer;queue;print;paper;ink;" @@ -4457,6 +4535,11 @@ msgid "Parallel Port" msgstr "Паралелен порт" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Връзка по Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4667,13 +4750,17 @@ msgid "_Options" msgstr "_Настройки" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Няма принтери" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Добавяне на принтер" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4681,70 +4768,70 @@ "Изглежда, че системната услуга\n" "за печат не е налична." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Заключване на екрана" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Използва се" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Включено" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Изключено" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Услуги за местоположение" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Използване и история" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Изчистване на кошчето" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Всичко в кошчето ще бъде безвъзвратно изтрито." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Изчистване на кошчето" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Да се изчистят ли всички временни файлове?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Всички временни файлове ще бъдат окончателно изтрити." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "И_зчистване на временните файлове" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Изчистване на кошчето и временните файлове" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Обновяване на програмите" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Докладване на грешка" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4753,20 +4840,21 @@ "Докладите за грешка помагат да се подобри „%s“. Те се изпращат анонимно и " "без идентифицираща потребителя информация." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Поверителност" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Поверителност" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "По­ве­ри­тел­ност" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Защита на личните данни и управление какво могат да видят другите" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4940,21 +5028,21 @@ msgid "Other" msgstr "Друго" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "За да влязат настройките в сила, трябва да рестартирате сесията" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Рестартиране" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Не е избрано входно устройство" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Екран за _вход" @@ -4986,17 +5074,18 @@ msgid "Paper" msgstr "Хартия" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Ре­ги­он и ез­ик" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Изберете език, формати, клавиатурна подредба и входни устройства" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "език;подредба;клавиатура;вход;language;layout;keyboard;input;" @@ -5053,7 +5142,7 @@ msgstr "Ляв+десен Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Език" @@ -5103,26 +5192,11 @@ "Настройките при вход се споделят от всички потребители при влизането им в " "системата" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Места" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Отметки" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Друго" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Избор на регион" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Добре" @@ -5130,11 +5204,12 @@ msgid "No applications found" msgstr "Не са открити програми" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Търсене" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5142,7 +5217,7 @@ "действията" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "търсене;намиране;индекс;скриване;личен;частен;резултати;search;find;index;" @@ -5152,6 +5227,18 @@ msgid "Search Locations" msgstr "Търсене на местоположение" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Места" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Отметки" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Друга" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Нагоре" @@ -5164,6 +5251,11 @@ msgid "Preferences" msgstr "Настройки" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Не са избрани мрежи за споделяне" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5196,43 +5288,48 @@ "your current network using: dav://%s" msgstr "" "Споделянето на лични файлове ви позволява да споделите папката „Публични“ с " -"други потребители през текущата мрежа чрез следния адрес: dav://%s" +"други потребители през текущата мрежа чрез следния адрес: dav://%s" #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" "Позволяване на отдалечените потребители да се връзват към машината ви с " "команда за сигурна обвивка:\n" -"ssh %s" +"ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" "Позволяване на отдалечените потребители да виждат или да управляват екрана " -"ви като се свържат към: vnc://%s" +"ви като се свържат към: vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Копиране" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Споделяне" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Спо­де­ля­не" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Определяне какво да се споделя с другите" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5244,6 +5341,10 @@ "ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;pictures;" "photos;movies;server;renderer;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Мрежи" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Включване или изключване на отдалечената графична връзка" @@ -5253,24 +5354,12 @@ msgstr "" "Изисква се удостоверяване за превключване на отдалечената графична връзка" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Не са избрани мрежи за споделяне" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Мрежи" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Име на компютър" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" +msgid "_File Sharing" msgstr "Споделяне на _файлове" #: ../panels/sharing/sharing.ui.h:3 @@ -5290,8 +5379,8 @@ msgstr "Някои услуги са спрени поради липса на връзка към мрежа." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Споделяне на лични файлове" +msgid "File Sharing" +msgstr "Споделяне на файлове" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5306,8 +5395,8 @@ msgstr "Споделяне на екрана" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "Позволяване на _отдалечен контрол" +msgid "_Allow connections to control the screen" +msgstr "_Позволяване на отдалечен контрол" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5334,9 +5423,8 @@ msgstr "Споделяне на музика" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "Това ви позволява да споделяте музика, снимки и видео по мрежата." +msgid "Share music, photos and videos over the network." +msgstr "Споделяне на музика, снимки и видео по мрежата." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5471,11 +5559,6 @@ msgid "Peak detect" msgstr "Засичане на връхната точка" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Име" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Устройство" @@ -5572,16 +5655,21 @@ msgid "Subwoofer" msgstr "Бас" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Потребителски" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Уни­вер­са­лен дос­тъп" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "По-лесно да се вижда, чува, въвежда текст, посочват и натискат обекти" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5681,8 +5769,8 @@ msgstr "Звуци за клавишите" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Звуков сигнал при включването на „Num Lock“ и „Caps Lock“." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Звуков сигнал при превключването на „Num Lock“ и „Caps Lock“." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6063,95 +6151,67 @@ msgstr "Цветови ефекти" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" -msgid "Standard" -msgstr "стандартна" - -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" -msgid "Administrator" -msgstr "администратор" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Добавяне на потребител" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 +#: ../panels/user-accounts/data/account-dialog.ui.h:5 msgid "_Full Name" msgstr "П_ълно име" -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +msgid "Standard" +msgstr "Стандартна" + +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +msgid "Administrator" +msgstr "Администратор" + +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Вид на регистрацията" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "_Позволяване на потребителя да избере парола при следващото влизане" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Задаване на парола _сега" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "Про_верка" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Потвърждаване" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Корпоративният вход позволява на този компютър да бъдат ползвани централно " -"управлявани потребителски регистрации." +"управлявани потребителски регистрации. Това обикновено дава и достъп до " +"ресурсите на компанията в интернет." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Област/домейн" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Трябва да сте в мрежата, за да\n" -"добавите корпоративни регистрации." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Корпоративен вход" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Добавяне на потребител" +msgid "You are Offline" +msgstr "Не сте на линия" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Добавяне към домейн" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Вход за администратор на областта/домейна" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"За да влезете в корпоративната мрежа, компютърът ви трябва да бъде " -"регистриран в домейна ѝ. Помолете вашия мрежови администратор да въведе " -"паролата си тук." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Име на администратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Трябва да сте в мрежата, за да добавите корпоративни регистрации." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Парола на администратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Корпоративен вход" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6186,7 +6246,7 @@ msgstr "Дясно кутре" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Включване на влизането с пръстов отпечатък" @@ -6225,9 +6285,32 @@ "влизане;име;пръстов отпечатък;аватар;лого;лице;парола;login;name;fingerprint;" "avatar;logo;face;password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "История на влизанията" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Добавяне към домейн" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Вход за администратор на областта/домейна" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"За да влезете в корпоративната мрежа, компютърът ви трябва да бъде " +"регистриран в домейна ѝ. Помолете вашия мрежови администратор да въведе " +"паролата си тук." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Име на администратора" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Парола на администратора" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6250,38 +6333,30 @@ msgstr "_Текуща парола" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "Позволяване на потребителя да избере парола при следващото влизане" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "въвеждане на парола сега" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Добавяне на потребителска регистрация" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Премахване на потребителска регистрация" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Добавяне на потребител…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Настройки за влизане" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "_Автоматично влизане" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Влизане с _пръстов отпечатък" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Снимка за потребителя" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "_Последно влизане" @@ -6383,7 +6458,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Използвайте главни и малки букви, добавете и някоя и друга цифра." #: ../panels/user-accounts/pw-utils.c:119 @@ -6475,32 +6550,32 @@ msgstr "Непозната грешка" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Трябва да съвпада с уеб адреса на доставчика на регистрации." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Неуспешно добавяне на регистрация" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Паролите не съвпадат." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Неуспешна връзка с регистрация" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Няма поддръжка за удостоверяването на тази област/домейн" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Неуспешно присъединяване към областта/домейна" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6508,7 +6583,7 @@ "Неправилна потребителско име.\n" "Опитайте отново." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6516,14 +6591,24 @@ "Неправилна парола.\n" "Опитайте отново." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Неуспешен вход в областта/домейна" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Домейнът липсва. Да сте сбъркали името му?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "стандартна" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "администратор" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6543,15 +6628,15 @@ msgid "Enabled" msgstr "Включен" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Изтриване на въведените отпечатъци?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Изтриване на отпечатъците" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6559,15 +6644,15 @@ "Искате ли да изтриете въведените си отпечатъци и да изключите влизането с " "тях?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Готово!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Устройството „%s“ е недостъпно" @@ -6575,17 +6660,17 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "" "Устройството „%s“ не може да започне въвеждането на пръстовия отпечатък" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Няма достъпни устройства за разпознаване на пръстови отпечатъци" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Обърнете се към системния си администратор за помощ." @@ -6594,7 +6679,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6603,11 +6688,11 @@ "За да включите влизането с пръстови отпечатъци, трябва да запазите отпечатък " "чрез устройството „%s“." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Избор на пръст" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Записване на пръстови отпечатъци" @@ -6661,14 +6746,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Сесията завърши" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Сесията започна" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — дейности по регистрацията" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Изберете друга парола." @@ -6730,7 +6822,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Неуспешно свързване с домейна „%s“: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Други регистрации" @@ -6811,15 +6903,15 @@ msgid "Logged in" msgstr "В системата" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Неуспешно свързване с услугата за регистрации" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Уверете се дали програмата „AcountService“ е инсталирана и включена." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6827,12 +6919,12 @@ "За да правите промени,\n" "натиснете иконата „*“" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Създаване на потребителска регистрация" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6840,12 +6932,12 @@ "За да създадете потребителска регистрация,\n" "първо натиснете иконата „*“" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Изтриване на избраната потребителска регистрация" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6853,35 +6945,32 @@ "За да изтриете избраната потребителска регистрация,\n" "първо натиснете иконата „*“" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Моята регистрация" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Вече съществува потребител с име „%s“." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Това потребитеско име е заето. Пробвайте с друго." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Потребителското име е прекалено дълго." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Потребителското име не може да започва с „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Потребителското може да съдържа:\n" -" ⁃ главни и/или малки букви от английската азбука;\n" -" ⁃ цифри;\n" -" ⁃ знаците „.“ (точка), „-“ (тире) и „_“ (долно тире)." +"Потребителското може да съдържа главни и малки букви от английската азбука, " +"цифри и знаците „.“, „-“ и „_“." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Ще се използва за името на домашната ви папка. Не може да се променя." @@ -6970,19 +7059,19 @@ msgid "Button" msgstr "Бутон" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Таблет" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Таб­лет" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Присвояване на функции на бутоните на графичния таблет и управление на " "чувствителността на писалката" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "таблет;уаком;писалка;гума;мишка;tablet;wacom;stylus;eraser;mouse;" @@ -7014,6 +7103,10 @@ msgid "Bluetooth Settings" msgstr "Настройки на подредбата" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Таблет" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Настройване към монитор…" @@ -7199,6 +7292,11 @@ msgid "Tip Pressure Feel" msgstr "Усещане на натиска на писеца" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Всички настройки" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Център за управление на GNOME" @@ -7255,22 +7353,18 @@ msgid "Quit" msgstr "Спиране на програмата" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Всички настройки" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Лични" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Хардуер" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Система" @@ -7309,41 +7403,177 @@ msgid "Cancel search" msgstr "Отказване на търсенето" -#~ msgid "Back­ground" -#~ msgstr "Фон" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Точка за безжичен достъп" + +#~ msgid "_Name:" +#~ msgstr "_Име:" -#~ msgid "Blue­tooth" -#~ msgstr "Blue­tooth" +#~ msgid "Remove Shortcut" +#~ msgstr "Премахване на клавишната комбинация" -#~ msgid "Co­lor" -#~ msgstr "Цвят" +#~ msgid "" +#~ msgstr "<Неизвестно действие>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "„%s“ не може да ползва като клавишна комбинация, защото ще е невъзможно " +#~ "да се въвежда самостоятелно.\n" +#~ "Комбинирайте го с някой от клавишите „Control“, „Alt“ или „Shift“." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Клавишната комбинация „%s“ вече се използва за:\n" +#~ "„%s“" -#~ msgid "Adjust for TV" -#~ msgstr "За телевизор" +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Ако прехвърлите клавишната комбинация на „%s“, комбинацията „%s“ ще бъде " +#~ "изключена." -#~ msgid "De­tails" -#~ msgstr "Под­роб­нос­ти" +#~ msgid "_Reassign" +#~ msgstr "_Прехвърляне" -#~ msgid "Net­work" -#~ msgstr "Мре­жа" +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Клавишната комбинация „%s“ вече се използва за „%s“. Искате ли да я " +#~ "зададете автоматично да е „%s“?" -#~ msgid "No­ti­fi­ca­tions" -#~ msgstr "Из­вес­тия" +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Клавишната комбинация „%s“ вече се използва за „%s“. Тази комбинация ще " +#~ "бъде изключена, ако преминете напред." -#~ msgid "Po­wer" -#~ msgstr "Зах­ран­ва­не" +#~ msgid "_Assign" +#~ msgstr "_Присвояване" -#~ msgid "Pri­va­cy" -#~ msgstr "По­ве­ри­тел­ност" +#~ msgid "Bond" +#~ msgstr "Свързване (bond)" -#~ msgid "Sha­ring" -#~ msgstr "Спо­де­ля­не" +#~ msgid "Team" +#~ msgstr "Обединяване (team)" + +#~ msgid "Bridge" +#~ msgstr "Мост (bridge)" + +#~ msgid "VLAN" +#~ msgstr "ВЛМ (VLAN)" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Неуспешно зареждане на приставките за ВЧМ" + +#~ msgid "Add Network Connection" +#~ msgstr "Добавяне на мрежова връзка" + +#~ msgid "Bond slaves" +#~ msgstr "Свързани подчинени устройства" + +#~ msgid "(none)" +#~ msgstr "(няма)" + +#~ msgid "Bridge slaves" +#~ msgstr "Свързани устройства за мост" + +#~ msgid "Team slaves" +#~ msgstr "Обединени подчинени устройства" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "" +#~ "Устройството (InfiniBand) не поддържа режима „установена " +#~ "връзка“ (connected mode)" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Не е избран сертификат на удостоверител" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Когато не използвате сертификат на удостоверител (CA) е възможно да се " +#~ "свържете с измамна безжична мрежа погрешка. Ще изберете ли сертификат на " +#~ "удостоверител?" + +#~ msgid "Ignore" +#~ msgstr "Пренебрегване" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Избор на сертификат на удостоверител" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Запитване за парола всеки път" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Без повече предупреждения" + +#~ msgid "No" +#~ msgstr "Не" + +#~ msgid "Yes" +#~ msgstr "Да" + +#~ msgid "Error logging into the account" +#~ msgstr "Неуспешно влизане в регистрацията" + +#~ msgid "Credentials have expired." +#~ msgstr "Периодът на валидност на данните за идентификация е изтекъл" + +#~ msgid "Sign in to enable this account." +#~ msgstr "Влезте, за да активирате регистрацията." + +#~ msgid "_Sign In" +#~ msgstr "_Вход" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Друго" + +#~ msgid "Personal File Sharing" +#~ msgstr "Споделяне на лични файлове" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Позволяване на _отдалечен контрол" + +#~ msgid "_Verify" +#~ msgstr "Про_верка" + +#~ msgid "Login History" +#~ msgstr "История на влизанията" + +#~ msgid "Add User Account" +#~ msgstr "Добавяне на потребителска регистрация" + +#~ msgid "Remove User Account" +#~ msgstr "Премахване на потребителска регистрация" + +#~ msgid "Login Options" +#~ msgstr "Настройки за влизане" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Вече съществува потребител с име „%s“." + +#~ msgid "Color" +#~ msgstr "Цвят" -#~ msgid "Uni­ver­sal Access" -#~ msgstr "Уни­вер­са­лен дос­тъп" +#~ msgid "Power" +#~ msgstr "Захранване" -#~ msgid "Wa­com Tab­let" -#~ msgstr "Таб­лет" +#~ msgid "Privacy" +#~ msgstr "Поверителност" #~ msgid "Used to determine your geographical location" #~ msgstr "За определяне на географското ви местоположение" diff -Nru gnome-control-center-3.20.2/po/bn_IN.po gnome-control-center-3.22.1/po/bn_IN.po --- gnome-control-center-3.20.2/po/bn_IN.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/bn_IN.po 2016-08-12 12:43:57.000000000 +0000 @@ -21,7 +21,7 @@ "PO-Revision-Date: 2014-09-15 16:11+0000\n" "Last-Translator: \n" "Language-Team: American English \n" -"Language: bn-IN\n" +"Language: bn_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/bn.po gnome-control-center-3.22.1/po/bn.po --- gnome-control-center-3.20.2/po/bn.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/bn.po 2016-08-12 12:43:57.000000000 +0000 @@ -19,6 +19,7 @@ "PO-Revision-Date: 2011-04-04 15:55+0600\n" "Last-Translator: Zenat Rahnuma \n" "Language-Team: Bengali \n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/ca.po gnome-control-center-3.22.1/po/ca.po --- gnome-control-center-3.20.2/po/ca.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ca.po 2016-10-10 16:16:39.000000000 +0000 @@ -11,20 +11,24 @@ # Jordi Mas , 2015-2016 # Gil Forcada , 2013, 2014, 2016. # +# Terminologia +# +# Hotspot -> punt d'accés Wi-Fi +# msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-02 07:37+0200\n" -"PO-Revision-Date: 2016-03-13 14:58+0100\n" -"Last-Translator: Gil Forcada \n" +"POT-Creation-Date: 2016-09-11 09:36+0200\n" +"PO-Revision-Date: 2016-09-11 09:37+0200\n" +"Last-Translator: Jordi Mas \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.8.7.1\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -96,7 +100,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Inici" @@ -111,26 +115,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -161,16 +163,17 @@ msgid "Current background" msgstr "Imatge de fons actual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fons" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Canvieu la imatge de fons a un fons de pantalla o fotografia" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Fons de pantalla;Pantalla;Escriptori;" @@ -211,18 +214,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Desactiveu el mode d'avió per a habilitar el Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Activeu i desactiveu el Bluetooth i connecteu els dispositius" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "comparteix;compartició;bluetooth;obex;" @@ -396,7 +398,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Tots els fitxers" @@ -435,7 +437,7 @@ msgstr "Desa el perfil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "De_sa" @@ -694,7 +696,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Resum" @@ -707,11 +709,10 @@ msgstr "_Importa un fitxer…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Afegeix" @@ -863,18 +864,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Color" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibreu el color dels dispositius, com ara pantalles, càmeres o impressores" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Color;ICC;Perfil;Calibratge;Impressora;Pantalla;" @@ -892,23 +894,23 @@ msgid "No languages found" msgstr "No s'ha trobat cap idioma" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Avui" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Ahir" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e de %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e de %b, %Y" @@ -1028,8 +1030,9 @@ msgid "December" msgstr "Desembre" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data i hora" @@ -1086,12 +1089,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Canvieu la data i l'hora, incloent-hi la zona horària" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Rellotge;Zona horària;Ubicació;" @@ -1103,212 +1106,227 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Per canviar els paràmetres d'hora i data, us heu d'autentificar." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tapa tancada" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Duplicat" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primària" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Apagat" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundària" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Organitzeu les pantalles combinades" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplica" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arrossegueu les pantalles per a reordenar-les" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Gira en sentit antihorari 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Gira 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Gira en sentit horari 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Mida" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Relació d'aspecte" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolució" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Ajustaments per televisió" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Freqüència de refresc" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Mostra la barra superior i la vista general d'activitats en aquesta pantalla" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Pantalla secundària" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Ajunta aquesta pantalla amb una altra per crear un espai de treball " "addicional" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentació" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostra només seqüències d'imatges i multimèdia" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Mirall" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostra el mateix a les dues pantalles" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "_Desactiva" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "No facis servir aquesta pantalla" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "No s'ha pogut obtenir la informació de la pantalla" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Organitzeu les pantalles combinades" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Pantalles" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Trieu com utilitzar els monitors i projectors connectats" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Quadre;Projector;xrandr;Pantalla;Resolució;Refresca;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Desconegut" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID del muntatge: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID del muntatge: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Pregunta què fer" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "No facis res" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Obre la carpeta" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Altres suports" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Seleccioneu l'aplicació per als CD d'àudio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Seleccioneu l'aplicació per als DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Seleccioneu l'aplicació que s'iniciarà quan es connecti un reproductor de " "música" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Seleccioneu l'aplicació que s'iniciarà quan es connecti una càmera" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Seleccioneu l'aplicació per als CD de programari" @@ -1317,88 +1335,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD d'àudio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Disc Blu-ray en blanc" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Disc CD en blanc" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Disc DVD en blanc" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Disc HD DVD en blanc" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disc Blu-ray de vídeo" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Lector de llibres digitals" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disc HD DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD de fotos" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Supervídeo CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD de vídeo" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Programari de Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Secció" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Vista general" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicacions per defecte" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Suport extraïble" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versió %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalls" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Visualitzeu informació sobre el sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1573,8 +1589,9 @@ msgid "Launch help browser" msgstr "Inicia el navegador d'ajuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Paràmetres" @@ -1647,7 +1664,6 @@ msgstr "Bloca la pantalla" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Accés universal" @@ -1683,11 +1699,21 @@ msgid "High contrast on or off" msgstr "Activa o desactiva el contrast alt" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Dreceres personalitzades" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1714,121 +1740,125 @@ msgid "Modifiers-only switch to next source" msgstr "Només els modificadors commuten a la font següent" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Teclat" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Reinicia la drecera al seu valor per omissió" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s ja s'utilitza per %s. Si la reemplaceu, %s s'inhabilitarà" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Estableix la drecera personalitzada" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Estableix la drecera" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Introduïu una drecera nova per canviar %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Afegeix drecera personalitzada" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Teclat" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Visualitzeu i canvieu les dreceres de teclat i establiu les preferències " "d'escriptura" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Drecera;Repeteix;Parpelleig;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Drecera personalitzada" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nom:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "_Ordre:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Afegeix una drecera" +msgid "No keyboard shortcut found" +msgstr "No s'ha trobat la tecla de drecera" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Suprimeix una drecera" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Per editar una drecera, feu clic a la fila corresponent i premeu la " -"combinació de tecles nova, o premeu la tecla de retrocés per netejar-la." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Dreceres personalitzades" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Proveu amb una cerca diferent" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Premeu Esc per cancel·lar." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"No es pot fer servir la drecera «%s» perquè no seria possible escriure amb " -"aquesta tecla.\n" -"Proveu amb una altra tecla com ara la de Control, l'Alt o de Majúscules a la " -"vegada." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nom" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Ja s'utilitza la drecera «%s» per a\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Ordre" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Drecera" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Edita" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Si torneu a assignar la drecera a «%s», s'inhabilitarà la drecera «%s»." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Cap" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Torna a assignar" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Suprimeix" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Introduïu la drecera nova" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"La drecera «%s» té la drecera «%s» associada. Voleu canviar-la " -"automàticament a «%s»?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Cancel·la" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"La drecera «%s» ja està associada amb «%s», s'inhabilitarà aquesta drecera " -"si continueu." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Afegeix" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Assigna" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Reemplaça" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Estableix" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Comprova els paràmetres" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Ratolí i ratolí tàctil" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1836,7 +1866,7 @@ "per dretans o esquerrans" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Ratolí tàctil;Punter;Clic;Toc;Doble;Botó;Ratolí de bola;Desplaça;" @@ -1894,6 +1924,10 @@ msgstr "Fes un toc per fer un clic" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Desplaçament amb dos dits" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Desplaçament en la vora" @@ -1932,11 +1966,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Mode d'avió" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Servidor intermediari de xarxa" @@ -1944,18 +1978,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "S'ha produït un error inesperat. Contacteu el vostre proveïdor de programari." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Cal que el NetworkManager estigui executant-se." @@ -1971,7 +2005,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1988,59 +2022,64 @@ msgid "page 2" msgstr "pàgina 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Seguretat" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automàtic" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Perfil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Corporativa" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Cap" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Mai" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2048,179 +2087,179 @@ msgstr[1] "fa %i dies" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Cap" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Dèbil" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Acceptable" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Bona" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excel·lent" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detalls" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitat" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adreça" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Màscara de xarxa" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Porta d'enllaç" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Suprimeix l'adreça" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Afegeix" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Servidor" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Suprimeix el servidor DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Mètrica" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Suprimeix la ruta" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automàtic (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Només enllaç local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefix" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automàtic" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automàtic, només DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reinicia" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Cap" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Clau WEP 40/128-bit (hexadecimal o ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Contrasenya WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinàmic (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA i WPA2 personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA i WPA2 corporativa" @@ -2235,30 +2274,30 @@ msgstr "Velocitat de l'enllaç" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Adreça IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Adreça IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Adreça física" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2268,7 +2307,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2351,13 +2390,13 @@ msgid "Firewall _Zone" msgstr "_Zona del tallafoc" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Per defecte" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "La zona defineix el nivell de confiança en la connexió" @@ -2399,45 +2438,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "No s'ha pogut obrir l'editor de connexions" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Perfil nou" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Enllaç" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Equip" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Pont" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "No s'han pogut carregar els connectors VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importa des d'un fitxer…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Afegeix una connexió de xarxa" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Afegeix VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2445,7 +2464,7 @@ msgstr "_Reinicia" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Oblida" @@ -2471,11 +2490,11 @@ msgid "S_ecurity" msgstr "S_eguretat" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "No es pot importar la connexió VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2488,36 +2507,36 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Seleccioneu el fitxer a importar" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Obre" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Ja existeix un fitxer amb el nom «%s»." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Substitueix" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Voleu substituir %s amb la connexió VPN que esteu desant?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "No es pot exportar la connexió VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2528,7 +2547,7 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exporta la connexió VPN" @@ -2555,61 +2574,46 @@ msgid "Make available to _other users" msgstr "Fes-la disponible a _altres usuaris" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Xarxa" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controleu com us connecteu a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Xarxa;Sense fil;Wi-Fi;Wifi;IP;LAN;Servidor intermediari;WAN;Banda ampla;" -"Mòdem;Bluetooth;VPN;VLAN;pont;enllaç;DNS;" +"Mòdem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Enllaça esclaus" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(cap)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Fes un pont als esclaus" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "mai" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "avui" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ahir" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Adreça IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Utilitzada per últim cop" @@ -2619,72 +2623,63 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Amb fil" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opcions…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Perfil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Afegeix una connexió nova" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Esclaus de l'equip" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." msgstr "" "Si teniu una connexió a Internet que no sigui la xarxa sense fil, podeu " -"establir un Hotspot sense fil per compartir-la amb altres." +"establir un punt d'accés sense fil per compartir-la amb altres." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." -msgstr "Si activeu el Hotspot sense fil us desconnectareu de %s." +msgstr "Si activeu el punt d'accés sense fil us desconnectareu de %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" "No és possible accedir a Internet a través de la xarxa sense fil mentre el " -"Hotspot està actiu." +"punt d'accés està actiu." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" -msgstr "Voleu aturar el Hotspot i desconnectar els usuaris?" +msgstr "Voleu aturar el punt d'accés Wi-Fi i desconnectar els usuaris?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" -msgstr "_Atura el Hotspot" +msgstr "_Atura el punt d'accés Wi-Fi" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" -msgstr "La política del sistema prohibeix utilitzar-lo com a Hotspot" +msgstr "" +"La política del sistema prohibeix utilitzar-lo com a punt d'accés Wi-Fi" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" -msgstr "El dispositiu sense fil no admet el mode Hotspot" +msgstr "El dispositiu sense fil no admet el mode punt d'accés Wi-Fi" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2692,11 +2687,11 @@ "Es perdran les dades de xarxa de les xarxes seleccionades, incloent les " "contrasenyes i la configuració personalitzada." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historial" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2704,7 +2699,7 @@ msgstr "_Tanca" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Oblida" @@ -2741,6 +2736,10 @@ msgid "Provider" msgstr "Proveïdor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Xarxa" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2847,15 +2846,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Contrasenya" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Cap" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "_Mostra la contrasenya" @@ -2926,7 +2921,7 @@ #: ../panels/network/network-wifi.ui.h:52 msgid "Wi-Fi Hotspot" -msgstr "Hotspot Wi-Fi" +msgstr "Punt d'accés Wi-Fi" #: ../panels/network/network-wifi.ui.h:53 msgid "_Turn On" @@ -2942,14 +2937,13 @@ #: ../panels/network/network-wifi.ui.h:56 msgid "_Use as Hotspot…" -msgstr "_Utilitza com a Hotspot…" +msgstr "_Utilitza com a punt d'accés Wi-Fi…" #: ../panels/network/network-wifi.ui.h:57 msgid "_Connect to Hidden Network…" msgstr "_Connecta't a una xarxa oculta…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historial" @@ -2971,360 +2965,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Contrasenya" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraestructura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Estat desconegut" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "No gestionat" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "No disponible" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "S'està connectant" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Cal autenticació" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Connectat" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "S'està desconnectant" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Ha fallat la connexió" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Estat desconegut (manca)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Sense connectar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Ha fallat la configuració" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Ha fallat la configuració de la IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Ha caducat la configuració de la IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Calen secrets, però no s'han proporcionat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "S'ha desconnectat el suplicant de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Ha fallat la configuració del suplicant de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Ha fallat el suplicant de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "El suplicant de 802.1x ha tardat massa en autenticar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "No s'ha pogut iniciar el servei PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "S'ha desconnectat el servei PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Ha fallat el PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "No s'ha pogut iniciar el client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "S'ha produït un error en el client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Ha fallat el client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "No s'ha pogut iniciar el servei de connexió compartida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Ha fallat el servei de connexió compartida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "No s'ha pogut iniciar el servei AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "S'ha produït un error en el servei AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Ha fallat el servei AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Línia ocupada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "No hi ha to de trucada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "No s'ha pogut establir cap portadora" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Ha finalitzat el temps d'espera de la sol·licitud de trucada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Ha fallat l'intent de trucada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Ha fallat la inicialització del mòdem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "No s'ha pogut seleccionar l'APN especificat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "No s'estan cercant xarxes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "S'ha denegat el registre a la xarxa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Ha finalitzat el temps d'espera del registre de la xarxa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Ha fallat el registre amb la xarxa sol·licitada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Ha fallat la comprovació del PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Pot ser que falti el microprograma del dispositiu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Ha desaparegut la connexió" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "S'havia assumit una connexió existent" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "No s'ha trobat el mòdem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Ha fallat la connexió Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "No s'ha inserit la targeta SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Cal el PIN de la SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Cal el PUK de la SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM incorrecta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "El dispositiu InfiniBand no admet el mode connectat" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Ha fallat la dependència de la connexió" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "manca el microprogramari" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cable desconnectat" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "No s'ha triat cap certificat d'autoritat de certificació" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "s'ha produït un error no definit en la seguretat de 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "no s'ha seleccionat cap fitxer" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Si no utilitzeu un certificat d'autoritat de certificació (CA) podeu acabar " -"connectar-vos a xarxes sense fil dubtoses o insegures. Voleu triar un " -"certificat d'autoritat de certificació?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignora" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Trieu el certificat CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "s'ha produït un error no especificat en validar el fitxer eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "falta el fitxer EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Trieu un fitxer PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Fitxers PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Fitxer PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticació _interna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visió PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3333,41 +3303,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anònim" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "S'ha autenticat" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ambdós" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Fitxer PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticació _interna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "_Permet la provisió automàtica PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "falta el nom d'usuari EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "falta la contrasenya EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nom d'_usuari" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Mostra la contrasenya" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "certificat CA EAP-PEAP no vàlid: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "certificat CA EAP-PEAP no vàlid: no s'ha especificat un certificat" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Trieu un certificat d'una autoritat de certificació" @@ -3385,19 +3387,56 @@ msgid "C_A certificate" msgstr "Certificat C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "_No es requereix un certificat CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versió PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Sol·licita aquesta contrasenya cada vegada" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "falta el nom d'usuari EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "falta la contrasenya EAP" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "falta la identitat EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificat CA EAP-TLS invàlid: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificat CA EAP-TLS invàlid: no s'ha especificat un certificat" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "contrasenya EAP-TLS invàlida: manca la contrasenya" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "clau privada EAP-TLS no vàlida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificat d'usuari EAP-TLS no vàlid: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Les claus privades sense encriptar no són segures" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3411,11 +3450,11 @@ "\n" "(Podeu protegir la vostra clau privada amb una contrasenya amb l'OpenSSL)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Trieu el vostre certificat personal" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Trieu la vostra clau privada" @@ -3427,51 +3466,56 @@ msgid "_User certificate" msgstr "Certificat d'_usuari" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Clau privada" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Contrasenya de clau _privada" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificat CA EAP-TTLS no vàlid: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificat CA EAP-TTLS no vàlid: no s'ha especificat un certificat" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_No em tornis a avisar" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "No" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sí" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "S'ha produït un error desconegut en validar la seguretat de 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS a través de túnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP protegit (PEAP)" @@ -3481,6 +3525,50 @@ msgid "Au_thentication" msgstr "Au_tenticació" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "manca el mom d'usuari LEAP" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "manca la contrasenya LEAP" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "manca la clau wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"clau wep invàlida: una clau amb longitud %zu ha de contenir només dígits " +"hexadecimals" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"clau wep invàlida: una clau amb longitud %zu ha de contenir només caràcters " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"clau wep invàlida: la longitud de clau %zu és errònia. Una clau ha de tenir " +"una longitud de 5/13 (ascii) o bé 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "clau wep invàlida: la contrasenya no pot ser buida." + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "clau wep invàlida: la contrasenya ha tenir menys de 64 caràcters" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (per defecte)" @@ -3517,19 +3605,31 @@ msgid "WEP inde_x" msgstr "Índe_x WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk no vàlid: longitud de clau %zu no vàlida. Ha de tenir [8,63] bytes o 64 dígits hexadecimals" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "wpa-psk no vàlid: no es pot interpretar la clau de 64 bytes com a hexadecimal" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipus" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Activat" @@ -3566,16 +3666,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "_Mostra el contingut del missatge a la pantalla de bloqueig" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificacions" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controleu quines notificacions es mostren i què mostren" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notificacions;Bàner;Missatge;Safata;Emergent;" @@ -3593,79 +3694,68 @@ msgid "Applications" msgstr "Aplicacions" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Altres" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Afegeix un compte" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Correu" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendari" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contactes" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Xat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Recursos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "S'ha produït un error en entrar al compte" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Han caducat les credencials." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Entreu per habilitar aquest compte." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Entra" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "S'ha produït un error en crear el compte" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "S'ha produït un error en suprimir el compte" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Segur que voleu suprimir el compte?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "No se suprimirà el compte al servidor." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Suprimeix" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Comptes en línia" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Connecteu-vos als comptes en línia i decidiu quin ús en voleu fer" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3678,6 +3768,7 @@ msgstr "No s'ha configurat cap compte en línia" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Suprimeix el compte" @@ -3820,7 +3911,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Bateria" @@ -3868,104 +3959,105 @@ msgid "When _idle" msgstr "Quan estigui _inactiu" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Estalvi d'energia" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Brillantor de la _pantalla" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Brillantor automàtica" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Brillantor del _teclat" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Atenua la pantalla quan estigui inactiva" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Pantalla en _blanc" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Desactiveu la Wifi per estalviar energia." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Banda ampla _mòbil" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Desactiveu la banda ampla mòbil (3G, 4G, WiMax, etc.) per estalviar energia." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Quan s'utilitzi la bateria" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Quan estigui connectat" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Atura temporalment" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hiberna" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Res" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Botó d'atura temporalment i apaga" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Atura temporalment automàticament" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Atura automàticament" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Quan es prem el botó d'engegada" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositius" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energia" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Visualitzeu l'estat de la bateria i canvieu els paràmetres d'estalvi " "d'energia" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4044,11 +4136,6 @@ msgid "Delay" msgstr "Retard" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Cancel·la" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autenticació" @@ -4058,138 +4145,138 @@ msgstr "Cal autenticació" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Tòner baix" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Sense tòner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Revelador baix" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Sense revelador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Marcador baix" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Sense marcador" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Tapa oberta" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Porta oberta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Paper baix" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Sense paper" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Apagada" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Aturada" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "El receptacle de residus està quasi ple" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "El receptacle de residus està ple" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "El conductor òptic fotogràfic està al final de la seva vida" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "El conductor òptic fotogràfic ja no funciona" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "S'està configurant" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Apunt" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "No accepta tasques" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "S'està processant" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nivell del tòner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nivell de tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nivell dels subministraments" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "S'està instal·lant" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4197,15 +4284,15 @@ msgstr[1] "%u actius" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "No s'ha pogut afegir una impressora nova." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Selecció d'un fitxer PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4213,50 +4300,47 @@ "Fitxers de descripció d'impressora PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD." "gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "No s'ha trobat cap controlador adequat" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "S'estan cercant els controladors preferits…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Seleccioneu de la base de dades…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Proporcioneu un fitxer PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" -msgstr "Pàgina de prova" - -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Sense impressores" +msgstr "Pàgina de prova" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "No s'ha pogut carregar la interfície d'usuari: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Impressores" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Afegiu impressores, visualitzeu tasques d'impressió i decidiu com voleu " "imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Impressora;Cua;Imprimir;Paper;Tinta;Tòner;" @@ -4418,6 +4502,11 @@ msgid "Parallel Port" msgstr "Port paral·lel" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4630,13 +4719,17 @@ msgid "_Options" msgstr "_Opcions" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Sense impressores" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Afegeix una impressora" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4644,70 +4737,70 @@ "Sembla que el servei del sistema\n" "d'impressió no està disponible." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Bloca la pantalla" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "En ús" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Activat" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Apagat" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Serveis d'ubicació" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Utilització i historial" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Voleu buidar la paperera?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "S'esborraran definitivament tots els elements de la paperera." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Buida la paperera" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Buida tots fitxers temporals?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "S'esborraran definitivament tots els fitxers temporals." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Suprimeix els fitxers _temporals" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Buida la paperera i els fitxers temporals" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Ús de programari" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Informa de problemes" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4716,20 +4809,21 @@ "Enviar informes de problemes tècnics ajuda a millorar %s. Els informes " "s'envien anònimament i sense dades personals." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Política de privacitat" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privacitat" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Privadesa" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Protegiu la informació personal i controleu què poden veure els altres" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4866,7 +4960,7 @@ "Location services allow applications to know your location. Using Wi-Fi and " "mobile broadband increases accuracy." msgstr "" -"Els servies d'ubicació permeten que les aplicacions puguin saber on sou. " +"Els serveis d'ubicació permeten que les aplicacions puguin saber on sou. " "L'ús de la Wi-Fi i les dades de mòbil permet millorar la precisió." #: ../panels/privacy/privacy.ui.h:44 @@ -4900,21 +4994,21 @@ msgid "Other" msgstr "Altres" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "S'ha de tornar a iniciar la sessió perquè els canvis tinguin efecte" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Torna a iniciar ara" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "No s'ha seleccionat cap font d'entrada" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Pantalla d'entrada" @@ -4946,11 +5040,12 @@ msgid "Paper" msgstr "Paper" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Regió i idioma" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4958,7 +5053,7 @@ "les fonts d'entrada" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Idioma;Disposició;Teclat;Entrada;" @@ -5015,7 +5110,7 @@ msgstr "Alt dreta i esquerra" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Idioma" @@ -5064,26 +5159,11 @@ msgstr "" "Tots els usuaris utilitzen els paràmetres d'entrada en entrar al sistema" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Llocs" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Adreces d'interès" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Altres" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Seleccioneu una ubicació" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_D'acord" @@ -5091,11 +5171,12 @@ msgid "No applications found" msgstr "No s'han trobat aplicacions" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Cerca" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5103,7 +5184,7 @@ "d'activitats" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Cerca;Troba;Índex;Oculta;Privacitat;Resultats;" @@ -5111,6 +5192,18 @@ msgid "Search Locations" msgstr "Cerca ubicacions" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Llocs" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Adreces d'interès" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Altres" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Mou amunt" @@ -5123,6 +5216,11 @@ msgid "Preferences" msgstr "Preferències" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "No hi ha cap xarxa seleccionada per compartir" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5160,36 +5258,42 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Permet a usuaris remots connectar-se utilitzant l'ordre del Secure Shell:\n" +"Quan l'entrada remota està habilitada, els usuaris remots poden connectar-se " +"utilitzant l'ordre del Secure Shell:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Permet a usuaris remots visualitzar o controlar la pantalla connectant-se a: " -"vnc://%s" +"La compartició de pantalla permet a usuaris remots visualitzar o controlar " +"la pantalla connectant-se a: vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copia" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Compartició" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Compartició" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controleu què voleu compartir amb els altres" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5197,6 +5301,10 @@ "comparteix;compartició;ssh;amfitrió;nom;remot;escriptori;multimèdia;àudio;" "vídeo;imatges;fotografies;pel·lícules;servidor;renderitzar;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Xarxes" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Habilita o inhabilita l'entrada remota" @@ -5205,25 +5313,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "Cal autenticació per habilitar o inhabilitar l'entrada remota" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "No hi ha cap xarxa seleccionada per compartir" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Xarxes" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Nom de l'ordinador" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Compartició de fitxers personals" +msgid "_File Sharing" +msgstr "_Compartició de fitxers" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5242,8 +5338,8 @@ msgstr "Alguns serveis estan inhabilitats perquè no hi ha accés a la xarxa." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Compartició de fitxers personals" +msgid "File Sharing" +msgstr "Compartició de fitxers" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5258,8 +5354,8 @@ msgstr "Compartició de pantalla" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "_Permet el control remot" +msgid "_Allow connections to control the screen" +msgstr "_Permet a les connexions controlar la pantalla" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5286,11 +5382,8 @@ msgstr "Compartició multimèdia" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"La compartició multimèdia us permet compartir música, fotografies i vídeos a " -"través de la xarxa." +msgid "Share music, photos and videos over the network." +msgstr "Compateix música, fotografies i vídeos a través de la xarxa." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5421,11 +5514,6 @@ msgid "Peak detect" msgstr "Detecció de pics" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nom" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositiu" @@ -5520,16 +5608,21 @@ msgid "Subwoofer" msgstr "Altaveu de greus" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personalitzat" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Accés universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Feu més fàcil veure, escoltar, teclejar, apuntar i fer clic" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5628,8 +5721,9 @@ msgstr "So de les tecles" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pita quan s'activin la fixació numèrica o la de majúscules." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Pita quan s'activin o desactivin la fixació numèrica o la de majúscules." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6012,95 +6106,67 @@ msgstr "Efectes de color" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Afegeix un usuari" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Nom complet" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Estàndard" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrador" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Nom complet" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipus de compte" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "_Permet a l'usuari establir la contrasenya a l'entrada següent" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Estableix una contrasenya ara" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verifica" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirma" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Els accessos corporatius permeten utilitzar comptes d'usuari corporatius " -"centralitzats en aquest dispositiu." +"centralitzats en aquest dispositiu. També podeu usar aquest compte per " +"accedir als recursos de l'empresa a Internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domini" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Connecteu-vos per afegir\n" -"accessos de comptes corporatius." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Entrada corporativa" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Afegeix un usuari" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Afegeix-lo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Entrada de l'administrador del domini" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Per poder utilitzar entrades corporatives, aquest ordinador\n" -"necessita formar part del domini. Demaneu a l'administrador que\n" -"introdueixi aquí la seva contrasenya." +msgid "You are Offline" +msgstr "Esteu fora de línia" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nom de l'administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Heu d'estar en línia per afegir usuaris corporatius." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Contrasenya de l'administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Entrada corporativa" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6135,7 +6201,7 @@ msgstr "Dit petit dret" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Habilita l'entrada amb empremta dactilar" @@ -6172,9 +6238,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Entrada;Nom;Empremta dactilar;Avatar;Logotip;Cara;Contrasenya;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Historial d'entrades" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Afegeix-lo" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Entrada de l'administrador del domini" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Per poder utilitzar entrades corporatives, aquest ordinador\n" +"necessita formar part del domini. Demaneu a l'administrador que\n" +"introdueixi aquí la seva contrasenya." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nom de l'administrador" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Contrasenya de l'administrador" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6197,38 +6286,30 @@ msgstr "Contrasenya _actual" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "Permet a l'usuari establir la contrasenya a l'entrada següent" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Estableix una contrasenya ara" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Afegeix un compte d'usuari" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Suprimeix el compte d'usuari" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Afegir usuari..." #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opcions d'entrada" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Entrada a_utomàtica" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Entrada amb _empremta dactilar" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icona d'usuari" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Última entrada" @@ -6332,7 +6413,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Combineu majúscules i minúscules i empreu un o dos nombres." #: ../panels/user-accounts/pw-utils.c:119 @@ -6424,32 +6505,32 @@ msgstr "Error desconegut" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Ha de coincidir amb l'adreça web del proveïdor del compte." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "No s'ha pogut afegir el compte" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Les contrasenyes no coincideixen." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "No s'ha pogut registrar el compte" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "No hi ha cap manera compatible per autenticar-se amb aquest domini" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "No s'ha pogut unir al domini" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6457,7 +6538,7 @@ "El nom d'usuari no és correcte.\n" "Torneu-ho a provar." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6465,14 +6546,24 @@ "La contrasenya no és vàlida.\n" "Torneu-ho a provar." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "No s'ha pogut entrar al domini" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "No s'ha trobat el domini. Potser l'heu escrit malament?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Estàndard" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrador" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6492,15 +6583,15 @@ msgid "Enabled" msgstr "Habilitat" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Voleu suprimir les empremtes dactilars registrades?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Suprimeix les empremtes dactilars" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6508,15 +6599,15 @@ "Voleu suprimir les empremtes dactilars registrades de manera que " "s'inhabiliti l'entrada amb empremta dactilar?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Fet" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "No s'ha pogut accedir al dispositiu «%s»" @@ -6524,17 +6615,17 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "" "No s'ha pogut iniciar la captura de l'empremta dactilar al dispositiu «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "No s'ha pogut accedir a cap lector d'empremtes dactilars" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contacteu amb l'administrador del sistema per obtenir ajuda." @@ -6543,7 +6634,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6552,11 +6643,11 @@ "Per habilitar l'entrada amb empremta dactilar, caldrà que deseu una de les " "vostres empremtes dactilars utilitzant el dispositiu «%s»." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "S'està seleccionant un dit" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "S'estan registrant les empremtes dactilars" @@ -6610,14 +6701,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Ha finalitzat la sessió" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "S'ha iniciat la sessió" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Activitat del compte" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Trieu una altra contrasenya." @@ -6679,7 +6777,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "No s'ha pogut connectar al domini %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Altres comptes" @@ -6759,15 +6857,15 @@ msgid "Logged in" msgstr "Connectat" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "No s'ha pogut contactar amb el servei de comptes" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Assegureu-vos que el servei de comptes està instal·lat i habilitat." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6775,12 +6873,12 @@ "Per realitzar canvis,\n" "primer feu clic a la icona *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Crea un compte d'usuari nou" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6788,12 +6886,12 @@ "Per crear un compte d'usuari,\n" "primer feu clic a la icona *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Suprimeix el compte d'usuari seleccionat" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6801,33 +6899,32 @@ "Per suprimir el compte d'usuari seleccionat,\n" "primer feu clic a la icona *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "El meu compte" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Ja existeix un usuari amb el nom d'usuari «%s»." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "El nom d'usuari no està disponible. Trieu un altre." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "El nom d'usuari és massa llarg." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "El nom d'usuari no pot començar amb un «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "El nom d'usuari només ha de consistir en lletres minúscules i majúscules de " -"la «a» a la «z», de dígits i de qualsevol dels caràcters «.», «-» i «_»." +"la «a» a la «z», dígits i qualsevol dels caràcters «.», «-» i «_»" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Es farà servir per anomenar la vostra carpeta personal i no es pot canviar." @@ -6918,19 +7015,19 @@ msgid "Button" msgstr "Botó" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tauleta gràfica Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Establiu el mapa de botons i ajusteu la sensibilitat de l'estilogràfica per " "a tauletes gràfiques" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tauleta gràfica;Wacom;Estilogràfica;Esborrador;Ratolí;" @@ -6962,6 +7059,10 @@ msgid "Bluetooth Settings" msgstr "Paràmetres del Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tauleta gràfica Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapa a la pantalla…" @@ -7147,6 +7248,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilitat de pressió del llapis" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Tots els paràmetres" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centre de control del GNOME" @@ -7203,22 +7309,18 @@ msgid "Quit" msgstr "Surt" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Tots els paràmetres" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personal" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Maquinari" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7257,6 +7359,193 @@ msgid "Cancel search" msgstr "Cancel·la la cerca" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Punt d'accés Wi-Fi" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Drecera de teclat per %s. Introduïu la drecera nova a canviar." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Per editar una drecera, feu clic a la fila corresponent i premeu la " +#~ "combinació de tecles nova, o premeu la tecla de retrocés per netejar-la." + +#~ msgid "Error logging into the account" +#~ msgstr "S'ha produït un error en entrar al compte" + +#~ msgid "Credentials have expired." +#~ msgstr "Han caducat les credencials." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Entreu per habilitar aquest compte." + +#~ msgid "_Sign In" +#~ msgstr "_Entra" + +#~ msgid "_Name:" +#~ msgstr "_Nom:" + +#~ msgid "Add Shortcut" +#~ msgstr "Afegeix una drecera" + +#~ msgid "Remove Shortcut" +#~ msgstr "Suprimeix una drecera" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "No es pot fer servir la drecera «%s» perquè no seria possible escriure " +#~ "amb aquesta tecla.\n" +#~ "Proveu amb una altra tecla com ara la de Control, l'Alt o de Majúscules a " +#~ "la vegada." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Ja s'utilitza la drecera «%s» per a\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Si torneu a assignar la drecera a «%s», s'inhabilitarà la drecera «%s»." + +#~ msgid "_Reassign" +#~ msgstr "_Torna a assignar" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "La drecera «%s» té la drecera «%s» associada. Voleu canviar-la " +#~ "automàticament a «%s»?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "La drecera «%s» ja està associada amb «%s», s'inhabilitarà aquesta " +#~ "drecera si continueu." + +#~ msgid "_Assign" +#~ msgstr "_Assigna" + +#~ msgid "Add User Account" +#~ msgstr "Afegeix un compte d'usuari" + +#~ msgid "Remove User Account" +#~ msgstr "Suprimeix el compte d'usuari" + +#~ msgid "_Account Activity" +#~ msgstr "_Activitat del compte" + +#~ msgid "Color" +#~ msgstr "Color" + +#~ msgid "Bond" +#~ msgstr "Enllaç" + +#~ msgid "Team" +#~ msgstr "Equip" + +#~ msgid "Bridge" +#~ msgstr "Pont" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "No s'han pogut carregar els connectors VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Afegeix una connexió de xarxa" + +#~ msgid "Bond slaves" +#~ msgstr "Enllaça esclaus" + +#~ msgid "(none)" +#~ msgstr "(cap)" + +#~ msgid "Bridge slaves" +#~ msgstr "Fes un pont als esclaus" + +#~ msgid "Team slaves" +#~ msgstr "Esclaus de l'equip" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "El dispositiu InfiniBand no admet el mode connectat" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "No s'ha triat cap certificat d'autoritat de certificació" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Si no utilitzeu un certificat d'autoritat de certificació (CA) podeu " +#~ "acabar connectar-vos a xarxes sense fil dubtoses o insegures. Voleu triar " +#~ "un certificat d'autoritat de certificació?" + +#~ msgid "Ignore" +#~ msgstr "Ignora" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Trieu el certificat CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Sol·licita aquesta contrasenya cada vegada" + +#~ msgid "Don't _warn me again" +#~ msgstr "_No em tornis a avisar" + +#~ msgid "No" +#~ msgstr "No" + +#~ msgid "Yes" +#~ msgstr "Sí" + +#~ msgid "Power" +#~ msgstr "Energia" + +#~ msgid "Privacy" +#~ msgstr "Privacitat" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Altres" + +#~ msgid "Personal File Sharing" +#~ msgstr "Compartició de fitxers personals" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Permet el control remot" + +#~ msgid "_Verify" +#~ msgstr "_Verifica" + +#~ msgid "Login History" +#~ msgstr "Historial d'entrades" + +#~ msgid "Login Options" +#~ msgstr "Opcions d'entrada" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Ja existeix un usuari amb el nom d'usuari «%s»." + #~ msgid "Used to determine your geographical location" #~ msgstr "S'utilitzen per trobar la vostra ubicació geogràfica" @@ -7291,9 +7580,6 @@ #~ msgid "S_peed:" #~ msgstr "Ve_locitat:" -#~ msgid "Shortcuts" -#~ msgstr "Dreceres" - #~ msgid "Test Your Settings" #~ msgstr "Comprova els paràmetres" @@ -7332,9 +7618,6 @@ #~ msgid "Fast" #~ msgstr "Ràpida" -#~ msgid "Two _finger scroll" -#~ msgstr "_Desplaçament amb dos dits" - #~ msgid "Wireless devices require extra power" #~ msgstr "Els dispositius sense fil requereixen més energia" diff -Nru gnome-control-center-3.20.2/po/ca@valencia.po gnome-control-center-3.22.1/po/ca@valencia.po --- gnome-control-center-3.20.2/po/ca@valencia.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ca@valencia.po 2016-08-12 12:43:57.000000000 +0000 @@ -19,7 +19,7 @@ "PO-Revision-Date: 2014-09-14 22:32+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" -"Language: ca-XV\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" diff -Nru gnome-control-center-3.20.2/po/crh.po gnome-control-center-3.22.1/po/crh.po --- gnome-control-center-3.20.2/po/crh.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/crh.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,7 +11,7 @@ "Last-Translator: Reşat SABIQ \n" "Language-Team: QIRIMTATARCA (Qırım Türkçesi) \n" -"Language: \n" +"Language: crh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: UTF-8\n" diff -Nru gnome-control-center-3.20.2/po/cs.po gnome-control-center-3.22.1/po/cs.po --- gnome-control-center-3.20.2/po/cs.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/cs.po 2016-09-27 12:37:36.000000000 +0000 @@ -24,10 +24,10 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-20 08:46+0000\n" -"PO-Revision-Date: 2016-03-20 14:17+0100\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-09 16:28+0200\n" "Last-Translator: Marek Černocký \n" -"Language-Team: Czech \n" +"Language-Team: čeština \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +106,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Domů" @@ -121,26 +121,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -171,16 +169,17 @@ msgid "Current background" msgstr "Aktuální pozadí" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Pozadí" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Změnit obrázek na pozadí na tapetu nebo fotografii" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "tapeta;obrazovka;plocha;" @@ -220,18 +219,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Vypněte přepínač režimu „letadlo“, aby se povolilo Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Zapnout a vypnout Bluetooth a připojit se k zařízením" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "sdílet;sdílení;bluetooth;obex;" @@ -402,7 +400,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Všechny soubory" @@ -442,7 +440,7 @@ msgstr "Uložit profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Uložit" @@ -699,7 +697,7 @@ "a>, pro vás mohou být užitečné." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Souhrn" @@ -712,11 +710,10 @@ msgstr "_Importovat soubor…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "Přid_at" @@ -866,17 +863,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Barvy" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Kalibrovat barvy zařízení, jako jsou obrazovky, kamery nebo tiskárny" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "barvy;ICC;profil;kalibrace;tiskárna;obrazovka;displej;" @@ -894,23 +892,23 @@ msgid "No languages found" msgstr "Žádné jazyky nenalezeny" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "dnes" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "včera" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %B" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e. %B %Y" @@ -1030,8 +1028,9 @@ msgid "December" msgstr "prosinec" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Datum a čas" @@ -1088,12 +1087,12 @@ msgid "AM / PM" msgstr "dop./odp." -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Změnit datum a čas, včetně časového pásma" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "hodiny;časové pásmo;umístění;" @@ -1105,210 +1104,225 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Abyste mohli měnit nastavení času a data, musíte se autentizovat." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Víko zavřeno" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Duplikovaný" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Hlavní" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Vypnuto" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Vedlejší" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Uspořádání sloučených displejů" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Použít" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Pořadí displejů změňte přetažením" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Otočit o 90° doleva" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Otočit o 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Otočit o 90° doprava" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Velikost" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Poměr stran" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Rozlišení" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Přizpůsobit televizi" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Obnovovací frekvence" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Na tomto displeji zobrazovat horní lištu a přehled činností" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Vedlejší" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Spojit tento displej s jiným pro vytvoření rozšířené pracovní plochy" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Prezentace" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Zobrazovat jen promítání a multimédia" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Duplikovat" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Zobrazovat stávající zobrazení na obou displejích stejně" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Vypnout" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Tento displej nepoužívat" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Nelze získat informace o obrazovce" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Uspořádat sloučené displeje" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Displeje" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Zvolit, jak se mají používat připojené monitory a projektory" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "panel;projektor;xrandr;obrazovka;rozlišení;obnovovací frekvence;monitor;" "displej;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Není známo" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s, %dbitový (ID sestavení: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%dbitový (ID sestavení: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" -msgstr "%s %dbitová" +msgstr "%s, %dbitový" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" -msgstr "%dbitová" +msgstr "%dbitový" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Zeptat se na další postup" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nic nedělat" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Otevřít složku" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Ostatní média" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Vyberte aplikaci pro zvuková CD" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Vyberte aplikaci pro DVD s videem" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Vyberte aplikaci, která má být spuštěna po připojení hudebního přehrávače" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Vyberte aplikaci, která má být spuštěna po připojení fotoaparátu" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Vyberte aplikaci pro CD se softwarem" @@ -1317,88 +1331,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "zvukové DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "prázdný disk Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "prázdný disk CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "prázdný disk DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "prázdný disk HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "videodisk Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "čtečka elektronických knih" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "videodisk HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Oddíl" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Přehled" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Výchozí aplikace" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Vyměnitelná média" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Verze %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Podrobnosti" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Zobrazit informace o systému" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1573,8 +1585,9 @@ msgid "Launch help browser" msgstr "Spustit prohlížeč nápovědy" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Nastavení" @@ -1647,7 +1660,6 @@ msgstr "Uzamknout obrazovku" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Univerzální přístup" @@ -1683,11 +1695,21 @@ msgid "High contrast on or off" msgstr "Zapnout nebo vypnout vysoký kontrast" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Vlastní zkratky" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1714,117 +1736,128 @@ msgid "Modifiers-only switch to next source" msgstr "Přepínač na další zdroj pouze pro modifikátory" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Klávesnice" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Vrátit klávesovou zkratku na výchozí" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s se již používá pro %s. Pokud ji nahradíte, bude klávesová zkratka " +"pro %s zakázána" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Nastavení vlastní klávesové zkratky" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Nastavit zkratku" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Zadejte novou zkratku pro změnu %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Přidání klávesové zkratky" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Klávesnice" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Zobrazit a změnit klávesové zkratky a nastavit předvolby pro psaní" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "zkratka;opakovat;blikat;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Vlastní klávesová zkratka" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Název:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "_Příkaz:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Přidat klávesovou zkratku" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Odebrat klávesovou zkratku" +msgid "No keyboard shortcut found" +msgstr "Nebyla nalezena žádná klávesová zkratka" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Zkratku upravíte kliknutím na odpovídající řádek a podržením nových kláves, " -"vymazání provedete klávesou Backspace." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Vlastní zkratky" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Zkuste jiné hledání" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Zrušíte zmáčknutím Esc." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Klávesovou zkratku „%s“ nelze použít, protože by nebylo možné tuto klávesu " -"používat k psaní.\n" -"Zkuste to prosím v kombinaci s klávesami jako Control, Alt nebo Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Název" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Zkratka „%s“ se již používá pro\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Příkaz" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Klávesová zkratka" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Upravit" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Změníte-li přiřazení zkratky k „%s“, zkratka „%s“ bude vypnuta." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Žádná" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Z_měnit přiřazení" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Odebrat" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Zadejte novou klávesovou zkratku" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Klávesová zkratka „%s“ byla přidružena ke klávesové zkratce „%s“. Chcete ji " -"automaticky nastavit na „%s“?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Zrušit" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"„%s“ je v současnosti přidruženo k „%s“. Tato klávesová zkratka bude " -"zakázána, pokud budete pokračovat." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Přidat" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "Přiř_adit" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Nahradit" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Nastavit" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Vyzkoušejte své nastavení" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Myš a touchpad" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1832,7 +1865,7 @@ "leváky" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "trackpad;ukazatel;kliknutí;klepnutí;dvojité;tlačítko;trackball;posuv;" @@ -1892,6 +1925,10 @@ msgstr "Kliknutí klepnutím" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Posunování dvěma prsty" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Posunování po hraně" @@ -1930,11 +1967,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Režim „_Letadlo“" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy sítě" @@ -1942,17 +1979,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Problém, něco se stalo špatně. Kontaktujte prosím vyrobce softwaru." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Je zapotřebí, aby běžel program NetworkManager." @@ -1968,7 +2005,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1985,60 +2022,65 @@ msgid "page 2" msgstr "strana 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Zabezpečení" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automaticky" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Firemní" # Zabezpečení -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Žádné" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "nikdy" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2047,182 +2089,182 @@ msgstr[2] "před %i dny" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" # Síla signálu -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Žádná" # Síla signálu -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Slabá" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Dostačující" # Síla signálu -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Dobrá" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Výborná" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Podrobnosti" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identita" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresa" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Maska sítě" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Brána" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Smazat adresu" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Přidat" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Smazat DNS server" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrika" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Smazat směrování" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatické (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ruční" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Pouze link-local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefix" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatické" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatické, pouze DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Resetovat" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Žádné" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128bitový klíč (Hex nebo ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128bitová přístupová fráze" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamické WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2237,30 +2279,30 @@ msgstr "Rychlost spojení" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Adresa IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Adresa IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardwarová adresa" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2270,7 +2312,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2353,13 +2395,13 @@ msgid "Firewall _Zone" msgstr "_Zóna firewallu" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Výchozí" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zóna definuje úroveň důvěry k připojení" @@ -2401,45 +2443,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Nelze otevřít editor připojení" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nový profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Svazek" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Tým" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Most" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Nelze načíst zásuvné moduly VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importovat ze souboru…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Přidat síťové připojení" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Přidání VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2447,7 +2469,7 @@ msgstr "_Resetovat" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Zapomenout" @@ -2473,11 +2495,11 @@ msgid "S_ecurity" msgstr "Zab_ezpečení" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nelze importovat připojení VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2490,36 +2512,36 @@ "\n" "Chyba: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Vybrat soubor pro import" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Otevřít" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Soubor s názvem „%s“ již existuje." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Nahradit" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Chcete nahradit %s připojením VPN, které ukládáte?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Nelze exportovat připojení VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2530,7 +2552,7 @@ "\n" "Chyba: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportovat připojení VPN" @@ -2557,62 +2579,46 @@ msgid "Make available to _other users" msgstr "Zpřístupnit _ostatním uživatelům" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Síť" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Určit, jak se připojujete k Internetu" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "síť;bezdrátové;bezdrátová;Wi-Fi;WiFi;drátové;drátová;IP;LAN;proxy;WAN;" -"širokopásmové;připojení;modem;Bluetooth;vpn;vlan;bridge;most;bond;svazek;" -"agregace;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Podřízená zařízení ve svazku" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(žádná)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Podřízená zařízení v mostu" +"širokopásmové;připojení;modem;Bluetooth;vpn;dns;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nikdy" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "dnes" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "včera" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Adresa IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Naposledy použito" @@ -2622,36 +2628,26 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Drátová" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Volby…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Přidat nové připojení" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Podřízená zařízení v týmu" - # Příliš neformální? -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2659,13 +2655,13 @@ "Používáte-li k přístupu na Internet připojení jiné než bezdrátové, můžete " "nastavit bezdrátový přístupový bod pro sdílení připojení s ostatními." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Zapnutím bezdrátového přístupového bodu bude připojení k %s ztraceno." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2673,23 +2669,23 @@ "Není možné se k Internetu připojovat prostřednictvím bezdrátového připojení " "zatímco je aktivní režim přístupového bodu." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Zastavit přístupový bod a odpojit případné uživatele?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "Za_stavit přístupový bod" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Systémová zásada zakazuje použití jako přístupový bod" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Bezdrátové zařízení nepodporuje režim přístupového bodu" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2697,11 +2693,11 @@ "Informace o síti pro vybrané sítě, včetně hesel a vlastního nastavení, budou " "ztraceny." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historie" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2709,7 +2705,7 @@ msgstr "_Zavřít" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Zapomenout" @@ -2746,6 +2742,10 @@ msgid "Provider" msgstr "Poskytovatel" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Síť" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2851,16 +2851,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Heslo" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Žádná" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Ukázat he_slo" @@ -2954,7 +2950,6 @@ msgstr "Přip_ojit se ke skryté síti…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historie" @@ -2976,360 +2971,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Heslo" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Dočasná síť" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Přístupový bod" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Neznámý stav" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Nespravováno" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nedostupné" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Připojuje se" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Požadována autentizace" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Připojeno" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Odpojuje se" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Připojení selhalo" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Neznámý stav (chybí)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Nepřipojeno" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Nastavení selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Nastavení IP selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Konfigurace IP vypršela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Hesla byla požadována, ale neposkytnuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Žadatel 802.1x odpojen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Konfigurace žadatele 802.1x selhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Žadatel 802.1x selhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Žadateli 802.1x trvalo ověření příliš dlouho" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Spuštění služby PPP selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Služba PPP odpojena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Spuštění klienta DHCP selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Chyba klienta DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Klient DHCP selhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Spuštění služby sdíleného připojení selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Služba sdíleného připojení selhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Spuštění služby AutoIP selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Chyba služby AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Služba AutoIP selhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linka obsazena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Žádný vytáčecí tón" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nelze navázat spojení" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Požadavek na vytáčení vypršel" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Pokus o vytáčení selhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Inicializace modemu selhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Výběr zvoleného APN selhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nevyhledávají se sítě" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Registrace do sítě zamítnuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Registrace do sítě vypršela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Registrace do požadované sítě selhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Ověření PIN selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmware zařízení nejspíše chybí" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Připojení bylo ztraceno" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Existující spojení bylo převzato" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem nenalezen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Připojení Bluetooth selhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Karta SIM není vložena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Požadován PIN karty SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Požadován PUK karty SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Chybná SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Zařízení InfiniBand nepodporuje režim připojení" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Závislost připojení selhala" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Schází firmware" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Odpojen kabel" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nebyl vybrán žádný certifikát od certifikační autority" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "nedefinovaná chyba v zabezpečení 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "není vybrán žádný soubor" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Nepoužívání certifikátu od certifikační autority (CA) může vést k připojení " -"k nezabezpečeným, podvodným bezdrátovým sítím. Chcete si vybrat certifikát " -"od certifikační autority?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorovat" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Vybrat certifikát CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Soukromé klíče DER, PEM, nebo PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "blíže neurčená chyba při ověřování souboru s metodou eap" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Soukromé klíče DER, PEM, nebo PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certifikáty DER nebo PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "schází soubor EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Vybrat soubor PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Soubory PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Soubory PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Interní ověření totožnosti" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_Zajišťování PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3338,41 +3309,75 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonymní" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Totožnost ověřena" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Obojí" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Soubory PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Interní ověření totožnosti" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Umožnit automatické _zajišťování PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "chybí uživatelské jméno pro EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "chybí heslo pro EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Uživatelské jméno" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Zobrazit he_slo" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "neplatný certifikát EAP-PEAP certifikační autority: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"neplatný certifikát EAP-PEAP certifikační autority: žádný certifikát není " +"zadán" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Vybrat certifikát certifikační autority" @@ -3390,19 +3395,58 @@ msgid "C_A certificate" msgstr "Certifikát C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "_Certifikát CA není požadován" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Verze PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "P_tát se na heslo pokaždé" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "chybí uživatelské jméno pro EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "chybí heslo pro EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "chybí identita pro EAP-TLS" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "neplatný certifikát EAP-TLS certifikační autority: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" +"neplatný certifikát EAP-TLS certifikační autority: žádný certifikát není " +"zadán" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "neplatné heslo pro EAP-TLS: není zadáno" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "neplatný soukromý klíč pro EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "neplatný uživatelský certifikát pro EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Nešifrované soukromé klíče nejsou bezpečné" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3416,11 +3460,11 @@ "\n" "(Soukromý klíč můžete zabezpečit heslem pomocí openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Vyberte svůj osobní certifikát" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Vyberte svůj soukromý klíč" @@ -3432,51 +3476,58 @@ msgid "_User certificate" msgstr "_Uživatelský certifikát" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Soukromý _klíč" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Heslo k _soukromému klíči" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "neplatný certifikát EAP-TTLS certifikační autority: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"neplatný certifikát EAP-TTLS certifikační autority: žádný certifikát není " +"zadán" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Znovu mě neupozorňovat" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ne" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ano" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Neznámá chyba při ověřování zabezpečení 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunelované TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Chráněné EAP (PEAP)" @@ -3486,6 +3537,48 @@ msgid "Au_thentication" msgstr "_Ověření totožnosti" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "chybí uživatelské jméno pro LEAP" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "chybí heslo pro LEAP" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "chybí klíč WEP" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"neplatný klíč WEP: klíč s délkou %zu musí obsahovat jen šestnáctkové číslice" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"neplatný klíč WEP: klíč s délkou %zu musí obsahovat jen znaky sady ASCII" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"neplatný klíč WEP: nesprávná délka klíče %zu. Klíč musí mít délku 5/13 " +"(ASCII) nebo 10/26 (HEX)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "neplatný klíč WEP: heslová fráze nesmí být prázdná" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "neplatný klíč WEP: heslová fráze musí být kratší než 64 znaků" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (výchozí)" @@ -3522,19 +3615,33 @@ msgid "WEP inde_x" msgstr "Inde_x WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"neplatný osobní klíč WPA: neplatná délka klíče %zu. Musí být [8,63] bajtů " +"nebo 64 šestnáctkový číslic" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"neplatný osobní klíč WPA: nelze zpracovat klíč s 64 bajty jako šestnáctkový" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Typ" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Zapnuto" @@ -3571,16 +3678,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Zobrazovat _obsah zpráv na zamykací obrazovce" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Upozornění" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Spravovat to, jak jsou upozornění zobrazována a co ukazují" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "upozornění;proužek;zpráva;oblast;pruh;cedule;baner;banner;vyskakovací;" @@ -3598,79 +3706,68 @@ msgid "Applications" msgstr "Aplikace" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Jiný" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Přidání účtu" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Pošta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendář" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakty" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Diskuze" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Prostředky" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Chyba při přihlašování k účtu" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Platnost přihlašovacích údajů vypršela." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Přihlaste se, chcete-li tento účet povolit." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Přihlásit se" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Chyba při vytváření účtu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Chyba při odebírání účtu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Opravdu chcete odebrat tento účet?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Tímto se neodstraní účet na serveru." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "Odeb_rat" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Účty on-line" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Přihlaste se k účtům on-line a rozhodněte se, k čemu je používat" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3683,6 +3780,7 @@ msgstr "Nejsou nastavené žádné účty on-line" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Odebrat účet" @@ -3829,7 +3927,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Baterie" @@ -3877,103 +3975,104 @@ msgid "When _idle" msgstr "Při _nečinnosti" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Šetření energií" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Jas obrazovky" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatický jas" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Jas klávesnice" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Ztlumit jas obrazovky při neaktivitě" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Vypnout obrazovku" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Vypnout Wi-Fi, aby se šetřila energie." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobilní připojení" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Vypnout mobilní širokopásmová zařízení (3G, 4G, LTE atd.), aby se šetřila " "energie." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Při napájení z baterie" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Při napájení ze sítě" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Uspat do paměti" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Uspat na disk" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nic nedělat" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Uspávání a vypínací tlačítko" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automaticky uspat" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automaticky uspat" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Když je zmáčknuto vypínací tlačítko" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Zařízení" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Napájení" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Zobrazit stav baterie a změnit nastavení šetření energií" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -3982,59 +4081,59 @@ #: ../panels/power/power.ui.h:3 msgid "45 minutes" -msgstr "45 minutách" +msgstr "45 minut" #: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8 msgid "1 hour" -msgstr "1 hodině" +msgstr "1 hodiny" #: ../panels/power/power.ui.h:5 msgid "80 minutes" -msgstr "80 minutách" +msgstr "80 minut" #: ../panels/power/power.ui.h:6 msgid "90 minutes" -msgstr "90 minutách" +msgstr "90 minut" #: ../panels/power/power.ui.h:7 msgid "100 minutes" -msgstr "100 minutách" +msgstr "100 minut" #: ../panels/power/power.ui.h:8 msgid "2 hours" -msgstr "2 hodinách" +msgstr "2 hodin" #: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3 msgid "1 minute" -msgstr "1 minutě" +msgstr "1 minuty" #: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4 msgid "2 minutes" -msgstr "2 minutách" +msgstr "2 minut" #: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5 msgid "3 minutes" -msgstr "3 minutách" +msgstr "3 minut" #: ../panels/power/power.ui.h:12 msgid "4 minutes" -msgstr "4 minutách" +msgstr "4 minut" #: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6 msgid "5 minutes" -msgstr "5 minutách" +msgstr "5 minut" #: ../panels/power/power.ui.h:14 msgid "8 minutes" -msgstr "8 minutách" +msgstr "8 minut" #: ../panels/power/power.ui.h:15 msgid "10 minutes" -msgstr "10 minutách" +msgstr "10 minut" #: ../panels/power/power.ui.h:16 msgid "12 minutes" -msgstr "12 minutách" +msgstr "12 minut" #: ../panels/power/power.ui.h:18 msgid "Automatic Suspend" @@ -4050,12 +4149,7 @@ #: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33 msgid "Delay" -msgstr "Zpoždění" - -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Zrušit" +msgstr "Po uplynutí" #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" @@ -4066,138 +4160,138 @@ msgstr "Požadováno ověření totožnosti" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Dochází toner" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Došel toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Životnost vývojové jednotka se blíží ke konci" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Opotřebená vývojová jednotka" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Životnost zásobníku se blíží ke konci" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Opotřebený zásobník" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Otevřen kryt" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Otevřena dvířka" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Dochází papír" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Došel papír" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Off-line" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Zastaveno" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Odpadní nádobka je téměř plná" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Odpadní nádobka je plná" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Životnost optického válce se blíží ke konci" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Optický válec není nadále funkční" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Nastavování" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Připraveno" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Nepřijímá úlohy" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Zpracovává se" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Stav množství toneru" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Stav množství inkoustu" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Stav spotřebního materiálu" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instalace" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4206,15 +4300,15 @@ msgstr[2] "%u aktivních" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Selhalo přidání nové tiskárny." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Vyberte soubor PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4222,50 +4316,47 @@ "Soubory popisu tiskárny PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nenalezen vyhovující ovladač" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Vyhledávají se upřednostňované ovladače…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Vyberte z databáze…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Poskytněte soubor PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Zkušební stránka" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Žádné tiskárny" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Nelze načíst uživatelské rozhraní: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Tiskárny" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Přidejte tiskárny, prohlédněte si tiskové úlohy a rozhodněte, jak chcete " "tisknout" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "tiskárna;fronta;tisk;papír;inkoust;toner;" @@ -4427,6 +4518,11 @@ msgid "Parallel Port" msgstr "Paralelní port" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4638,13 +4734,17 @@ msgid "_Options" msgstr "V_olby" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Žádné tiskárny" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Přidat tiskárnu" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4652,70 +4752,70 @@ "Bohužel to vypadá, že systémová\n" "služba tisku není dostupná." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Zamykání obrazovky" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Používá se" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Zapnuto" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Vypnuto" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Služby určování polohy" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Použití a historie" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Vysypat všechny položky z koše?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Všechny položky v koši budou trvale smazány." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Vyprázdnit koš" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Odstranit dočasné soubory?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Všechny dočasné soubory budou trvale smazány." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Odstranit dočasné soubor_y" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Čištění koše a dočasných souborů" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Využití softwaru" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Hlášení problémů" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4724,20 +4824,21 @@ "Díky odesílání hlášení o technických problémech se může %s vylepšovat. " "Hlášení jsou odesílána anonymně a jsou z nich odstraněny osobní údaje." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Zásady soukromí" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Soukromí" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Chraňte své osobní informace a určete, co mohou ostatní vidět" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4908,21 +5009,21 @@ msgid "Other" msgstr "Další" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Aby se změny projevily, musí být sezení restartováno" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Restartovat nyní" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Není vybrán žádný vstupní zdroj" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Při_hlašovací obrazovka" @@ -4954,17 +5055,18 @@ msgid "Paper" msgstr "Papír" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Region a jazyk" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Vyberte jazyk, formáty, rozložení klávesnice a vstupní zdroje" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "jazyk;rozložení;klávesnice;vstup;" @@ -5021,7 +5123,7 @@ msgstr "Levý+pravý Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "Jazy_k" @@ -5071,26 +5173,11 @@ "Nastavení přihlášení jsou používány všemi uživateli při přihlašování do " "systému" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Místa" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Záložky" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Další" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Vyberte umístění" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Budiž" @@ -5098,11 +5185,12 @@ msgid "No applications found" msgstr "Žádné aplikace nenalezeny" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Hledání" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5110,7 +5198,7 @@ "Činnosti" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "hledání;hledat;najít;index;skrýt;soukromí;privátní;výsledky;" @@ -5118,6 +5206,18 @@ msgid "Search Locations" msgstr "Prohledávaná umístění" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Místa" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Záložky" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Ostatní" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Posunout výš" @@ -5130,6 +5230,11 @@ msgid "Preferences" msgstr "Předvolby" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nebyly zvoleny žádné sítě pro sdílení" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5155,21 +5260,54 @@ msgid "Choose a Folder" msgstr "Výběr složky" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Sdílení osobních souborů vám umožňuje sdílet složku Veřejné s ostatními v " +"aktuální síti pomocí: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Když je vzdálené přihlašování povolené, mohou se vzdálení uživatelé připojit " +"příkazem Secure Shell:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Sdílení obrazovky umožňuje vzdáleným uživatelům, aby viděli nebo ovládali " +"vaši obrazovku připojením k vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopírovat" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Sdílení" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Sdílení" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Určete, co chcete sdílet s ostatními" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5178,6 +5316,10 @@ "multimédia;zvuk;video;obraz;obrázky;fotografie;filmy;server;vykreslování;" "renderer;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Sítě" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Povolit nebo zakázat vzdálené přihlášení" @@ -5188,25 +5330,13 @@ "Pro povolení nebo zakázání vzdáleného přihlášení je vyžadováno ověření " "totožnosti" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nebyly zvoleny žádné sítě pro sdílení" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Sítě" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Název _počítače" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "S_dílení osobních souborů" +msgid "_File Sharing" +msgstr "S_dílení souborů" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5225,83 +5355,54 @@ msgstr "Některé služby jsou zakázány kvůli tomu, že není přístup k síti." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Sdílení osobních souborů" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Sdílení osobních souborů vám umožňuje sdílet složku Veřejné s ostatními v " -"aktuální síti pomocí: dav://%s" +msgid "File Sharing" +msgstr "Sdílení souborů" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "V_yžadovat heslo" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Vzdálené přihlášení" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Umožnit ostatním uživatelům, aby se připojili příkazem Secure Shell:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Sdílení obrazovky" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Umožnit vzdáleným uživatelům, aby viděli a ovládali vaši obrazovku přes: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Umožnit vzdálené ovládání" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Umožnit připojení pro ovládání obr_azovky" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Heslo:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Zobrazit heslo" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Volby přístupu" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Nové připojení se musí dotázat o svolení" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Vyžadovat heslo" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Sdílení multimédií" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Sdílení multimédií vám umožňuje sdílet hudbu, fotografie a videa po síti." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Sdílet hudbu, fotografie a videa po síti." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Složky" @@ -5433,11 +5534,6 @@ msgid "Peak detect" msgstr "Rozpoznávání špiček" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Název" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Zařízení" @@ -5532,16 +5628,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Vlastní" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Univerzální přístup" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Zjednodušit vidění, poslech, psaní a klikání" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5641,8 +5742,8 @@ msgstr "Ozvučení kláves" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pípnout při zapnutí klávesy Num Lock nebo Caps Lock." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pípnout při zapnutí nebo vypnutí klávesy Num Lock nebo Caps Lock." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6024,95 +6125,67 @@ msgstr "Ovlivnění barev" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" -msgid "Standard" -msgstr "Normální" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Přidání uživatele" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Celé jméno" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +msgid "Standard" +msgstr "Běžný" + +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Správce" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Celé jméno" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Typ účtu" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Umožnit uživateli nastavit si heslo při příštím přih_lášení" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Nastavit heslo _nyní" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "O_věřit" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "O_věření" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Přihlašování do domény umožňuje použít na tomto zařízení stávající centrálně " -"spravované uživatelské účty." +"spravované uživatelské účty. Tento účet můžete pak použít i pro přístup k " +"firemním prostředkům na Internetu." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Doména" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Přejít do režimu on-line, aby se mohl\n" -"přidat účet pro přihlášení do domény." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Přihlášení do domény" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Přidání uživatele" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "R_egistrovat" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Přihlášení doménového správce" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Abyste mohli použít přihlašování do domény, musí být tento\n" -"počítač v doméně zahrnut. Požádejte prosím svého správce\n" -"sítě o vepsání doménového hesla zde." +msgid "You are Offline" +msgstr "Jste odpojeni" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Jméno správce" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Abyste mohli přidat doménové uživatele, musíte být připojeni." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Heslo správce" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Přihlášení do domény" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6147,7 +6220,7 @@ msgstr "Malíček pravé ruky" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Povolit přihlášení otiskem prstů" @@ -6184,9 +6257,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "přihlášení;jméno;otisk prstu;avatar;logo;obličej;heslo;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Historie přihlašování" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "R_egistrovat" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Přihlášení doménového správce" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Abyste mohli použít přihlašování do domény, musí být tento\n" +"počítač v doméně zahrnut. Požádejte prosím svého správce\n" +"sítě o vepsání doménového hesla zde." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Jméno správce" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Heslo správce" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6209,38 +6305,30 @@ msgstr "Současné _heslo" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Umožnit uživateli nastavit si heslo při příštím přihlášení" +msgid "Allow user to change their password on next login" +msgstr "Nabídnout uživateli změnu jeho hesla při příštím přihlášení" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Nastavit heslo nyní" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Přidat uživatelský účet" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Odebrat uživatelský účet" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Přidat uživatele…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Volby přihlašování" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatické přihlašování" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Přihlášení otiskem _prstu" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ikona uživatele" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Poslední přihlášení" @@ -6343,8 +6431,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Zkombinujte velká a malá písmena a použijte jednu dvě číslice." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Zkombinujte velká a malá písmena a zkuste použít jednu či dvě číslice." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6435,32 +6523,33 @@ msgstr "Neznámá chyba" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Mělo by se shodovat s webovou adresou poskytovatele vašeho účtu." +msgid "Should match the web address of your login provider." +msgstr "" +"Mělo by se shodovat s webovou adresou poskytovatele vašeho přihlašování." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Přidání účtu selhalo" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Hesla si neodpovídají." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Registrace účtu selhala" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Ověření s touto doménou není podporováno" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Připojení k doméně selhalo" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6468,7 +6557,7 @@ "Toto přihlašovací jméno nefunguje.\n" "Zkuste to, prosím, znovu." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6476,14 +6565,24 @@ "Toto přihlašovací heslo nefunguje.\n" "Zkuste to, prosím, znovu." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Přihlášení do domény selhalo" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Nelze najít doménu. Nemáte v názvu překlep?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Normální" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Správce" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6502,15 +6601,15 @@ msgid "Enabled" msgstr "Zapnuto" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Smazat registrované otisky prstů?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Smazat otisky prstů" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6518,15 +6617,15 @@ "Přejete si smazat registrované otisky prstů, čímž dojde k vypnutí přihlášení " "otiskem prstů?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Hotovo!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Nezdařil se přístup k zařízení „%s“" @@ -6534,16 +6633,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Nezdařilo se spustit registraci otisků prstů na zařízení „%s“" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Nelze přistupovat k žádné čtečce otisku prstů" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Potřebujete-li pomoc, kontaktujte prosím správce systému." @@ -6552,7 +6651,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6561,11 +6660,11 @@ "Chcete-li zapnout přihlášení otiskem prstů, je nutné uložit jeden z vašich " "otisků prstů za použití zařízení \"%s\"." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Výběr prstu" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Registrace otisku prstu" @@ -6619,14 +6718,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sezení ukončeno" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sezení započato" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s – Aktivita účtu" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Zvolte prosím jiné heslo." @@ -6688,7 +6794,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Nelze se připojit k doméně „%s“: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Ostatní účty" @@ -6768,17 +6874,17 @@ msgid "Logged in" msgstr "právě přihlášený" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Selhalo kontaktování účtovací služby" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Zkontrolujte prosím, že je účtovací služba AccountService nainstalovaná a " "zapnutá." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6786,12 +6892,12 @@ "Abyste mohli provést změny,\n" "klikněte nejprve na ikonu *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Vytvořit uživatelský účet" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6799,12 +6905,12 @@ "Pro vytvoření uživatelského účtu\n" "nejprve klikněte na ikonu *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Odstranit vybraný uživatelský účet" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6812,33 +6918,32 @@ "Pro odstranění uživatelského účtu\n" "nejprve klikněte na ikonu *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Můj účet" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Uživatel s uživatelským jménem „%s“ již existuje." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Toto uživatelské jméno není bohužel dostupné. Zkuste prosím jiné." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Uživatelské jméno je příliš dlouhé." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Uživatelské jméno nesmí začínat znakem „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Uživatelské jméno se musí skládat jen z malých a velkých písmen a-z, číslic " -"a některého ze znaků z „.“, „-“ a „_“." +"a některého ze znaků: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Bude použito k pojmenování vaší domovské složky a nemůže být dodatečně " @@ -6910,7 +7015,7 @@ #. Keep ratio switch #: ../panels/wacom/cc-wacom-mapping-panel.c:275 msgid "Keep aspect ratio (letterbox):" -msgstr "Zachovat poměr (omezit oblast):" +msgstr "Zachovat poměr stran (omezit oblast):" #. Whole-desktop checkbox #: ../panels/wacom/cc-wacom-mapping-panel.c:286 @@ -6930,17 +7035,17 @@ msgid "Button" msgstr "Tlačítko" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablet Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "Nastavit mapování tlačítek a přizpůsobit citlivost grafických tabletů" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "tablet;Wacom;stalus;pero;eraser;guma;myš;" @@ -6972,6 +7077,10 @@ msgid "Bluetooth Settings" msgstr "Nastavení Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapování na obrazovku…" @@ -7065,22 +7174,22 @@ msgid "Mode Switch #%d" msgstr "Přepínač režimů č. %d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Levé tlačítko č. %d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Pravé tlačítko č. %d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Horní tlačítko č. %d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Dolní tlačítko č. %d" @@ -7091,7 +7200,7 @@ #: ../panels/wacom/wacom-stylus-page.ui.h:1 msgid "No Action" -msgstr "Žádná akce" +msgstr "Žádná činnost" #: ../panels/wacom/wacom-stylus-page.ui.h:2 msgid "Left Mouse Button Click" @@ -7157,6 +7266,11 @@ msgid "Tip Pressure Feel" msgstr "Pocit z přítlaku hrotu" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Všechna nastavení" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Ovládací centrum GNOME" @@ -7213,22 +7327,18 @@ msgid "Quit" msgstr "Ukončit" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Všechna nastavení" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Osobní" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Systém" @@ -7266,3 +7376,19 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "Zrušit vyhledávání" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Přístupový bod" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Klávesová zkratka pro %s. Změňte ji zadáním nové zkratky." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Zkratku upravíte kliknutím na odpovídající řádek a podržením nových " +#~ "kláves, vymazání provedete klávesou Backspace." diff -Nru gnome-control-center-3.20.2/po/cy.po gnome-control-center-3.22.1/po/cy.po --- gnome-control-center-3.20.2/po/cy.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/cy.po 2016-08-12 12:43:57.000000000 +0000 @@ -26,6 +26,7 @@ "PO-Revision-Date: 2006-03-08 12:53-0000\n" "Last-Translator: Rhys Jones \n" "Language-Team: Cymraeg \n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/da.po gnome-control-center-3.22.1/po/da.po --- gnome-control-center-3.20.2/po/da.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/da.po 2016-09-27 12:37:36.000000000 +0000 @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-20 23:46+0100\n" -"PO-Revision-Date: 2016-03-20 21:11+0100\n" +"POT-Creation-Date: 2016-09-17 16:02+0200\n" +"PO-Revision-Date: 2016-09-16 02:15+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -111,7 +111,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Hjem" @@ -126,26 +126,25 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 #: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -176,17 +175,18 @@ msgid "Current background" msgstr "Nuværende baggrund" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Baggrund" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Bag­grund" # gider ikke den ekstra ikke-information -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Skift dit baggrundsbillede til et tapet eller billede" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Tapet;Baggrund;Skærm;Skrivebord;" @@ -226,18 +226,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Sluk for kontakten Flytilstand for at aktivere Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Slå Bluetooth til eller fra og tilslut dine enheder" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "del;deling;bluetooth;obex;" @@ -407,7 +406,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Alle filer" @@ -447,7 +446,7 @@ msgstr "Gem profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Gem" @@ -705,7 +704,7 @@ "\"windows\">Microsoft Windows nyttige." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Sammenfatning" @@ -718,11 +717,10 @@ msgstr "_Importér fil…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Tilføj" @@ -871,18 +869,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Farver" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Far­ve" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibrér farver til dine enheder, såsom skærme, kameraer eller printere" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Farve;ICC;Profil;Kalibrer;Printer;Skærm;" @@ -900,23 +899,23 @@ msgid "No languages found" msgstr "Ingen sprog fundet" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "I dag" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "I går" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e. %b, %Y" @@ -1036,8 +1035,9 @@ msgid "December" msgstr "December" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Dato & klokkeslæt" @@ -1094,12 +1094,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Skift dato og klokkeslæt inklusive tidszone" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Ur;Tidszone;Sted;" @@ -1111,208 +1111,223 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Du skal godkende for at kunne ændre indstillinger for tid og dato." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Låg lukket" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Klonede" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primær" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Slået fra" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekundær" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Arrangér kombinerede skærme" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Anvend" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Træk visninger for at flytte dem" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Rotér 90° mod uret" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Rotér 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Rotér 90° med uret" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Størrelse" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Højde-/breddeforhold" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Opløsning" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Tilpas tv" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Opdateringsfrekvens" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Vis topbjælken og aktivitetsoversigten i denne visning" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Sekundær skærm" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Slå denne skærm sammen med en anden for at oprette et ekstra arbejdsområde" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Præsentation" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Vis kun diasshow og medier" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Klon" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Brug din eksisterende konfiguration på begge skærme" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Sluk" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Brug ikke denne skærm" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Kunne ikke finde skærminformation" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Arrangér kombinerede skærme" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Skærme" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Skær­me" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Vælg hvordan forbundne skærme og projektorer skal bruges" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Projektor;xrandr;Skærm;Opløsning;Opdatering;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Ukendt" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (Build-id: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (Build-id: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Spørg hvad der skal gøres" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Gør intet" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Åbn mappe" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Andet medie" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Vælg et program til lyd-cd'er" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Vælg et program til video-dvd'er" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Vælg et program der skal køres, når der tilsluttes en musikafspiller" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Vælg et program der skal køres, når der tilsluttes et kamera" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Vælg et program til software-cd'er" @@ -1321,88 +1336,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "lyd-dvd" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "blank Blu-ray-disk" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "blank cd-disk" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "blank dvd-disk" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "blank HD DVD-disk" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray-videodisk" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-bogslæser" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD-videodisk" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Billed-cd" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Supervideo-cd" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video-cd" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windowsprogrammer" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Afsnit" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Oversigt" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Standardprogrammer" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Flytbare medier" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Detaljer" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "De­tal­jer" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Vis information om systemet" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1576,8 +1589,9 @@ msgid "Launch help browser" msgstr "Start hjælpefremviser" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Indstillinger" @@ -1652,7 +1666,6 @@ # scootergrisen: måske oversæt "Universal Access" til "Adgang for alle" her og andre steder # scootergrisen: "Tilgængelighed" kan også fint bruges men passer måske bedre til "Accessibility" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Tilgængelighed" @@ -1689,11 +1702,21 @@ msgid "High contrast on or off" msgstr "Høj kontrast til eller fra" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Brugertilpassede genveje" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1721,118 +1744,125 @@ msgid "Modifiers-only switch to next source" msgstr "Skift til næste kilde med kun modifikatorer" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastatur" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Nulstil genvejen til dens standardværdi" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s bruges allerede som %s. Hvis du erstatter den, vil %s blive slået " +"fra" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Angiv brugertilpasset genvej" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Angiv genvej" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Indtast ny genvejstast for at ændre %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Tilføj brugertilpasset genvej" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Ta­sta­tur" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Vis og skift tastaturgenveje, og indstil dine tasteindstillinger" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Genvej;Gentagelse;Blink;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Brugertilpasset genvej" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Navn:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Ko_mmando:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Tilføj genvej" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Fjern genvej" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"En genvejstast ændres ved at klikke på rækken og trykke på den nye tast, " -"eller trykke tilbagetast for at rydde." +msgid "No keyboard shortcut found" +msgstr "Ingen tastaturgenvej fundet" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Brugertilpassede genveje" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Prøv en anden søgning" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Tryk Esc for at annullere." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Genvejen \"%s\" kan ikke bruges da det derved vil være umuligt at skrive med " -"denne tast.\n" -"Prøv venligst med f.eks. Ctrl-, Alt- eller Skift-tasten på samme tid." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Navn" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Genvejen \"%s\" bliver allerede benyttet til\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Kommando" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Genvej" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Redigér" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Hvis du laver genvejen til \"%s\" om, vil \"%s\"-genvejen blive deaktiveret." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ingen" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Omtildel" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Fjern" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Indtast den nye genvej" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Genvejen \"%s\" er associeret med \"%s\"-genvejen. Ønsker du at sætte den " -"til \"%s\" automatisk?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Annullér" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" er i øjeblikket associeret med \"%s\", denne genvej blive deaktiveret " -"hvis du vælger at fortsætte." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Tilføj" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Tildel" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Erstat" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Angiv" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Afprøv dine indstillinger" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mus & pegeplade" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Mus & pege­plade" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1840,7 +1870,7 @@ "venstrehåndstilstand" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Pegeplade;Markør;Klik;Prik;Dobbelt;Knap;Trackball;Rul;Rulning;" @@ -1898,6 +1928,10 @@ msgstr "Tryk for at klikke" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Tofingerrulning" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Kantrulning" @@ -1936,11 +1970,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Flytilstand" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Netværksproxy" @@ -1948,17 +1982,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Ups, der er gået noget galt. Kontakt venligst din softwareforhandler." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Netværkshåndtering skal køre." @@ -1974,7 +2008,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1991,60 +2025,65 @@ msgid "page 2" msgstr "side 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sikkerhed" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatisk" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" # ? #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Aldrig" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2052,180 +2091,180 @@ msgstr[1] "%i dage siden" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Svag" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "OK" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "God" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Fremragende" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detaljer" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitet" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresse" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netmaske" # i mangel af at "(wireless) access point" også kaldes adgangspunkt, så bør vi nok have en anden oversættelse af gateway -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Slet adresse" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Tilføj" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Slet DNS-server" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrik" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Slet rute" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatisk (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuel" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Kun link-lokal" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:942 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Præfiks" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatisk" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatisk, kun DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Nulstil" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bit-nøgle (Hex eller ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bit-adgangskode" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamisk WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2240,30 +2279,30 @@ msgstr "Forbindelseshastighed" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-adresse" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-adresse" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardwareadresse" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2273,7 +2312,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2356,13 +2395,13 @@ msgid "Firewall _Zone" msgstr "Firewall-_zone" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Forvalg" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zonen definerer forbindelsens betroethed" @@ -2404,45 +2443,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Kan ikke åbne forbindelsesredigering" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Ny profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Binding" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Hold" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bro" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Kunne ikke indlæse VPN-udvidelsesmoduler" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importér fra fil…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Tilføj netværksforbindelse" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Tilføj VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2450,7 +2469,7 @@ msgstr "_Nulstil" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Glem" @@ -2476,11 +2495,11 @@ msgid "S_ecurity" msgstr "S_ikkerhed" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Kan ikke importere VPN-forbindelse" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2493,36 +2512,36 @@ "\n" "Fejl: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Vælg fil at importere" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Åbn" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Der findes allerede en fil med navnet \"%s\"." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Erstat" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Vil du erstatte %s med den VPN-forbindelse, du er ved at gemme?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Kan ikke eksportere VPN-forbindelse" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2533,7 +2552,7 @@ "\n" "Fejl: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Eksportér VPN-forbindelse" @@ -2560,61 +2579,46 @@ msgid "Make available to _other users" msgstr "Gør tilgængelig for _andre brugere" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Netværk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Net­værk" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Angiv hvordan du forbinder til internettet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Netværk;Trådløs;Wi-Fi;Wifi;IP;LAN;Proxy:WAN;Bredbånd;Modem;Bluetooth;vpn;" -"vlan;bro;netværksbro;binding;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bindingsslaver" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(intet)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bro-slaver" +"Netværk;Trådløs;Wi-fi;Wifi;IP;LAN;Proxy:WAN;Bredbånd;Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "aldrig" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "i dag" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "i går" -#: ../panels/network/net-device-ethernet.c:160 +#: ../panels/network/net-device-ethernet.c:156 #: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 +#: ../panels/network/panel-common.c:647 ../panels/network/panel-common.c:649 #: ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-adresse" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Sidst brugt" @@ -2624,14 +2628,14 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Kabel" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 @@ -2639,20 +2643,11 @@ msgid "Options…" msgstr "Indstillinger…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Tilføj ny forbindelse" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Holdslaver" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2660,13 +2655,13 @@ "Hvis du har en internetforbindelse som ikke er trådløs, kan du indstille et " "trådløst hotspot til at dele forbindelsen med andre." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Hvis du tænder for det trådløse hotspot, vil du blive frakoblet %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2674,23 +2669,23 @@ "Det er ikke muligt at tilgå internettet gennem din trådløse forbindelse, " "mens hotspottet er aktivt." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Stop hotspot og afkobl eventuelle brugere?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Stop hotspot" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Systempolitikken forbyder brug som hotspot" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Trådløs enhed understøtter ikke hotspot-tilstand" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2698,11 +2693,11 @@ "Netværksdetaljer for de valgte netværk inklusive adgangskoder og eventuelt " "brugertilpasset konfiguration vil gå tabt." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historik" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2710,7 +2705,7 @@ msgstr "_Luk" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Glem" @@ -2747,6 +2742,10 @@ msgid "Provider" msgstr "Leverandør" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Netværk" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2852,16 +2851,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Adgangskode" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ingen" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Vis _adgangskode" @@ -2955,7 +2950,6 @@ msgstr "_Forbind til skjult netværk…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historik" @@ -2977,364 +2971,339 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Adgangskode" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktur" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Status ukendt" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Uhåndteret" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Utilgængelig" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Forbinder" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Godkendelse påkrævet" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Tilsluttet" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Afbryder forbindelse" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Forbindelse mislykkedes" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Status ukendt (mangler)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Ikke tilsluttet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfiguration mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP-konfiguration mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP-konfigurationen udløb" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Hemmeligheder blev påkrævet men ikke givet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x-supplikant frakoblede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Konfiguration af 802.1x-supplikant mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x-supplikant fejlede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x-supplikant brugte for lang tid på at godkende" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP-tjenesten kunne ikke starte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP-tjeneste frakoblede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP fejlede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP-klient kunne ikke starte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-klientfejl" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-klient fejlede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Tjenesten for delt forbindelse kunne ikke starte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Tjenesten til delt forbindelse fejlede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP-tjeneste kunne ikke starte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP-tjenestefejl" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP-tjeneste fejlede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linjen er optaget" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Ingen ringetone" # ? #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Ingen opkobling kunne etableres" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Tidsudløb for opringningsforsøg" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Opringningsforsøg mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Initialisering af modem mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Kunne ikke vælge den angivne APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Søger ikke efter netværk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Netværksregistrering nægtet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Tidsudløb ved netværksregistrering" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Kunne ikke registrere hos det forespurgte netværk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN-kontrol mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmware for enheden mangler måske" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Forbindelse forsvandt" # ? #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Eksisterende forbindelse blev antaget" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem ikke fundet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth-forbindelse mislykkedes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM-kort ikke indsat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM-pin påkrævet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM-puk påkrævet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM forkert" +# ??? #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand-enhed understøtter ikke forbundet tilstand" - -# ??? -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Forbindelsesforudsætning mislykkedes" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware mangler" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabel ikke tilsluttet" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Intet certifikat fra certifikatautoritet valgt" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "udefineret fejl i 802.1x-sikkerhed (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "ingen fil valgt" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Hvis man ikke bruger et certifikat fra en certifikatautoritet (CA), kan man " -"komme til at forbinde til usikre, fjendtligtsindede netværk. Vil du vælge " -"et certifikat fra en certifikatautoritet?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorér" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Vælg CA-certifikat" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Private DER-, PEM- eller PKCS#12-nøgler (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "uspecificeret fejl ved kontrol af eap-metodefil" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Private DER-, PEM- eller PKCS#12-nøgler (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER- eller PEM-certifikater (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "mangler EAP-FAST PAC-fil" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Vælg en PAC-fil" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC-filer (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC-_fil" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Indre godkendelse" - -# ? -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC-pro_visionering" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3343,41 +3312,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonym" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Godkendt" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Begge" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC-_fil" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Indre godkendelse" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Tillad automatisk PAC-pro_visionering" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "mangler EAP-LEAP-brugernavn" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "mangler EAP-LEAP-adgangskode" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Brugernavn" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Vi_s adgangskode" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "ugyldigt CA-certifikat til EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "ugyldigt CA-certifikat til EAP-PEAP: intet certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Vælg certifikat fra certifikatautoritet" @@ -3395,19 +3396,56 @@ msgid "C_A certificate" msgstr "C_A-certifikat" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Intet CA-certifikat _påkrævet" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP-_version" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Sp_ørg efter denne adgangskode hver gang" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "mangler EAP-brugernavn" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "mangler EAP-adgangskode" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "mangler EAP-TLS-identitet" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "ugyldigt CA-certifikat til EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "ugyldigt CA-certifikat til EAP-TLS: intet certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "ugyldig adgangskode til EAP-TLS: mangler" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "ugyldig privat nøgle til EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "ugyldigt brugercertifikat til EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Ukrypterede private nøgler er usikre" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3421,11 +3459,11 @@ "\n" "(Du kan adgangskodebeskytte din private nøgle med openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Vælg dit personlige certifikat" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Vælg din private nøgle" @@ -3437,51 +3475,56 @@ msgid "_User certificate" msgstr "_Brugercertifikat" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Privat _nøgle" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Adgangskode for _privat nøgle" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "ugyldigt CA-certifikat til EAP-TTLS: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "ugyldigt CA-certifikat til EAP-TTLS: intet certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Advar mig ikke igen" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nej" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ja" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Ukendt fejl ved validering af 802.1x-sikkerhed" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS gennem tunnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Beskyttet EAP (PEAP)" @@ -3491,6 +3534,46 @@ msgid "Au_thentication" msgstr "_Godkendelse" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "mangler leap-brugernavn" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "mangler leap-adgangskode" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "mangler web-nøgle" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "ugyldig wep-nøgle: nøgle med længde %zu må kun indeholde hex-cifre" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "ugyldig web-nøgle: nøgle med længde %zu må kun indeholde ascii-tegn" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"ugyldig wep-nøgle: forkert nøglelængde %zu. En nøgle skal have længde 5/13 " +"(ascii) eller 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "ugyldig wep-nøgle: adgangsfrase må ikke være tom" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "ugyldig wep-nøgle: adgangsfrase skal være kortere end 64 tegn" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (forvalg)" @@ -3527,19 +3610,32 @@ msgid "WEP inde_x" msgstr "WEP-inde_ks" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"ugyldig wpa-psk: ugyldig nøglelængde %zu. Skal være [8, 63] byte eller 64 " +"hex-cifre" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "ugyldig wpa-psk: kan ikke fortolke nøgle med 64 byte som hex" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Type" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Slået til" @@ -3576,16 +3672,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Vis i_ndhold af meddelelser ved låst skærm" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Påmindelser" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "På­min­del­ser" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Tilpas hvilke påmindelser der vises, og hvad de viser" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Påmindelser;Banner;Besked;Meddelelse;Statusfelt;Status;Pop;Pop-op;" @@ -3603,80 +3700,69 @@ msgid "Applications" msgstr "Programmer" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Anden" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Tilføj konto" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Post" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalender" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakter" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ressourcer" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Fejl ved log ind til kontoen" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Akkreditiver udløbet." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Log ind for at aktivere denne konto." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Log ind" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Fejl ved oprettelse af konto" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Fejl ved sletning af konto" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Er du sikker på, at du vil slette kontoen?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Dette vil ikke slette kontoen på serveren." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Fjern" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Onlinekonti" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Online­konti" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Forbind til dine onlinekonti og beslut dig for hvad du vil bruge dem til" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3690,6 +3776,7 @@ msgstr "Ingen onlinekonti konfigureret" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Fjern konto" @@ -3832,7 +3919,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batteri" @@ -3880,101 +3967,103 @@ msgid "When _idle" msgstr "Ved _tomgang" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Strømbesparelse" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Skærmlysstyrke" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatisk lysstyrke" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Tastaturlysstyrke" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Dæmp skærmen ved inaktivitet" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Sort skærm" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Sluk wi-fi for at spare strøm." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobilt bredbånd" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Sluk mobilt bredbånd (3G, 4G, LTE osv.) for at spare strøm." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Ved batteridrift" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Ved ekstern strøm" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Hvile" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Dvale" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Intet" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Hvile- og tænd/sluk-knap" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatisk hvile" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatisk hvile" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Når der trykkes på tænd-/sluk-knappen" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Enheder" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +# Fejlen er kun vigtig for længere strenge. Tak til Kris for oprindeligt at have rapporteret denne!! +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Strøm" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Vis din batteristatus og skift indstillinger for strømstyring" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4053,11 +4142,6 @@ msgid "Delay" msgstr "Ventetid" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Annullér" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Godkend" @@ -4067,139 +4151,139 @@ msgstr "Godkendelse påkrævet" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Lavt tonerniveau" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Løbet tør for toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Lavt niveau af fremkaldervæske" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Løbet tør for fremkaldervæske" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Markerfarveforsyning lav" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Løbet tør for markerfarve" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Kabinet åbent" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Låge åben" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Lavt papirniveau" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Løbet tør for papir" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Ikke tilsluttet" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Standset" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Affaldsbeholderen er næsten fuld" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Affaldsbeholderen er fuld" # optical photo conductor == lys-lys-leder. Det er vist lidt dobbeltkonfekt. Den kan vi nok tillade os at skrive ordentligt #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Lyslederen fungerer snart ikke længere" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Lyslederen fungerer ikke længere" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Konfigurerer" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Klar" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Accepterer ikke job" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Behandler" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Tonerniveau" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Blækniveau" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Forsyningsniveau" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Installerer" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4207,15 +4291,15 @@ msgstr[1] "%u aktive" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Kunne ikke tilføje den nye printer." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Vælg PPD-fil" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4223,48 +4307,45 @@ "PostScript-printerbeskrivelsesfiler (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Ingen passende driver fundet" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Søger efter foretrukne drivere…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Vælg fra database…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Angiv PPD-fil…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Testside" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Ingen printere" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Kunne ikke indlæse brugerfladen: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Printere" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Prin­tere" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Tilføj printere, vis printerjob og bestem hvordan du vil udskrive" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Kø;Print;Papir;Blæk;Toner;" @@ -4426,6 +4507,11 @@ msgid "Parallel Port" msgstr "Parallelport" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4638,13 +4724,17 @@ msgid "_Options" msgstr "_Indstillinger" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Ingen printere" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Tilføj en printer" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4652,70 +4742,70 @@ "Beklager! Systemets udskriftstjeneste\n" "synes at være utilgængelig." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Skærmlåsning" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "I brug" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Slået til" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Slået fra" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Placeringstjenester" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Brug & historik" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Tøm papirkurven for alle elementer?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Alle elementer i papirkurven vil blive slettet permanent." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Tøm papirkurv" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Slet alle de midlertidige filer?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Alle de midlertidige filer vil blive slettet permanent." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Slet midlertidige filer" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Tøm papirkurv & midlertidige filer" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Programforbrug" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Problemrapportering" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4724,20 +4814,21 @@ "Afsendelse af rapporter om tekniske problemer hjælper os med at forbedre %s. " "Rapporterne sendes anonymt og renses for personlige data." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Privatlivspolitik" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privatliv" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Pri­vat­liv" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Beskyt dine personlige oplysninger og bestem hvad andre kan se" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4908,21 +4999,21 @@ msgid "Other" msgstr "Anden" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Dine sessioner skal genstartes for at ændringerne træder i kraft" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Genstart nu" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Ingen inputkilder valgt" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Login_skærm" @@ -4954,17 +5045,18 @@ msgid "Paper" msgstr "Papir" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Region & sprog" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Re­gion & sprog" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Vælg sprog, formater, tastaturlayout samt inputkilder" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Sprog;Layout;Tastatur;Input;Inddata;" @@ -5022,7 +5114,7 @@ msgstr "Venstre+højre Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Sprog" @@ -5071,27 +5163,11 @@ msgstr "" "Indstillinger for login gælder for alle brugere når de logger ind på systemet" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Steder" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Bogmærker" - -# Flertal med vilje -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Andre" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Vælg sted" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5099,18 +5175,19 @@ msgid "No applications found" msgstr "Ingen programmer fundet" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Søg" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Bestem hvilke programmer, der viser søgeresultater i aktivitetsoversigten" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Søg;Find;Indeks;Skjul;Privatliv;Resultater;" @@ -5118,6 +5195,19 @@ msgid "Search Locations" msgstr "Søgesteder" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Steder" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Bogmærker" + +# andet end bogmærker, steder +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Andet" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Flyt op" @@ -5130,6 +5220,11 @@ msgid "Preferences" msgstr "Indstillinger" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Ingen netværk valgt til deling" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5155,21 +5250,54 @@ msgid "Choose a Folder" msgstr "Vælg en mappe" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Personlig fildeling lader dig dele mappen Offentligt med andre på dit " +"nuværende netværk gennem: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Når fjernlogind er slået til, kan fjernbrugere forbinde via ssh-kommandoen " +"(Secure Shell):\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Skærmdeling lader fjernbrugere se eller styre din skærm ved at forbinde til " +"vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopiér" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Deling" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "De­ling" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Bestem hvad du vil dele med andre" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5177,6 +5305,10 @@ "del;deling;ssh;vært;navn;fjern;skrivebord;medie;lyd;video;billeder;fotos;" "film;videoer;server;rendering;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Netværk" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Slå fjernlogin til eller fra" @@ -5186,25 +5318,13 @@ msgstr "" "Der kræves godkendelse for at kunne aktivere eller deaktivere fjernlogin" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Ingen netværk valgt til deling" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Netværk" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Computernavn" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Personlig fildeling" +msgid "_File Sharing" +msgstr "_Fildeling" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5223,82 +5343,54 @@ msgstr "Visse tjenester er deaktiveret fordi der ikke er netværksadgang." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Personlig fildeling" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Personlig fildeling lader dig dele mappen Offentligt med andre på dit " -"nuværende netværk gennem: dav://%s" +msgid "File Sharing" +msgstr "Fildeling" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Kræv adgangskode" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Fjernlogin" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Tillad fjernbrugere at forbinde ved brug af ssh-kommandoen (Secure Shell):\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Skærmdeling" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Tillad fjernbrugere at se eller styre min skærm ved at forbinde til: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Tillad fjernstyring" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Tillad at forbindelser styrer skærmen" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Adgangskode:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Vis adgangskode" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Adgangsindstillinger" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Nye forbindelser skal bede om adgang" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Kræv en adgangskode" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Mediedeling" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "Mediedeling lader dig dele musik, billeder og videoer over netværket." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Del musik, billeder og videoer over netværket." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Mapper" @@ -5428,11 +5520,6 @@ msgid "Peak detect" msgstr "Top-bestemmelse" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Navn" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Enhed" @@ -5527,16 +5614,23 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Tilpasset" +# scootergrisen: måske oversæt "Universal Access" til "Adgang for alle" her og andre steder +# scootergrisen: "Tilgængelighed" kan også fint bruges men passer måske bedre til "Accessibility" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Til­gæn­ge­lig­hed" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Gør det nemmere at se, høre, skrive, pege og klikke" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5636,8 +5730,8 @@ msgstr "Lydtaster" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Bip når Num Lock og Caps Lock slås til." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Bip når Num Lock og Caps Lock slås til eller fra." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6018,95 +6112,67 @@ msgstr "Farveeffekter" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Tilføj bruger" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Fulde navn" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standard" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrator" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Fulde navn" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Konto_type" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Tillad bruger at angive en adgangskode ved næste _login" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Angiv en adgangskode _nu" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verificér" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Bekræft" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Enterprise-login tillader en eksisterende, centralt håndteret brugerkonto at " -"blive brugt på denne enhed." +"Enterprise-logind tillader at der bruges en eksisterende, centralt håndteret " +"brugerkonto på denne enhed. Du kan også bruge denne konto til at tilgå " +"firmaressourcer på internettet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domæne" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Gå på nettet for at tilføje\n" -"enterprise-loginkonti." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Enterprise-login" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Tilføj bruger" +msgid "You are Offline" +msgstr "Du er ikke tilsluttet" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Tilknyt" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Login for domæneadministrator" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"For at kunne bruge enterprise-logins, skal denne computer\n" -"være med i domænet. Få venligst din netværksadministrator\n" -"til at skrive vedkommendes adgangskode her." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Navn på administrator" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Du skal være på nettet for at kunne tilføje enterprise-brugere." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Adgangskode for administrator" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Enterprise-login" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6141,7 +6207,7 @@ msgstr "Højre lillefinger" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Aktivér login med fingeraftryk" @@ -6178,9 +6244,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Login;Navn;Fingeraftryk;Profilbillede;Logo;Ansigt;Adgangskode;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Loginhistorik" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Tilknyt" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Login for domæneadministrator" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"For at kunne bruge enterprise-logins, skal denne computer\n" +"være med i domænet. Få venligst din netværksadministrator\n" +"til at skrive vedkommendes adgangskode her." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Navn på administrator" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Adgangskode for administrator" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6203,38 +6292,30 @@ msgstr "Nuværende _adgangskode" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "Tillad bruger at vælge adgangskode når der logges ind næste gang" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Angiv en adgangskode nu" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Tilføj brugerkonti" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Fjern brugerkonti" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Tilføj bruger…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Indstillinger for login" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatisk login" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Login med _fingeraftryk" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Brugerikon" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Sidste login" @@ -6337,8 +6418,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Bland store og små bogstaver, og brug et tal eller to." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Bland store og små bogstaver, og brug et par tal." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6428,33 +6509,34 @@ msgid "Unknown error" msgstr "Ukendt fejl" +# Ved ikke hvad en login provider er, nøjagtigt #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Bør svare til webadressen for din kontoudbyder." +msgid "Should match the web address of your login provider." +msgstr "Bør svare til webadressen for din logind-udbyder." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Kunne ikke tilføje konto" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Adgangskoderne stemmer ikke." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Kunne ikke registrere konto" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Ingen understøttet måde at godkende med dette domæne" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Kunne ikke slutte til domænet" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6462,7 +6544,7 @@ "Det loginnavn virkede ikke.\n" "Prøv venligst igen." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6470,14 +6552,24 @@ "Adgangskoden for login virkede ikke.\n" "Prøv venligst igen." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Kunne ikke logge ind på domænet" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Kan ikke finde domænet. Måske stavede du det forkert?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standard" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrator" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6496,15 +6588,15 @@ msgid "Enabled" msgstr "Aktiveret" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Slet registrerede fingeraftryk?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Slet fingeraftryk" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6512,15 +6604,15 @@ "Ønsker du at slette dine registrerede fingeraftryk, så login med " "fingeraftryk er deaktiveret?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Gjort!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Kunne ikke tilgå \"%s\"-enheden" @@ -6528,16 +6620,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Kunne ikke påbegynde fingermåling på \"%s\"-enheden" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Kunne ikke tilgå nogen fingeraftryksaflæsere" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Kontakt venligst din systemadministrator for hjælp." @@ -6546,7 +6638,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6555,11 +6647,11 @@ "For at aktivere login med fingeraftryk, skal du gemme et af dine " "fingeraftryk ved brug af \"%s\"-enheden." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Vælg finger" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Optager fingeraftryk" @@ -6613,14 +6705,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Session afsluttet" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Session påbegyndt" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Kontoaktivitet" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Vælg venligst en anden adgangskode." @@ -6682,7 +6781,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Kunne ikke forbinde til domænet %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Andre konti" @@ -6764,15 +6863,15 @@ msgid "Logged in" msgstr "Logget ind" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Kunne ikke kontakte kontotjenesten" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Kontrollér venligst at AccountService er installeret og aktiveret." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6780,12 +6879,12 @@ "Klik først på *-ikonet\n" "for at lave ændringer" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Opret ny brugerkonto" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6793,12 +6892,12 @@ "Klik først *-ikonet\n" "for at oprette en brugerkonto" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Slet den valgte brugerkonto" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6806,33 +6905,32 @@ "Klik først *-ikonet\n" "for at slette den valgte brugerkonto" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Min konto" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Der findes allerede en bruger med brugernavnet \"%s\"." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Beklager, men det brugernavn er ikke tilgængeligt. Prøv et andet." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Brugernavnet er for langt." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Brugernavnet kan ikke begynde med \"-\"." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Brugernavnet kan kun bestå af små og store bogstaver fra a til z, tal og " -"tegnene \".\", \"-\" og \"_\"." +"følgende tegn: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Dette vil blive brugt til at navngive din hjemmemappe og kan ikke ændres." @@ -6924,19 +7022,19 @@ msgid "Button" msgstr "Knap" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom-tegneplade" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa­com-tegne­plade" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Angiv tasteafbildninger og justér følsomhed for digital pen til grafik-tavle-" "pc'er" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tegneplade;Wacom;Pen;Viskelæder;Mus;" @@ -6968,6 +7066,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-indstillinger" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom-tegneplade" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Tildel skærm…" @@ -7062,22 +7164,22 @@ msgid "Mode Switch #%d" msgstr "Tilstandsskift #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Venstre knap #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Højre knap #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Øverste knap #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Nederste knap #%d" @@ -7159,6 +7261,11 @@ msgid "Tip Pressure Feel" msgstr "Følelsen af pres med spidsen" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Alle indstillinger" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME Kontrolcenter" @@ -7215,22 +7322,18 @@ msgid "Quit" msgstr "Afslut" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Alle indstillinger" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personligt" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "System" @@ -7269,5 +7372,186 @@ msgid "Cancel search" msgstr "Afbryd søgning" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Tastaturgenvej for %s. Indtast ny genvej for at ændre." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "En genvejstast ændres ved at klikke på rækken og trykke på den nye tast, " +#~ "eller trykke tilbagetast for at rydde." + +#~ msgid "Color" +#~ msgstr "Farver" + +#~ msgid "_Name:" +#~ msgstr "_Navn:" + +#~ msgid "Remove Shortcut" +#~ msgstr "Fjern genvej" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Genvejen \"%s\" kan ikke bruges da det derved vil være umuligt at skrive " +#~ "med denne tast.\n" +#~ "Prøv venligst med f.eks. Ctrl-, Alt- eller Skift-tasten på samme tid." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Genvejen \"%s\" bliver allerede benyttet til\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Hvis du laver genvejen til \"%s\" om, vil \"%s\"-genvejen blive " +#~ "deaktiveret." + +#~ msgid "_Reassign" +#~ msgstr "_Omtildel" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Genvejen \"%s\" er associeret med \"%s\"-genvejen. Ønsker du at sætte den " +#~ "til \"%s\" automatisk?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" er i øjeblikket associeret med \"%s\", denne genvej blive " +#~ "deaktiveret hvis du vælger at fortsætte." + +#~ msgid "_Assign" +#~ msgstr "_Tildel" + +#~ msgid "Bond" +#~ msgstr "Binding" + +#~ msgid "Team" +#~ msgstr "Hold" + +#~ msgid "Bridge" +#~ msgstr "Bro" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Kunne ikke indlæse VPN-udvidelsesmoduler" + +#~ msgid "Add Network Connection" +#~ msgstr "Tilføj netværksforbindelse" + +#~ msgid "Bond slaves" +#~ msgstr "Bindingsslaver" + +#~ msgid "(none)" +#~ msgstr "(intet)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bro-slaver" + +#~ msgid "Team slaves" +#~ msgstr "Holdslaver" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand-enhed understøtter ikke forbundet tilstand" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Intet certifikat fra certifikatautoritet valgt" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Hvis man ikke bruger et certifikat fra en certifikatautoritet (CA), kan " +#~ "man komme til at forbinde til usikre, fjendtligtsindede netværk. Vil du " +#~ "vælge et certifikat fra en certifikatautoritet?" + +#~ msgid "Ignore" +#~ msgstr "Ignorér" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Vælg CA-certifikat" + +#~ msgid "As_k for this password every time" +#~ msgstr "Sp_ørg efter denne adgangskode hver gang" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Advar mig ikke igen" + +#~ msgid "No" +#~ msgstr "Nej" + +#~ msgid "Yes" +#~ msgstr "Ja" + +#~ msgid "Error logging into the account" +#~ msgstr "Fejl ved log ind til kontoen" + +#~ msgid "Credentials have expired." +#~ msgstr "Akkreditiver udløbet." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Log ind for at aktivere denne konto." + +#~ msgid "_Sign In" +#~ msgstr "_Log ind" + +#~ msgid "Power" +#~ msgstr "Strøm" + +#~ msgid "Privacy" +#~ msgstr "Privatliv" + +# Flertal med vilje +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Andre" + +#~ msgid "Personal File Sharing" +#~ msgstr "Personlig fildeling" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Tillad fjernstyring" + +#~ msgid "_Verify" +#~ msgstr "_Verificér" + +#~ msgid "Login History" +#~ msgstr "Loginhistorik" + +#~ msgid "Add User Account" +#~ msgstr "Tilføj brugerkonti" + +#~ msgid "Remove User Account" +#~ msgstr "Fjern brugerkonti" + +#~ msgid "Login Options" +#~ msgstr "Indstillinger for login" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Der findes allerede en bruger med brugernavnet \"%s\"." + #~ msgid "Used to determine your geographical location" #~ msgstr "Bruges til at bestemme din geografiske placering" diff -Nru gnome-control-center-3.20.2/po/de.po gnome-control-center-3.22.1/po/de.po --- gnome-control-center-3.20.2/po/de.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/de.po 2016-09-27 12:37:36.000000000 +0000 @@ -26,16 +26,16 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-07-09 07:39+0000\n" -"PO-Revision-Date: 2016-07-11 18:28+0200\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-09 20:35+0200\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.9\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -108,7 +108,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Persönlicher Ordner" @@ -123,25 +123,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1283 -#: ../panels/network/net-device-wifi.c:1483 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -172,16 +171,17 @@ msgid "Current background" msgstr "Aktueller Hintergrund" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Hintergrund" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Verwenden Sie ein Foto oder eine Grafikdatei für den Hintergrund" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Hintergrundbild;Bildschirm;Schreibtisch;" @@ -224,18 +224,17 @@ msgstr "" "Schalten Sie den Flugzeugmodusschalter aus, um Bluetooth zu aktivieren." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Schalten Sie Bluetooth an oder aus und verbinden Sie Ihre Geräte" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "Freigabe;Bluetooth;obex;" @@ -409,7 +408,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Alle Dateien" @@ -450,7 +449,7 @@ msgstr "Profil speichern" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Speichern" @@ -709,7 +708,7 @@ "\">Microsoft Windows eingesetzt wird." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Zusammenfassung" @@ -721,11 +720,11 @@ msgid "_Import File…" msgstr "Datei _importieren …" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Hinzufügen" @@ -876,18 +875,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Farbe" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibrieren Sie die Farbe Ihrer Geräte wie Monitore, Kameras oder Drucker." #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Farbe;ICC;Profil;Kalibrieren;Drucker;Anzeige;" @@ -906,12 +906,12 @@ msgstr "Keine Sprachen gefunden" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Heute" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Gestern" @@ -1041,8 +1041,9 @@ msgid "December" msgstr "Dezember" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Datum und Zeit" @@ -1099,12 +1100,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Das Datum, die Zeit und die Zeitzone ändern" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Uhr;Zeitzone;Ort;" @@ -1118,26 +1119,26 @@ "Um die Einstellungen für Zeit und Datum zu ändern, müssen Sie sich " "legitimieren." -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Deckel geschlossen" # "mirror" ist hier ein Adjektiv #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Gespiegelte Bildschirme" -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primärer Bildschirm" -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1147,184 +1148,199 @@ msgid "Off" msgstr "Aus" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekundärer Bildschirm" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Verbundene Bildschirme anordnen" -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "An_wenden" -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Ziehen Sie die Bildschirme, um sie anzuordnen" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Gegen den Uhrzeigersinn um 90° drehen" -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Um 180° drehen" -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Im Uhrzeigersinn um 90° drehen" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Größe" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Anzeigeverhältnis" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Auflösung" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Anpassung für TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Bildwiederholrate" -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Die Menüleiste und Aktivitätenübersicht auf diesem Bildschirm darstellen" -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Zweitbildschirm" -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Diesen Bildschirm mit einem anderen verbinden, um einen zusätzliche " "Bildschirmoberfläche zu erhalten" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Präsentation" -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Nur Bildvorführungen und Medien anzeigen" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Bildschirm spiegeln" -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Die bestehende Ansicht auf beiden Bildschirmen darstellen" -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Ausschalten" -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Diesen Bildschirm nicht verwenden" -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Bildschirminformationen konnten nicht ausgelesen werden" -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Verbundene Bildschirme _anordnen" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Bildschirme" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Legt fest, wie angeschlossene Monitore und Projektoren arbeiten" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projektor;xrandr;Anzeige;Auflösung;Aktualisieren;Bildschirm;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Unbekannt" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d Bit (Build ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d Bit (Build ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" -msgstr "%s %d-Bit" +msgstr "%s %d Bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d Bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Nachfragen, was geschehen soll" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nichts tun" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Ordner öffnen" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Andere Medien" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Eine Anwendung für Audio-CDs wählen" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Eine Anwendung für Video-DVDs wählen" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Wählen Sie eine Anwendung, wenn ein Musikabspielgerät angeschlossen wird" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Wählen Sie eine Anwendung, wenn eine Kamera angeschlossen wird" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Eine Anwendung für Software-CDs wählen" @@ -1333,88 +1349,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "Audio-DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Leere Blu-ray-Disc" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Leere CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Leere DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Leere HD-DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray-Video-Disc" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "E-Book-Reader" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD-DVD-Video-Disc" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Foto-CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super-Video-CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video-CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows-Software" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Abschnitt" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Übersicht" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Vorgabe-Anwendungen" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Wechselmedien" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Details" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Informationen über Ihr System anzeigen" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1588,8 +1602,9 @@ msgid "Launch help browser" msgstr "Hilfe-Browser starten" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Einstellungen" @@ -1663,7 +1678,6 @@ # Mit weichen Trennzeichen, die die Stelle einen Textumbruch vorschlagen #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Barriere­frei­heit" @@ -1699,14 +1713,24 @@ msgid "High contrast on or off" msgstr "Hohen Kontrast ein-/ausschalten" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Eigene Tastenkombinationen" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Deaktiviert" @@ -1730,125 +1754,127 @@ msgid "Modifiers-only switch to next source" msgstr "Mit Hilfstasten zur nächsten Quelle wechseln" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastatur" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Die Tastenkombination auf die Vorgabe zurücksetzen" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s wird bereits für %s verwendet. Wenn Sie diese ersetzen, so wird %s " +"deaktiviert" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Eigene Tastenkombination festlegen" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Tastenkombination festlegen" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Geben Sie die neue Tastenkombination ein, um %s zu ändern." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Individuelle Tastenkombination hinzufügen" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tastatur" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" -"Tastaturkürzel anzeigen und ändern sowie individuelle Tastaturbelegung " +"Tastenkombinationen anzeigen und ändern sowie individuelle Tastaturbelegung " "einstellen" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" -msgstr "Kürzel;Wiederholen;Blinken;" +msgstr "Kürzel;Wiederholen;Blinken;Tastaturkürzel;Tastenkombination" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Individuelle Tastenkombination" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Name:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Be_fehl:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Tastenkürzel hinzufügen" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Tastenkürzel entfernen" +msgid "No keyboard shortcut found" +msgstr "Keine Tastenkombination gefunden" -# extrem gekürzt, wirkt sich auf Fensterbreite aus -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Um ein Tastenkürzel zu bearbeiten, klicken Sie auf die Zeile und drücken Sie " -"die neue Tastenkombination, oder drücken Sie die Rücktaste, um sie zu " -"löschen." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Eigene Tastenkombinationen" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Versuchen Sie eine andere Suchanfrage" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Drücken Sie Esc zum Abbrechen." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Die Tastenkombination »%s« kann nicht verwendet werden, da es dann unmöglich " -"wäre, mit dieser Taste zu schreiben.\n" -"Bitte versuchen Sie eine Kombination mit einer Taste wie Strg, Alt oder der " -"Umschalttaste." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Name" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Die Tastenkombination »%s« wird bereits für\n" -"»%s«\n" -"verwendet." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Befehl" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Tastenkombination" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Bearbeiten" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Wenn Sie diese Tastenkombination »%s« zuweisen, wird die Tastenkombination " -"für »%s« deaktiviert." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Keine" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Zuweisen" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Entfernen" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Neue Tastenkombination eingeben" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Die Tastenkombination »%s« ist der Tastenkombination »%s« zugewiesen. Soll " -"diese automatisch auf »%s« festgelegt werden?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Abbrechen" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"»%s« ist derzeit »%s« zugewiesen. Diese Tastenkombination wird deaktiviert, " -"wenn Sie fortsetzen." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Hinzufügen" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Zuweisen" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Ersetzen" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Festlegen" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Testen Sie Ihre Einstellungen" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Maus und Tastfeld" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1857,7 +1883,7 @@ # Ich vermute »tap« meint einen Mausklick in Form einer kurzen Fingerberührung des Touchpad #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Zeiger;Mauszeiger;Klick;Doppelklick;Maustaste;Trackball;Bildlauf;" @@ -1917,6 +1943,10 @@ msgstr "Drücken zum Klicken" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Bildlauf mit zwei Fingern" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Bildlauf am Rand" @@ -1959,11 +1989,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Flugzeugmodus" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Netzwerk-Proxy" @@ -1971,19 +2001,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Hoppla, etwas ist schief gegangen. Bitte kontaktieren Sie Ihren Software-" "Hersteller." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager muss laufen." @@ -1999,7 +2029,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2016,64 +2046,64 @@ msgid "page 2" msgstr "Seite 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sicherheit" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatisch" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profil %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Keine" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nie" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2081,179 +2111,179 @@ msgstr[1] "Vor %i Tagen" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mbit/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Keines" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Schwach" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "OK" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Gut" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Ausgezeichnet" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Details" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identität" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresse" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netzmaske" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Adresse entfernen" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Hinzufügen" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS-Server entfernen" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrik" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Route entfernen" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatisch (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuell" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Nur Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Präfix" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatisch" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatisch, nur DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Zurücksetzen" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Keine" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-Bit-Schlüssel (Hex oder ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-Bit-Passphrase" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamisches WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA und WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA und WPA2 Enterprise" @@ -2268,30 +2298,30 @@ msgstr "Verbindungsgeschwindigkeit" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-Adresse" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-Adresse" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardware-Adresse" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2301,7 +2331,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2434,45 +2464,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Öffnen des Verbindungseditors schlug fehl" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Neues Profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Gebündelt" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Bündelung" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Brücke" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "VPN-Plugins konnten nicht geladen werden" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Aus Datei importieren …" -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Netzwerk-Verbindung hinzufügen" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "VPN hinzufügen" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2480,7 +2490,7 @@ msgstr "_Zurücksetzen" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1484 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Vergessen" @@ -2505,11 +2515,11 @@ msgid "S_ecurity" msgstr "_Sicherheit" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "VPN-Verbindung kann nicht importiert werden" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2522,37 +2532,37 @@ "\n" "Fehler: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Wählen Sie die Datei zum Importieren" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "Ö_ffnen" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Eine Datei namens »%s« ist bereits vorhanden." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "E_rsetzen" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Wollen Sie %s mit der VPN-Verbindung ersetzen, die Sie gerade speichern?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "VPN-Verbindung kann nicht exportiert werden" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2563,7 +2573,7 @@ "\n" "Fehler: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN-Verbindung exportieren" @@ -2590,62 +2600,46 @@ msgid "Make available to _other users" msgstr "_Anderen Benutzern zur Verfügung stellen" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Netzwerk" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Legt fest, wie mit dem Internet verbunden wird" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Netzwerk;Drahtlos;LAN;WLAN;Wifi;IP;LAN;Proxy;WAN;Breitband;DSL;Modem;" "Bluetooth;VPN;Brücke;VLAN;Bündelung;DNS;" -# http://de.wikipedia.org/wiki/Link_Aggregation -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Gebündelte Schnittstellen" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(keine)" - -# http://de.wikipedia.org/wiki/Bridge_%28Netzwerk%29#Bridges_und_Virtualisierung -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Überbrückte Schnittstellen" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nie" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "heute" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "gestern" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-Adresse" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Zuletzt verwendet" @@ -2655,30 +2649,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Kabelgebunden" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1642 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Optionen …" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Neue Verbindung hinzufügen" -# http://de.wikipedia.org/wiki/B%C3%BCndelung -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Gebündelte Schnittstellen" - -#: ../panels/network/net-device-wifi.c:1190 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2687,12 +2676,12 @@ "können Sie zur Freigabe Ihrer Internetverbindung einen drahtlosen Hotspot " "einrichten." -#: ../panels/network/net-device-wifi.c:1194 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Einschalten des Funknetz-Hotspot führt zur Trennung von %s." -#: ../panels/network/net-device-wifi.c:1198 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2700,23 +2689,23 @@ "Es ist nicht möglich, auf das Internet über Ihr Funknetz zuzugreifen, " "während der HotSpot aktiv ist." -#: ../panels/network/net-device-wifi.c:1281 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Den HotSpot anhalten und verbundene Benutzer trennen?" -#: ../panels/network/net-device-wifi.c:1284 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "Hot _Spot anhalten" -#: ../panels/network/net-device-wifi.c:1348 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Die Systemeinstellungen verbieten die Nutzung als Hotspot" -#: ../panels/network/net-device-wifi.c:1351 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Das Drahtlos-Gerät unterstützt keinen Hotspot-Modus" -#: ../panels/network/net-device-wifi.c:1480 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2724,11 +2713,11 @@ "Netzwerkdetails für die gewählten Netzwerke, einschließlich Passwort und " "jegliche benutzerdefinierte Konfiguration werden verloren gehen." -#: ../panels/network/net-device-wifi.c:1795 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Chronik" -#: ../panels/network/net-device-wifi.c:1799 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2736,7 +2725,7 @@ msgstr "S_chließen" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1807 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Vergessen" @@ -2773,6 +2762,10 @@ msgid "Provider" msgstr "Dienstanbieter" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Netzwerk" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2879,15 +2872,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Passwort" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Keine" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Pass_wort zeigen" @@ -2982,7 +2971,6 @@ msgstr "Mit verborgenem Funknetzwerk _verbinden …" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Chronik" @@ -3004,361 +2992,337 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Passwort" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktur" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Status unbekannt" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Nicht verwaltet" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nicht verfügbar" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Verbindung wird hergestellt" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Legitimierung erforderlich" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Verbunden" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Verbindung wird getrennt" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Status unbekannt (fehlt)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Nicht verbunden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfiguration fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP-Konfiguration fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP-Konfiguration abgelaufen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Geheimdaten waren erforderlich, wurden aber nicht angegeben" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x-Supplicant getrennt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Einrichten des 802.1x-Supplicant fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x-Supplicant fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x-Supplicant brauchte zu lange für die Legitimierung" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP-Dienst konnte nicht gestartet werden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP-Dienst getrennt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP-Client konnte nicht gestartet werden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-Client-Fehler" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-Client fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "" "Dienst für gemeinsam verwendete Verbindung konnte nicht gestartet werden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Dienst für gemeinsam verwendete Verbindung fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Start des AutoIP-Diensts fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Fehler des AutoIP-Diensts" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP-Dienst fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Die Leitung ist belegt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Kein Freizeichen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Es konnte kein Trägersignal aufgebaut werden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Der Einwahlvorgang benötigte zu viel Zeit" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Der Einwahlversuch ist fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modeminitialisierung fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Angegebener APN konnte nicht ausgewählt werden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Es wird nicht nach Netzwerken gesucht" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Netzwerkanmeldung abgelehnt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Netzwerkanmeldung benötigte zu viel Zeit" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Anmeldung an dem angeforderten Netzwerk fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN-Überprüfung fehlgeschlagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Notwendige Firmware des Geräts fehlt möglicherweise" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Unzuverlässige Verbindung" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Es wurde von einer bestehenden Verbindung ausgegangen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem nicht gefunden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth-Verbindung schlug fehl" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM-Karte ist nicht eingesetzt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM-Pin ist erforderlich" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM-Puk ist erforderlich" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Falsche SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Das InfiniBand-Gerät unterstützt keinen »Connected«-Modus" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Eine Abhängigkeit der Verbindung ist gescheitert" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware fehlt" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabel nicht angeschlossen" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Keine Zertifizierungseinheit gewählt" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "Nicht definierter Fehler in 802.1x-Sicherheit (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "keine Datei ausgewählt" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Verzicht auf ein Certificate Authority (CA)-Zertifikat kann zu Verbindungen " -"mit unsicheren und bösartigen WLAN-Netzen führen. Möchten Sie ein CA-" -"Zertifikat wählen?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorieren" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Wählen Sie ein CA-Zertifikat" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM oder PKCS#12-Privatschlüssel (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "Nicht spezifizierter Fehler beim Überprüfen der eap-method-Datei" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Geheimer DER, PEM oder PKCS#12-Schlüssel (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER oder PEM-Zertifikate (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "PAC-Datei für EAP-FAST fehlt" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Wählen Sie eine PAC-Datei" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC-Dateien (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC-_Datei" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Innere Legitimierung" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC-_Bereitstellung" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3367,41 +3331,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonym" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Legitimiert" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Beide" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC-_Datei" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Innere Legitimierung" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Automatische PAC-_Bereitstellung erlauben" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "Benutzername für EAP-LEAP fehlt" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "Passwort für EAP-LEAP fehlt" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Benutzername" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Pass_wort zeigen" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "Ungültiges CA-Zertifikat für EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "Ungültiges CA-Zertifikat für EAP-PEAP: kein Zertifikat angegeben" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Wählen Sie ein Zertifikat einer Zertifizierungsstelle" @@ -3419,19 +3415,56 @@ msgid "C_A certificate" msgstr "_CA-Zertifikat" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "CA-Zertifikat ist nicht e_rforderlich" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP-_Version" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Nach diesem Passwort jedes Mal _fragen" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "EAP-Benutzername fehlt" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "EAP-Passwort fehlt" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "EAP-TLS-Identität fehlt" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "Ungültiges CA-Zertifikat für EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "Ungültiges CA-Zertifikat für EAP-TLS: kein Zertifikat angegeben" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "Passwort für EAP-TLS fehlt" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "Ungültiger geheimer Schlüssel für EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "Ungültiges Benutzerzertifikat für EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" -msgstr "Unverschlüsselte private Schlüssel sind unsicher" +msgstr "Unverschlüsselte geheime Schlüssel sind unsicher" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3441,17 +3474,17 @@ msgstr "" "Der gewählte Schlüssel scheint nicht durch ein Passwort geschützt zu sein. " "Dies gefährdet Ihre Sicherheitsinformationen. Bitte wählen Sie einen durch " -"ein Passwort geschützten privaten Schlüssel.\n" +"ein Passwort geschützten geheimen Schlüssel.\n" "\n" "(Sie können Ihren Schlüssel mit openssl mit einem Passwort schützen)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Wählen Sie Ihr persönliches Zertifikat" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" -msgstr "Wählen Sie Ihren privaten Schlüssel" +msgstr "Wählen Sie Ihren geheimen Schlüssel" #: ../panels/network/wireless-security/eap-method-tls.ui.h:1 msgid "I_dentity" @@ -3461,51 +3494,56 @@ msgid "_User certificate" msgstr "_Benutzerzertifikat" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" -msgstr "Privater _Schlüssel" +msgstr "Geheimer _Schlüssel" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" -msgstr "Passwort für _privaten Schlüssel" +msgstr "_Passwort für geheimen Schlüssel" + +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "Ungültiges CA-Zertifikat für EAP-TTLS: %s" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "Ungültiges CA-Zertifikat für EAP-TTLS: kein Zertifikat angegeben" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Nicht noch einmal _warnen" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nein" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ja" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Unbekannter Fehler beim Überprüfen der 802.1x-Sicherheit" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Getunneltes TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Geschütztes EAP (PEAP)" @@ -3515,6 +3553,50 @@ msgid "Au_thentication" msgstr "_Legitimierung" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "Leap-Benutzername fehlt" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "Leap-Passwort fehlt" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "WEP-Schlüssel fehlt" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"Ungültiger WEP-Schlüssel: ein Schlüssel mit der Länge %zu darf nur " +"Hexadezimalzahlen enthalten" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"Ungültiger WEP-Schlüssel: ein Schlüssel mit der Länge %zu darf nur ASCII-" +"Zeichen enthalten" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"Ungültiger WEP-Schlüssel: falsche Schlüssellänge %zu. Ein Schlüssel muss " +"entweder dem Schema 5/13 (ASCII) oder 10/26 (hexadezimal) entsprechen" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "Ungültiger WEP-Schlüssel: Kennwort darf nicht leer sein" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "Ungültiger WEP-Schlüssel: Kennwort muss kürzer als 64 Zeichen sein" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Vorgabe)" @@ -3551,14 +3633,28 @@ msgid "WEP inde_x" msgstr "WEP-Inde_x" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"Schlüssellänge %zu für WPA-PSK ist ungültig, muss [8,63] Bytes oder 64 " +"hexadezimale Stellen haben" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"WPA-PSK-Schlüssel kann nicht als 64 Byte hexadezimal ausgewertet werden" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Typ" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3603,16 +3699,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Nachrichten im _Sperrbildschirm zeigen" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Benach­rich­ti­gungen" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Legt fest, wie Nachrichten angezeigt werden und was diese anzeigen" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Benachrichtigungen;Banner;Nachricht;Popup;" @@ -3630,81 +3727,70 @@ msgid "Applications" msgstr "Anwendungen" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Weitere" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Konto hinzufügen" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "E-Mail" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalender" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakte" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Unterhaltung" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ressourcen" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Fehler beim Anmelden am Konto" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Die Zugangsinformationen sind abgelaufen." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Melden Sie sich zum Aktivieren dieses Kontos an." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Anmelden" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Fehler beim Erstellen des Kontos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Fehler beim Entfernen des Kontos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "Entfe_rnen" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Online-Konten" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Verbinden Sie sich mit Ihren Online-Konten und entscheiden Sie, wofür diese " "genutzt werden" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3717,6 +3803,7 @@ msgstr "Die Online-Konten wurden nicht eingerichtet" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Konto entfernen" @@ -3859,7 +3946,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Akku" @@ -3908,105 +3995,106 @@ msgid "When _idle" msgstr "Wenn _inaktiv" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Energie sparen" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Bildschirmhelligkeit" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatische Helligkeit" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Tastaturbeleuchtungshelligkeit" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Bildschirm bei Inaktivität ab_dunkeln" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Bildschirm _abschalten" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_WLAN" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Schalten Sie WLAN aus, um Strom zu sparen." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobiles Breitband" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Schalten Sie Mobile Breitband-Geräte (3G, 4G, LTE etc.) aus, um Strom zu " "sparen." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Wenn im Akkubetrieb" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Wenn angeschlossen" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Bereitschaft" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Ruhezustand" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nichts" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" -msgstr "Bereitschaft und Ausschalten" +msgstr "Taste für Bereitschaft und Ausschalten" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatisch in Bereitschaft gehen" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatisch in Bereitschaft gehen" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Wenn die Ausschalttaste gedrückt wird" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Geräte" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Leistung" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Energie" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Den Status Ihres Akkus anzeigen und die Energiespareinstellungen ändern" # Ich glaube hier können (beliebig viele) Schlagworte frei gewählt werden #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4085,11 +4173,6 @@ msgid "Delay" msgstr "Verzögerung" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Abbrechen" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Legitimieren" @@ -4099,138 +4182,138 @@ msgstr "Legitimierung erforderlich" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Wenig Toner" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Toner leer" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Wenig Entwickler" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Entwickler leer" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Einer der Farbspeicher fast leer" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Eine Farbpatrone leer" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Abdeckung offen" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Klappe offen" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Wenig Papier" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Papier leer" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Abgemeldet" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Angehalten" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Der Abfallbehälter ist fast voll" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Der Abfallbehälter ist voll" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Der optische Bildübertrager ist beinahe verbraucht" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Der optische Bildübertrager funktioniert nicht mehr" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Wird konfiguriert" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Bereit" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Es werden keine Aufträge angenommen" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Verarbeitung läuft" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Tonerfüllstand" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Tintenfüllstand" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Materialfüllstand" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Wird installiert" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4238,15 +4321,15 @@ msgstr[1] "%u aktiv" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Neuer Drucker konnte nicht hinzugefügt werden." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Wählen Sie die PPD-Datei" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4254,50 +4337,47 @@ "PostScript-Druckerbeschreibungsdateien (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Kein passender Treiber gefunden" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Suchen nach bevorzugten Treibern …" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Aus der Datenbank wählen …" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Wählen Sie eine PPD-Datei …" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Testseite" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Keine Drucker" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Die Benutzeroberfläche konnte nicht geladen werden: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Drucker" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Drucker hinzufügen, Druckeraufgaben anzeigen und entscheiden, wie Sie " "drucken möchten" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Drucker;Warteschlange;Drucken;Papier;Tinte;Toner;Tintenpatrone;" @@ -4461,6 +4541,11 @@ msgid "Parallel Port" msgstr "Parallele Schnittstelle" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4673,13 +4758,17 @@ msgid "_Options" msgstr "_Optionen" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Keine Drucker" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Einen Drucker hinzufügen" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4687,70 +4776,70 @@ "Es scheint, dass der Systemdruckdienst\n" "nicht verfügbar ist." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Bildschirmsperre" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "In Verwendung" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "An" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Aus" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Ortsdienste" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Verwendung und Chronik" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Alle Objekte aus dem Papierkorb löschen?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Alle Objekte im Papierkorb werden dauerhaft gelöscht." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Papierkorb _leeren" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Alle temporären Dateien löschen?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Alle temporären Dateien werden dauerhaft gelöscht." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Temporäre Dateien _löschen" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Papierkorb und temporäre Dateien leeren" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Softwarenutzung" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Berichten des Fehlers" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4760,22 +4849,23 @@ "Entwicklern %s zu verbessern. Reports sind frei von personenbezogenen Daten " "und werden anonym versandt." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Datenschutzrichtlinie" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privat­sphäre" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Privatsphäre" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Schützen Sie Ihre persönlichen Informationen und kontrollieren Sie, was " "andere sehen können" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4855,7 +4945,9 @@ #: ../panels/privacy/privacy.ui.h:25 msgid "The Screen Lock protects your privacy when you are away." -msgstr "Die Bildschirmsperre schützt Ihre Privatsphäre solange Sie weg sind." +msgstr "" +"Die Bildschirmsperre schützt Ihre Privatsphäre, solange Sie nicht anwesend " +"sind." #: ../panels/privacy/privacy.ui.h:26 msgid "Automatic Screen _Lock" @@ -4948,21 +5040,21 @@ msgid "Other" msgstr "Weitere" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Abmelden, damit die Änderungen wirksam werden" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Jetzt neustarten" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Keine Eingabequelle gefunden" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Anmeldebild_schirm" @@ -4994,18 +5086,19 @@ msgid "Paper" msgstr "Papier" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Region und Sprache" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Wählen Sie Ihre Sprache, Formate, Tastaturbelegungen und die Eingabequellen" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Sprache;Belegung;Tastatur;Eingabe;" @@ -5031,7 +5124,7 @@ #: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251 msgid "Keyboard Shortcuts" -msgstr "Tastaturkürzel" +msgstr "Tastenkombinationen" #: ../panels/region/input-options.ui.h:5 msgid "Switch to previous source" @@ -5051,7 +5144,8 @@ #: ../panels/region/input-options.ui.h:9 msgid "You can change these shortcuts in the keyboard settings" -msgstr "Sie können diese Kürzel in den Tastatureinstellungen ändern" +msgstr "" +"Sie können diese Tastenkombinationen in den Tastatureinstellungen ändern" #: ../panels/region/input-options.ui.h:10 msgid "Alternative switch to next source" @@ -5062,7 +5156,7 @@ msgstr "Links+Rechte Alt-Taste" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Sprache" @@ -5112,26 +5206,11 @@ "Anmeldeeinstellungen werden für alle Benutzer verwendet, wenn sich diese am " "System anmelden." -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Orte" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Lesezeichen" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Weitere" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Ort wählen" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5139,11 +5218,12 @@ msgid "No applications found" msgstr "Keine Anwendungen gefunden" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Suchen" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5151,7 +5231,7 @@ "Aktivitätenübersicht anzeigen" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Suchen;Finden;Index;Verbergen;Privatsphäre;Ergebnisse;" @@ -5159,6 +5239,18 @@ msgid "Search Locations" msgstr "Orte durchsuchen" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Orte" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Lesezeichen" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Weitere" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Nach oben verschieben" @@ -5171,6 +5263,11 @@ msgid "Preferences" msgstr "Einstellungen" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Es sind keine Netzwerke zur Freigabe gewählt" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5208,18 +5305,19 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Entfernten Benutzern eine Verbindung mit folgendem Secure-Shell-Befehl " -"erlauben:\n" +"Wenn entfernte Anmeldung aktiviert ist, entfernten Benutzern eine Verbindung " +"mit folgendem Secure-Shell-Befehl erlauben:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" "Entfernten Benutzern Ansicht und Steuerung Ihres Bildschirms mit folgender " "Verbindung erlauben: vnc://%s" @@ -5229,16 +5327,20 @@ msgstr "Kopieren" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Freigabe" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Freigabe" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Legen Sie fest, was Sie für Andere freigeben möchten" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5246,6 +5348,10 @@ "Freigabe;ssh;Rechner;Name;Entfernt;Arbeitsumgebung;Umgebung;Medien;Audio;" "Video;Bilder;Fotos;Filme;Server;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Netzwerke" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Entfernte Anmeldung ein- oder ausschalten" @@ -5256,25 +5362,13 @@ "Legitimierung ist erforderlich, um die entfernte Anmeldung zu aktivieren " "oder zu deaktivieren" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Es sind keine Netzwerke zur Freigabe gewählt" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Netzwerke" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Re_chnername" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Persönliche Dateifreigabe" +msgid "_File Sharing" +msgstr "_Dateifreigabe" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5294,8 +5388,8 @@ "Einige Dienste sind deaktiviert, weil kein Netzwerk-Zugriff möglich ist." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Persönliche Dateifreigabe" +msgid "File Sharing" +msgstr "Dateifreigabe" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5310,8 +5404,8 @@ msgstr "Bildschirmfreigabe" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "Entfernte Steuerung zul_assen" +msgid "_Allow connections to control the screen" +msgstr "Verbindungen zur Steuerung des Bildschirms erl_auben" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5338,11 +5432,8 @@ msgstr "Medienfreigabe" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Medienfreigabe ermöglicht das Freigeben von Musik, Fotos und Videos über das " -"Netzwerk." +msgid "Share music, photos and videos over the network." +msgstr "Musik, Fotos und Videos über das Netzwerk freigeben." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5477,11 +5568,6 @@ msgid "Peak detect" msgstr "Spitzenpegelerkennung" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Name" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Gerät" @@ -5581,12 +5667,18 @@ msgid "Custom" msgstr "Benutzerdefiniert" +# Mit weichen Trennzeichen, die die Stelle einen Textumbruch vorschlagen +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Barriere­frei­heit" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Sehen, Hören, Tippen, Zeigen und Klicken erleichtern" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5687,7 +5779,7 @@ msgstr "Lautstärkeregelung" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "" "Beim Einschalten des Ziffernblocks oder der Feststelltaste einen Signalton " "ausgeben." @@ -6075,96 +6167,70 @@ msgstr "Farbeffekte" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Benutzerkonto hinzufügen" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Vollständiger Name" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standard" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Systemverwalter" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Vollständiger Name" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Konten_typ" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Bei der nächsten Anme_ldung Passwort wählen" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Jetzt ein Passwort festlegen" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "Über_prüfen" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Bestätigen" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Unternehmens-Anmeldung erlaubt es, ein zentral verwaltetes Benutzerkonto auf " -"diesem Gerät zu verwenden." +"diesem Gerät zu verwenden. Außerdem können Sie dieses Konto nutzen, um über " +"das Internet auf Unternehmensressourcen zuzugreifen." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domäne" +#: ../panels/user-accounts/data/account-dialog.ui.h:16 +msgid "You are Offline" +msgstr "Sie sind offline" + # I believe that the text field where this string is inserted needs to render the line breaks, not hard-coded "\n # characters -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "Gehen Sie online, um Unternehmens-Benutzerkonten hinzuzufügen" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Gehen Sie online, um Unternehmens-Benutzerkonten hinzuzufügen." -#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/account-dialog.ui.h:18 msgid "_Enterprise Login" msgstr "Anmeldung in _Unternehmensumgebung" -#: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Benutzerkonto hinzufügen" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Anmelden" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Anmeldung Domänenverwalter" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Um eine Unternehmens-Anmeldung nutzen zu können, muss dieser Rechner\n" -"in der Domäne registriert sein. Bitten Sie Ihren Netzwerkverwalter,\n" -"das Domänen-Passwort hier einzugeben." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Name des Systemverwalters" - -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Systemverwalter-Passwort" - #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" msgstr "Linker Daumen" @@ -6198,7 +6264,7 @@ msgstr "Rechter kleiner Finger" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Anmeldung mit Fingerabdruck freischalten" @@ -6237,9 +6303,32 @@ "Anmeldung;Name;Benutzerkonto;Fingerabdruck;Avatar;Benutzerbild;Logo;Gesicht;" "Passwort;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Anmeldechronik" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Anmelden" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Anmeldung Domänenverwalter" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Um eine Unternehmens-Anmeldung nutzen zu können, muss dieser Rechner\n" +"in der Domäne registriert sein. Bitten Sie Ihren Netzwerkverwalter,\n" +"das Domänen-Passwort hier einzugeben." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Name des Systemverwalters" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Systemverwalter-Passwort" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6262,38 +6351,30 @@ msgstr "A_ktuelles Passwort" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Bei der nächsten Anmeldung Passwort wählen" +msgid "Allow user to change their password on next login" +msgstr "Benutzern erlauben, bei der nächsten Anmeldung ihr Passwort zu ändern" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Jetzt ein Passwort festlegen" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Benutzerkonto hinzufügen" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Benutzerkonto löschen" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "Benutzerkonto _hinzufügen …" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Anmeldeoptionen" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatische Anmeldung" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Anmeldung mit _Fingerabdruck" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Benutzersymbol" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Letzte Anmeldung" @@ -6396,7 +6477,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" "Mischen Sie Großbuchstaben und Kleinbuchstaben und verwenden Sie eine Ziffer " "oder zwei." @@ -6491,34 +6572,34 @@ msgstr "Unbekannter Fehler" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Sollte der Internetadresse Ihres Benutzerkontoanbieters entsprechen." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Anlegen des Kontos schlug fehl" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Passwörter stimmen nicht überein." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Anlegen des Kontos schlug fehl" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "" "Es gibt keine unterstützte Möglichkeit für eine Legitimierung mit dieser " "Domäne" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Beitreten zur Domäne schlug fehl" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6526,7 +6607,7 @@ "Ungültiger Benutzer.\n" "Bitte versuchen Sie es erneut." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6534,43 +6615,53 @@ "Ungültiges Passwort.\n" "Bitte versuchen Sie es erneut." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Anmelden an der Domäne schlug fehl" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "" "Domäne konnte nicht gefunden werden. Haben Sie sich eventuell vertippt?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standard" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Systemverwalter" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Sie sind nicht berechtigt, auf das Gerät zuzugreifen. Kontaktieren Sie Ihren " "Systemadministrator." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "Das Gerät wird bereits verwendet" -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Ein interner Fehler ist aufgetreten." -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Aktiviert" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Sollen die registrierten Fingerabdrücke gelöscht werden?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "Fingerabdrücke _löschen" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6578,15 +6669,15 @@ "Wollen Sie Ihre registrierten Fingerabdrücke löschen und so eine Anmeldung " "per Fingerabdruck verhindern?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Erledigt." #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Auf Gerät »%s« konnte nicht zugegriffen werden" @@ -6594,16 +6685,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Fingerabtastung konnte auf dem Gerät »%s« nicht gestartet werden" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Es konnte auf kein Lesegerät für Fingerabdrücke zugegriffen werden" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Bitte kontaktieren Sie Ihren Systemadministrator für Hilfe." @@ -6612,7 +6703,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6621,11 +6712,11 @@ "Zur Freischaltung der Anmeldung mit Fingerabdruck müssen Sie einen " "Fingerabdruck mit dem Gerät »%s« hinterlegen." -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Finger wird ausgewählt" -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Fingerabdrücke werden registriert" @@ -6688,6 +6779,13 @@ msgid "Session Started" msgstr "Sitzungsbeginn" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Kontoaktivität" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Bitte wählen Sie ein anderes Passwort." @@ -6749,7 +6847,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Es konnte keine Verbindung mit %s-Domäne hergestellt werden: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Weitere Konten" @@ -6831,17 +6929,17 @@ msgid "Logged in" msgstr "Angemeldet" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Kontendienst konnte nicht kontaktiert werden" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Bitte stellen Sie sicher, dass der Kontendienst korrekt installiert und " "aktiviert ist." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6849,12 +6947,12 @@ "Um Änderungen vorzunehmen,\n" "klicken Sie zuerst auf das Symbol *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Ein Benutzerkonto erstellen" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6862,12 +6960,12 @@ "Um ein Benutzerkonto anzulegen,\n" "klicken Sie zuerst auf das Symbol *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Das gewählte Benutzerkonto löschen" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6875,33 +6973,34 @@ "Um das gewählte Benutzerkonto zu löschen,\n" "klicken Sie zuerst auf das Symbol *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mein Konto" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Ein Benutzer namens »%s« ist bereits vorhanden." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Leider ist dieser Benutzername nicht verfügbar. Wählen Sie bitte einen " +"anderen." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Der Benutzername ist zu lang." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Der Benutzername darf nicht mit einem »-« beginnen." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Der Benutzername darf aus Klein- und Großbuchstaben des englischen " -"Alphabets, Ziffern sowie den Zeichen ».«, »-« und »_« bestehen." +"Der Benutzername darf aus Klein- und Großbuchstaben von A bis Z, Ziffern " +"sowie den Zeichen ».«, »-« und »_« bestehen." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Dieser Eintrag wird für Ihren Benutzerordner verwendet und kann nicht " @@ -6921,9 +7020,9 @@ "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." msgstr "" -"Um ein Tastenkürzel zu bearbeiten, wählen Sie die »Tastenkombination senden«-" -"Aktion und drücken Sie die neue Tastenkombination, oder drücken Sie die " -"Rücktaste, um sie zu löschen." +"Um eine Tastenkombination zu bearbeiten, wählen Sie die »Tastenkombination " +"senden«-Aktion und drücken Sie die neue Tastenkombination, oder drücken Sie " +"die Rücktaste, um sie zu löschen." #: ../panels/wacom/calibrator/calibrator-gui.c:83 msgid "" @@ -6995,19 +7094,19 @@ msgid "Button" msgstr "Knopf" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom-Tabletts" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wacom-Tablets" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Knopfzuordnung einstellen und die Empfindlichkeit des Stiftes für " "Grafiktabletts einstellen" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablett;Wacom;Stylus;Radiergummi;Maus;" @@ -7039,6 +7138,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-Einstellungen" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom-Tabletts" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Bildschirm zuordnen …" @@ -7154,7 +7257,7 @@ #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263 msgid "New shortcut…" -msgstr "Neues Tastenkürzel …" +msgstr "Neue Tastenkombination …" #: ../panels/wacom/wacom-stylus-page.ui.h:1 msgid "No Action" @@ -7227,6 +7330,11 @@ msgid "Tip Pressure Feel" msgstr "Druckschwelle der Spitze" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Alle Einstellungen" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME Kontrollzentrum" @@ -7283,22 +7391,18 @@ msgid "Quit" msgstr "Beenden" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Alle Einstellungen" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Privat­sphäre" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "System" @@ -7337,6 +7441,198 @@ msgid "Cancel search" msgstr "Suche abbrechen" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Tastenkombination für %s. Geben Sie zum Anpassen eine neue " +#~ "Tastenkombination ein." + +# extrem gekürzt, wirkt sich auf Fensterbreite aus +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Um eine Tastenkombination zu bearbeiten, klicken Sie auf die Zeile und " +#~ "drücken Sie die neue Tastenkombination, oder drücken Sie die Rücktaste, " +#~ "um sie zu löschen." + +#~ msgid "Error logging into the account" +#~ msgstr "Fehler beim Anmelden am Konto" + +#~ msgid "Credentials have expired." +#~ msgstr "Die Zugangsinformationen sind abgelaufen." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Melden Sie sich zum Aktivieren dieses Kontos an." + +#~ msgid "_Sign In" +#~ msgstr "_Anmelden" + +#~ msgid "_Name:" +#~ msgstr "_Name:" + +#~ msgid "Add Shortcut" +#~ msgstr "Tastenkürzel hinzufügen" + +#~ msgid "Remove Shortcut" +#~ msgstr "Tastenkürzel entfernen" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Die Tastenkombination »%s« kann nicht verwendet werden, da es dann " +#~ "unmöglich wäre, mit dieser Taste zu schreiben.\n" +#~ "Bitte versuchen Sie eine Kombination mit einer Taste wie Strg, Alt oder " +#~ "der Umschalttaste." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Die Tastenkombination »%s« wird bereits für\n" +#~ "»%s«\n" +#~ "verwendet." + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Wenn Sie diese Tastenkombination »%s« zuweisen, wird die " +#~ "Tastenkombination für »%s« deaktiviert." + +#~ msgid "_Reassign" +#~ msgstr "_Zuweisen" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Die Tastenkombination »%s« ist der Tastenkombination »%s« zugewiesen. " +#~ "Soll diese automatisch auf »%s« festgelegt werden?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "»%s« ist derzeit »%s« zugewiesen. Diese Tastenkombination wird " +#~ "deaktiviert, wenn Sie fortsetzen." + +#~ msgid "_Assign" +#~ msgstr "_Zuweisen" + +#~ msgid "Add Network Connection" +#~ msgstr "Netzwerk-Verbindung hinzufügen" + +#~ msgid "Login History" +#~ msgstr "Anmeldechronik" + +#~ msgid "Add User Account" +#~ msgstr "Benutzerkonto hinzufügen" + +#~ msgid "Remove User Account" +#~ msgstr "Benutzerkonto löschen" + +#~ msgid "Bond" +#~ msgstr "Gebündelt" + +#~ msgid "Team" +#~ msgstr "Bündelung" + +#~ msgid "Bridge" +#~ msgstr "Brücke" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "VPN-Plugins konnten nicht geladen werden" + +# http://de.wikipedia.org/wiki/Link_Aggregation +#~ msgid "Bond slaves" +#~ msgstr "Gebündelte Schnittstellen" + +#~ msgid "(none)" +#~ msgstr "(keine)" + +# http://de.wikipedia.org/wiki/Bridge_%28Netzwerk%29#Bridges_und_Virtualisierung +#~ msgid "Bridge slaves" +#~ msgstr "Überbrückte Schnittstellen" + +# http://de.wikipedia.org/wiki/B%C3%BCndelung +#~ msgid "Team slaves" +#~ msgstr "Gebündelte Schnittstellen" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Das InfiniBand-Gerät unterstützt keinen »Connected«-Modus" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Keine Zertifizierungseinheit gewählt" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Verzicht auf ein Certificate Authority (CA)-Zertifikat kann zu " +#~ "Verbindungen mit unsicheren und bösartigen WLAN-Netzen führen. Möchten " +#~ "Sie ein CA-Zertifikat wählen?" + +#~ msgid "Ignore" +#~ msgstr "Ignorieren" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Wählen Sie ein CA-Zertifikat" + +#~ msgid "As_k for this password every time" +#~ msgstr "Nach diesem Passwort jedes Mal _fragen" + +#~ msgid "Don't _warn me again" +#~ msgstr "Nicht noch einmal _warnen" + +#~ msgid "No" +#~ msgstr "Nein" + +#~ msgid "Yes" +#~ msgstr "Ja" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Weitere" + +#~ msgid "Personal File Sharing" +#~ msgstr "Persönliche Dateifreigabe" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Entfernte Steuerung zul_assen" + +#~ msgid "_Verify" +#~ msgstr "Über_prüfen" + +#~ msgid "Login Options" +#~ msgstr "Anmeldeoptionen" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Ein Benutzer namens »%s« ist bereits vorhanden." + +#~ msgid "Color" +#~ msgstr "Farbe" + +#~ msgid "Power" +#~ msgstr "Leistung" + +#~ msgid "Privacy" +#~ msgstr "Privat­sphäre" + #~ msgid "Used to determine your geographical location" #~ msgstr "Wird zum Bestimmen Ihres geografischen Orts verwendet" @@ -7415,9 +7711,6 @@ #~ msgid "S_peed:" #~ msgstr "Ge_schwindigkeit:" -#~ msgid "Shortcuts" -#~ msgstr "Tastaturkürzel" - #~ msgid "Test Your Settings" #~ msgstr "Testen Sie Ihre Einstellungen" @@ -7456,9 +7749,6 @@ #~ msgid "Fast" #~ msgstr "Schnell" -#~ msgid "Two _finger scroll" -#~ msgstr "Bildlauf mit zwei _Fingern" - #~ msgid "No printers available" #~ msgstr "Keine Drucker verfügbar" diff -Nru gnome-control-center-3.20.2/po/dz.po gnome-control-center-3.22.1/po/dz.po --- gnome-control-center-3.20.2/po/dz.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/dz.po 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ "PO-Revision-Date: 2008-09-11 11:47+0530\n" "Last-Translator: Dawa pemo \n" "Language-Team: DZONGKHA \n" +"Language: dz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/el.po gnome-control-center-3.22.1/po/el.po --- gnome-control-center-3.20.2/po/el.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/el.po 2016-09-27 12:37:36.000000000 +0000 @@ -41,8 +41,8 @@ "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-17 15:55+0200\n" +"POT-Creation-Date: 2016-09-11 07:51+0000\n" +"PO-Revision-Date: 2016-09-12 11:34+0300\n" "Last-Translator: Tom Tryfonidis \n" "Language-Team: Greek, Modern (1453-) \n" "Language: el\n" @@ -50,7 +50,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 1.8.8\n" "X-Poedit-SourceCharset: utf-8\n" "X-Project-Style: gnome\n" @@ -124,7 +124,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Προσωπικός φάκελος" @@ -139,25 +139,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -188,16 +187,17 @@ msgid "Current background" msgstr "Τρέχον παρασκήνιο" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Παρασκήνιο" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Αλλάξτε την εικόνα παρασκηνίου με μια ταπετσαρία ή φωτογραφία" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Ταπετσαρία;Οθόνη;Επιφάνεια εργασίας;Wallpaper;Screen;Desktop;" @@ -242,19 +242,18 @@ "Απενεργοποιήστε τον διακόπτη λειτουργίας αεροπλάνου για να ενεργοποιήσετε το " "Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "" "Ενεργοποιήστε/Απενεργοποιήστε το Bluetooth και συνδεθείτε με τις συσκευές σας" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "κοινή χρήση;κοινόχρηστο;bluetooth;μπλουτούθ;obex;" @@ -428,7 +427,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Όλα τα αρχεία" @@ -471,7 +470,7 @@ msgstr "Αποθήκευση προφίλ" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Αποθήκευση" @@ -734,7 +733,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Σύνοψη" @@ -746,11 +745,11 @@ msgid "_Import File…" msgstr "Ε_ισαγωγή αρχείου…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "Προσ_θήκη" @@ -900,18 +899,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Χρώμα" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Βαθμονομήστε το χρώμα των συσκευών σας, όπως οθόνες, κάμερες ή εκτυπωτές" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "Χρώμα;ICC;Προφίλ;Βαθμονόμηση;Εκτυπωτής;Οθόνη;Color;Profile;Calibrate;Printer;" @@ -931,23 +931,23 @@ msgid "No languages found" msgstr "Δε βρέθηκαν γλώσσες" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Σήμερα" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Χθες" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b %Y" @@ -1067,8 +1067,9 @@ msgid "December" msgstr "Δεκέμβριος" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Ημερομηνία & ώρα" @@ -1125,12 +1126,12 @@ msgid "AM / PM" msgstr "π.μ / μ.μ" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Αλλάξτε την ημερομηνία και ώρα, καθώς και τη ζώνης ώρας" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Ρολόι;Ζώνη ώρας;Τοποθεσία;Clock;Timezone;Location;" @@ -1143,216 +1144,231 @@ msgstr "" "Πρέπει να γίνει πιστοποίηση για να αλλάξετε τις ρυθμίσεις ώρας ή ημερομηνίας." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Κλειστό κάλυμμα" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Με κατοπτρισμό" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Πρωτεύον" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Ανενεργό" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Δευτερεύον" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Διάταξη συνδυασμένων οθονών" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Εφαρμογή" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Μεταφορά οθονών για αναδιάταξή τους" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Περιστροφή αριστερόστροφα κατά 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Περιστροφή κατά 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Περιστροφή δεξιόστροφα κατά 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Μέγεθος" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Λόγος θέασης" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Ανάλυση" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Προσαρμογή για τηλεόραση" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Ρυθμός ανανέωσης" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Εμφάνιση της πάνω μπάρας και της επισκόπησης ενεργειών σε αυτήν την οθόνη" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Δευτερεύουσα οθόνη" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Σύνδεση αυτής της οθόνης με μια άλλη για τη δημιουργία ενός πρόσθετου χώρου " "εργασίας" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Παρουσίαση" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Εμφάνιση μόνο διαφανειών και μέσων" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Καθρέφτης" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Εμφάνιση της υπάρχουσας προβολής και στις δύο οθόνες" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Απενεργοποίηση" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Να μη χρησιμοποιηθεί αυτή η οθόνη" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Αδυναμία λήψης πληροφοριών οθόνης" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Διάταξη συνδυασμένων οθονών" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Οθόνες" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Επιλέξτε τον τρόπο χρήσης συνδεδεμένων οθονών και προβολέων" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Πάνελ;Προβολέας;xrandr;Οθόνη;Ανάλυση;Ανανέωση;Παρακολούθηση;Panel;Projector;" "Screen;Resolution;Refresh;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Άγνωστο" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (αναγνωριστικό δόμησης: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (αναγνωριστικό δόμησης: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Ερώτηση για την ενέργεια" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Καμία ενέργεια" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Άνοιγμα φακέλου" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Άλλα μέσα" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Επιλέξτε μια εφαρμογή για CD ήχου" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Επιλέξτε μια εφαρμογή για DVD βίντεο" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Επιλέξτε την εφαρμογή που θα εκτελείται, όταν θα συνδέεται ένας " "αναπαραγωγέας μουσικής" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "" "Επιλέξτε την εφαρμογή που θα εκτελείται, όταν θα συνδέεται μια φωτογραφική " "μηχανή" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Επιλέξτε μια εφαρμογή για τα CD λογισμικού" @@ -1361,88 +1377,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD ήχου" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Κενό Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Κενό CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Κενό DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Κενό HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Δίσκος βίντεο Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Αναγνώστης ηλεκτρονικών βιβλίων" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Δίσκος βίντεο HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD εικόνων" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Λογισμικό Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Ενότητα" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Επισκόπηση" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Προεπιλεγμένες εφαρμογές" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Αφαιρούμενα μέσα" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Έκδοση %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Λεπτομέρειες" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Δείτε πληροφορίες για το σύστημα σας" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1620,8 +1634,9 @@ msgid "Launch help browser" msgstr "Εκκίνηση περιηγητή βοήθειας" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Ρυθμίσεις" @@ -1694,7 +1709,6 @@ msgstr "Κλείδωμα οθόνης" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Γενική πρόσβαση" @@ -1730,11 +1744,21 @@ msgid "High contrast on or off" msgstr "Εναλλαγή ενεργοποίησης υψηλής αντίθεσης" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Προσαρμοσμένες συντομεύσεις" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1761,121 +1785,127 @@ msgid "Modifiers-only switch to next source" msgstr "Τροποποιητές-μετάβαση μόνο στην επόμενη πηγή" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Πληκτρολόγιο" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Επαναφορά της συντόμευσης στην προεπιλεγμένη της τιμή" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"Το %s χρησιμοποιείται ήδη για το %s. Αν το αντικαταστήσετε, θα " +"απενεργοποιηθεί το %s" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Ορισμός προσαρμοσμένης συντομεύσης" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Ορισμός συντόμευσης" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Πληκτρολογήστε μια νέα συντόμευση για αλλαγή του %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Προσθήκη προσαρμοσμένης συντόμευσης" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Πληκτρολόγιο" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Δείτε και αλλάξτε τις συντομεύσεις πληκτρολογίου και ορίστε τις προτιμήσεις " "πληκτρολόγησης" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Συντόμευση;Επανάληψη;Αναβόσβησμα;Shortcut;Repeat;Blink;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Προσαρμοσμένη συντόμευση" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "Ό_νομα:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Εν_τολή:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Προσθήκη συντόμευσης" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Αφαίρεση συντόμευσης" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Για να επεξεργασθείτε μια συντόμευση, κάντε κλικ στην αντίστοιχη σειρά και " -"κρατήστε πατημένα τα νέα πλήκτρα ή πατήστε backspace για εκκαθάριση." +msgid "No keyboard shortcut found" +msgstr "Δε βρέθηκε συντόμευση πληκτρολογίου" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Προσαρμοσμένες συντομεύσεις" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Δοκιμάστε μια διαφορετική αναζήτηση" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Άγνωστη ενέργεια>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Πατήστε Esc για ακύρωση" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Η συντόμευση \"%s\" δεν θα χρησιμοποιηθεί γιατί θα επηρεάσει την " -"πληκτρολόγηση.\n" -"Χρησιμοποιήστε την σε συνδυασμό με πλήκτρα όπως το Control, Alt ή Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Όνομα" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Η συντόμευση \"%s\" χρησιμοποιείται ήδη για:\n" -" \"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Εντολή" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Συντόμευση" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Eπεξεργασία" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Αν αναθέσετε ξανά τη συντόμευση στο \"%s\", η συντόμευση \"%s\" θα " -"απενεργοποιηθεί." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Κανένα" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Ανά_θεση ξανά" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Αφαίρεση" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Πληκτρολογήστε τη νέα συντόμευση" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Η συντόμευση \"%s\" έχει μια συνδεόμενη συντόμευση στο \"%s\". Θέλετε να την " -"ορίσετε αυτόματα στο \"%s\";" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Ακύρωση" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Η \"%s\" συνδέεται προς το παρόν με την \"%s\" και θα απενεργοποιηθεί αν " -"προχωρήσετε." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Προσθήκη" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Ανάθεση" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Αντικατάσταση" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Ορισμός" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Δοκιμή των ρυθμίσεων σας" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Ποντίκι & επιφάνεια αφής" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1883,7 +1913,7 @@ "λειτουργία δεξιόχειρου ή αριστερόχειρου" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Πινακίδα αφής;Δείκτης;Πάτημα;Πληκτρολόγηση;Κουμπί;Ιχνοσφαίρα;κύλιση;Trackpad;" @@ -1944,6 +1974,10 @@ msgstr "Χτύπημα για πάτημα" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Κύλιση με δύο δάκτυλα" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Κύλιση άκρου" @@ -1982,11 +2016,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Λειτουργία αερο_πλάνου" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Διαμεσολαβητής δικτύου" @@ -1994,19 +2028,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ωχ, κάτι πήγε στραβά. Παρακαλούμε επικοινωνήστε με τον πωλητή του λογισμικού " "σας." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Ο διαχειριστής δικτύου πρέπει να εκτελείται." @@ -2022,7 +2056,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2039,59 +2073,64 @@ msgid "page 2" msgstr "σελίδα 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Ασφάλεια" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "αυτόματο" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Προφίλ %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Εταιρική" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Καμία" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Ποτέ" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2099,179 +2138,179 @@ msgstr[1] "%i ημέρες πριν" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Καθόλου" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Ασθενές" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Μέτριο" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Καλό" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Εξαιρετικό" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Λεπτομέρειες" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Ταυτότητα" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Διεύθυνση" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Μάσκα δικτύου" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Πύλη δικτύου" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Διαγραφή διεύθυνσης" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Προσθήκη" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Διακομιστής" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Διαγραφή διακομιστή DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Μετρικό" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Διαγραφή δρομολογητή" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Αυτόματα (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Χειροκίνητο" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Μόνο τοπική σύνδεση" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Πρόθεμα" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Αυτόματο" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Αυτόματα, μόνο DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Επαναφορά" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Κανένα" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Κλειδί WEP 40/128-bit (δεκαεξαδικό ή ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Συνθηματικό WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Δυναμικό WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Προσωπικό WPA & WPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Εταιρικό WPA & WPA2" @@ -2286,30 +2325,30 @@ msgstr "Ταχύτητα σύνδεσης" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Διεύθυνση IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Διεύθυνση IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Διεύθυνση υλικού" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2319,7 +2358,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2402,13 +2441,13 @@ msgid "Firewall _Zone" msgstr "_Ζώνη τείχους προστασίας" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Προεπιλογή" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Η ζώνη ορίζει το επίπεδο εμπιστοσύνης της σύνδεσης" @@ -2450,45 +2489,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Αποτυχία ανοίγματος επεξεργαστή σύνδεσης" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Νέο προφίλ" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Δεσμός" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Ομάδα" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Γέφυρα" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Αδυναμία φόρτωσης προσθέτων VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Εισαγωγή από αρχείο…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Προσθήκη σύνδεσης δικτύου" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Προσθήκη VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2496,7 +2515,7 @@ msgstr "_Επαναφορά" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Παράλειψη" @@ -2522,11 +2541,11 @@ msgid "S_ecurity" msgstr "Ασ_φάλεια" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Αδυναμία εισαγωγής της σύνδεσης VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2539,36 +2558,36 @@ "\n" "Σφάλμα: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Επιλογή αρχείου για εισαγωγή" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "Άν_οιγμα" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Υπάρχει ήδη ένα αρχείο με όνομα \"%s\"." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Αντικατάσταση" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Θέλετε να αντικαταστήσετε το %s με την σύνδεση VPN που αποθηκεύετε;" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Αδύνατη η εξαγωγή της σύνδεσης VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2579,7 +2598,7 @@ "\n" "Σφάλμα: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Εξαγωγή σύνδεσης VPN" @@ -2606,61 +2625,46 @@ msgid "Make available to _other users" msgstr "Να είναι διαθέσιμο σε ά_λλους χρήστες" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Δίκτυο" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Ελέξτε τον τρόπο σύνδεσης με το διαδίκτυο" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Δίκτυο;Ασύρματο;Wi-Fi;Wifi;IP;LAN;Διαμεσολαβητής;WAN;Ευρυζωνικό;Μόντεμ;" -"Bluetooth;vpn;vlan;γέφυρα;δεσμός;DNS;Network;Wireless;Broadband;Modem;bridge;" -"bond;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Υποτελείς δεσμοί" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(κανένας)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Υποτελείς γέφυρες" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" +"DNS;δίκτυο;ασύρματο;διαμεσολαβητής;ευρυζωνικό;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ποτέ" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "σήμερα" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "χθες" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Διεύθυνση IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Τελευταία χρησιμοποιημένο" @@ -2670,34 +2674,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Ενσύρματη" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Επιλογές…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Προφίλ %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Προσθήκη νέας σύνδεσης" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Υποτελείς ομάδας" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2705,14 +2700,14 @@ "Αν έχετε άλλη σύνδεση στο διαδίκτυο εκτός της ασύρματης, μπορείτε να ορίσετε " "ένα ασύρματο σημείο πρόσβασης για να διαμοιράσετε τη σύνδεση με άλλους." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Η ενεργοποίηση του ασύρματου σημείου πρόσβασης θα σας αποσυνδέσει από το " "%s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2720,23 +2715,23 @@ "Δεν είναι δυνατή η πρόσβαση στο διαδίκτυο μέσω του ασυρμάτου σας ενώ είναι " "ενεργό το σημείο πρόσβασης." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Διακοπή σημείου πρόσβασης και αποσύνδεση όλων των χρηστών;" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Διακοπή σημείου πρόσβασης" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Η πολιτική του συστήματος απαγορεύει τη χρήση ως σημείο πρόσβασης" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Η ασύρματη συσκευή δεν υποστηρίζει λειτουργία με σημείο πρόσβασης" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2744,11 +2739,11 @@ "Θα χαθούν οι λεπτομέρειες των επιλεγμένων δικτύων, συμπεριλαμβανομένων των " "κωδικών πρόσβασης και των προσαρμοσμένων ρυθμίσεων." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Ιστορικό" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2756,7 +2751,7 @@ msgstr "_Κλείσιμο" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Παράλειψη" @@ -2793,6 +2788,10 @@ msgid "Provider" msgstr "Πάροχος" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Δίκτυο" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2898,16 +2897,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "Κω_δικός πρόσβασης" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Κανένα" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Εμφάνιση κ_ωδικού πρόσβασης" @@ -3001,7 +2996,6 @@ msgstr "_Σύνδεση σε κρυφό δίκτυο…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Ιστορικό" @@ -3023,360 +3017,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Κωδικός πρόσβασης" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Υποδομή" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Άγνωστη κατάσταση" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Χωρίς διαχείριση" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Μη διαθέσιμο" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Γίνεται σύνδεση" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Απαιτείται πιστοποίηση" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Συνδεδεμένο" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Γίνεται αποσύνδεση" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Αποτυχία σύνδεσης" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Άγνωστη κατάσταση (απουσιάζει)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Δεν συνδέθηκε" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Αποτυχία ρύθμισης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Αποτυχία ρύθμισης της IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Έληξε η ρυθμίση IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Τα μυστικά απαιτήθηκαν, αλλά δεν προσφέρθηκαν" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "αποσυνδέθηκε η αίτηση του 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Αποτυχία ρύθμισης της αίτησης του 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Αποτυχία της αίτησης του 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Η αίτηση του 802.1x πήρε αρκετή ώρα για να πιστοποιηθεί" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Αποτυχία εκκίνησης της υπηρεσίας PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Αποσυνδέθηκε η υπηρεσία PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Αποτυχία του PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Αποτυχία εκκίνησης του πελάτη DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Σφάλμα πελάτη DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Αποτυχία του πελάτη DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Αποτυχία εκκίνησης της υπηρεσίας κοινόχρηστης σύνδεσης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Αποτυχία της υπηρεσίας κοινόχρηστης σύνδεσης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Αποτυχία εκκίνησης της υπηρεσίας AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Σφάλμα υπηρεσίας AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Αποτυχία υπηρεσίας AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Η γραμμή είναι απασχολημένη" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Δεν ακούγεται ο τόνος κλήσης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Δεν είναι δυνατή η δημιουργία γραμμής" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Έληξε το αίτημα κλήσης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Απέτυχε η προσπάθεια κλήσης" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Απέτυχε η προετοιμασία του μόντεμ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Απέτυχε η επιλογή του συγκεκριμένου APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Δεν ψάχνει για δίκτυα" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Απερρίφθη η εγγραφή στο δίκτυο" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Έληξε η εγγραφή στο δίκτυο" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Αποτυχία εγγραφής στο ζητούμενο δίκτυο" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Απέτυχε ο έλεγχος του PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Μπορεί να λείπει το υλικολογισμικό για τη συσκευή" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Η σύνδεση χάθηκε" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Θεωρήθηκε πως υπάρχει μια τρέχουσα σύνδεση" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Δεν βρέθηκε μόντεμ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Αποτυχία σύνδεσης του Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Δεν έχει τοποθετηθεί η κάρτα SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Απαιτείται το Pin της SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Απαιτείται το Puk της SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Λάθος SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Η συσκευή InfiniBand δεν υποστηρίζει τη λειτουργία σύνδεσης" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Απέτυχε η εξάρτηση της σύνδεσης" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Λείπει το υλικολογισμικό" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Το καλώδιο αποσυνδέθηκε" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Δεν έχει επιλεχθεί πιστοποιητικό της αρχής πιστοποίησης" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "Μη ορισμένο σφάλμα στην ασφάλεια 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Δεν έχει επιλεγεί αρχείο" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Η έλλειψη χρήσης πιστοποιητικού αρχής πιστοποίησης (CA), μπορεί να καταλήξει " -"σε συνδέσεις σε επισφαλή και ευάλωτα δίκτυα Wi-Fi. Θέλετε να επιλέξετε ένα " -"πιστοποιητικό αρχής πιστοποίησης;" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Παράβλεψη" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Επιλέξτε πιστοποιητικό CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Ιδιωτικά κλειδιά DER, PEM, ή PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "ακαθόριστο σφάλμα στην πιστοποίηση του αρχείου eap-method" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Ιδιωτικά κλειδιά DER, PEM, ή PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Πιστοποιητικά DER ή PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "Λείπει το αρχείο EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Επιλογή ενός φακέλου PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Αρχεία PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "Α_ρχείο PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Εσωτερική πιστοποίηση" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Τρ_οδοδοσία PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3385,41 +3355,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Ανώνυμος" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Πιστοποιήθηκε" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Και τα δύο" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "Α_ρχείο PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Εσωτερική πιστοποίηση" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Να επιτρέπεται η αυτόματη _παροχή PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "Λείπει το όνομα χρήστη EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "Λείπει ο κωδικός πρόσβασης EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Όνομα _χρήστη" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Εμ_φάνιση κωδικού πρόσβασης" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "Άκυρο πιστοποιητικό EAP-PEAP CA: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "Άκυρο πιστοποιητικό EAP-PEAP CA: δεν έχει καθοριστεί πιστοποιητικό" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Επιλέξτε ένα πιστοποιητικό αρχής πιστοποίησης" @@ -3437,19 +3439,56 @@ msgid "C_A certificate" msgstr "Πιστοποιητικό C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "Έκ_δοση PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Ε_ρώτηση για αυτόν τον κωδικό πρόσβασης κάθε φορά" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "Λείπει το όνομα χρήστη EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "Λείπει ο κωδικός πρόσβασης EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "Λείπει η ταυτότητα EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "Άκυρο πιστοποιητικό EAP-TLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "Άκυρο πιστοποιητικό EAP-TLS CA: δεν έχει καθοριστεί πιστοποιητικό" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "Άκυρο πιστοποιητικό EAP-TLS: λείπει" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "Άκυρο ιδιωτικό κλειδί EAP-TLS: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "Άκυρο πιστοποιητικό χρήστη EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Τα μη κρυπτογραφημένα ιδιωτικά κλειδιά είναι επισφαλή" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3465,11 +3504,11 @@ "(Μπορείτε να προστατεύσετε με κωδικό πρόσβασης το ιδιωτικό σας κλειδί με το " "openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Επιλέξτε το προσωπικό σας πιστοποιητικό" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Επιλέξτε το ιδιωτικό σας κλειδί" @@ -3481,51 +3520,56 @@ msgid "_User certificate" msgstr "Πιστοποιητικό _χρήστη" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Ιδιωτικό κ_λειδί" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "Άκυρο πιστοποιητικό EAP-TTLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "Άκυρο πιστοποιητικό EAP-TTLS CA: δεν έχει καθοριστεί πιστοποιητικό" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Να _μην προειδοποιηθώ ξανά" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Όχι" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ναι" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Άγνωστο σφάλμα κατά την πιστοποίηση της ασφάλειας 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Διοχετευμένο TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Προστατευμένο EAP (PEAP)" @@ -3535,6 +3579,51 @@ msgid "Au_thentication" msgstr "_Πιστοποίηση" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "Λείπει το όνομα χρήστη leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "Λείπει ο κωδικός πρόσβασης leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "Λείπει το κλειδί wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"Άκυρο wep-key: το κλειδί με μήκος %zu πρέπει να περιέχει μόνο δεκαεξαδικά " +"ψηφία" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"Άκυρο wep-key: το κλειδί με μήκος %zu πρέπει να περιέχει μόνο χαρακτήρες " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"Άκυρο wep-key: λαθεμένο μήκος κλειδιού %zu. Ένα κλειδί πρέπει να έχει μήκος " +"χαρακτήρων 5/13 (ascii) ή 10/26 (δεκαεξαδικό)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "Άκυρο wep-key: το συνθηματικό δεν πρέπει να είναι κενό" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"Άκυρο wep-key: το συνθηματικό πρέπει να είναι μικρότερο από 64 χαρακτήρες" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Προεπιλογή)" @@ -3571,19 +3660,33 @@ msgid "WEP inde_x" msgstr "Δεί_κτης WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"Άκυρο wpa-psk: μη έγκυρο μήκος κλειδιού %zu. Πρέπει να είναι [8,63] bytes ή " +"64 δεκαεξαδικά ψηφία" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"Άκυρο wpa-psk: αδυναμία μεταγλώττισης κλειδιού με 64 bytes ως δεκαεξαδικό" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Τύπος" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Ενεργό" @@ -3620,16 +3723,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Να εμφανίζεται το _περιεχόμενο του μηνύματος στο κλείδωμα οθόνης" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Ειδοποιήσεις" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Ελέγξτε ποιες ειδοποιήσεις εμφανίζονται και τι εμφανίζουν" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Ειδοποιήσεις;Τίτλοι;Μήνυμα;Δίσκος;Αναδυόμενο;Notifications;Banner;Message;" @@ -3649,81 +3753,70 @@ msgid "Applications" msgstr "Εφαρμογές" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Άλλο" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Προσθήκη λογαριασμού" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Αλληλογραφία" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Ημερολόγιο" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Επαφές" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Συνομιλία" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Πόροι" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Σφάλμα σύνδεσης στο λογαριασμό" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Τα διαπιστευτήρια έχουν λήξει." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Συνδεθείτε για την ενεργοποίηση αυτού του λογαριασμού." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Σύνδεση" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Σφάλμα δημιουργίας λογαριασμού" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Σφάλμα αφαίρεσης λογαριασμού" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Είστε σίγουροι ότι θέλετε να αφαιρέσετε το λογαριασμό;" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Ο λογαριασμός σας δε θα διαγραφεί από τον διακομιστή." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "Α_φαίρεση" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Διαδικτυακοί λογαριασμοί" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Συνδεθείτε με τους δικτυακούς λογαριασμούς σαε και αποφασίστε πού θα τους " "χρησιμοποιήσετε" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3737,6 +3830,7 @@ msgstr "Δεν έχουν ρυθμιστεί διαδικτυακοί λογαριασμοί" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Αφαίρεση λογαριασμού" @@ -3879,7 +3973,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Μπαταρία" @@ -3927,105 +4021,106 @@ msgid "When _idle" msgstr "Όταν είναι _ανενεργό" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Εξοικονόμηση ενέργειας" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Φωτεινότητα _οθόνης" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Αυτόματη φωτεινότητα" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Φωτεινότητα _πληκτρολογίου" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Α_μυδρή οθόνη όταν είναι ανενεργή" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Κενή οθόνη" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Απενεργοποιήστε το ασύρματο δίκτυο για εξοικονόμηση ισχύος." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Ευρυζωνικό _κινητό" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Απενεργοποιήστε την ευρυζωνικότητα του κινητού (3G, 4G, LTE, κλπ.) για να " "εξοικονομήσετε ισχύ." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Όταν τροφοδοτείται από μπαταρία" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Όταν είναι στην παροχή ρεύματος" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Αναστολή" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Aδρανοποίηση" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Καμία ενέργεια" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Κουμπί αναστολή & τερματισμός" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Αυτόματη αναστολή" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Αυτόματη αναστολή" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Ό_ταν πατιέται το κουμπί τερματισμού" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Συσκευές" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Ενέργεια" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Δείτε την κατάστασης της μπαταρίας σας και αλλάξτε τις ρυθμίσεις αποθήκευσης " "ενέργειας" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4105,11 +4200,6 @@ msgid "Delay" msgstr "Καθυστέρηση" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Ακύρωση" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Πιστοποίηση" @@ -4119,138 +4209,138 @@ msgstr "Απαιτείται πιστοποίηση" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Τελειώνει ο γραφίτης" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Άδειος γραφίτης" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Τελειώνει το υγρό εμφάνισης" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Τελείωσε το υγρό εμφάνισης" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Τελειώνει ένα από τα χρώματα" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Τελείωσε ένα από τα χρώματα" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Κάλυμμα ανοικτό" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Πορτάκι ανοικτό" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Τελειώνει το χαρτί" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Τελείωσε το χαρτί" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Αποσυνδεδεμένος" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Διακόπηκε" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Το δοχείο απορριμμάτων σχεδόν γέμισε" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Το δοχείο απορριμμάτων είναι γεμάτο" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Το τύμπανο είναι σχεδόν στο τέλος της ζωής του" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Το τύμπανο δεν δουλεύει πλέον" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Γίνεται ρύθμιση" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Έτοιμο" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Δεν δέχεται εργασίες" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Γίνεται επεξεργασία" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Επίπεδο τόνερ" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Επίπεδο μελανιού" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Επίπεδο τροφοδοσίας" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Εγκατάσταση" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4258,15 +4348,15 @@ msgstr[1] "%u ενεργά" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Αποτυχία προσθήκης νέου εκτυπωτή." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Επιλεγμένο αρχείο PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4274,50 +4364,47 @@ "Αρχεία περιγραφής εκτυπωτών PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Δε βρέθηκε κατάλληλος οδηγός" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Αναζήτηση για προτιμώμενους οδηγούς…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Επιλογή από βάση δεδομένων…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Παροχή αρχείου PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Δοκιμαστική σελίδα" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Χωρίς εκτυπωτές" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Αδυναμία φόρτωσης γραφικού περιβάλλοντος: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Εκτυπωτές" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Προσθέστε εκτυπωτές, δείτες τις εργασίες ενός εκτυπωτή και καθορίστε τον " "τρόπο εκτύπωσης" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "" "Εκτυπωτής;Ουρά;Εκτύπωση;Χαρτί;Μελάνι;Τόνερ;Γραφίτης;Printer;Queue;Print;" @@ -4481,6 +4568,11 @@ msgid "Parallel Port" msgstr "Παράλληλη θύρα" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4693,13 +4785,17 @@ msgid "_Options" msgstr "Επιλ_ογές" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Χωρίς εκτυπωτές" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Προσθήκη εκτυπωτή" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4707,70 +4803,70 @@ "Συγνώμη! Η υπηρεσία εκτύπωσης του συστήματος\n" "φαίνεται να μην είναι διαθέσιμη." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Κλείδωμα οθόνης" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Σε χρήση" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Ενεργό" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Ανενεργό" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Υπηρεσίες τοποθεσίας" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Χρήση & ιστορικό" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Διαγραφή όλων των αντικειμένων από τα απορρίμματα;" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Όλα τα αντικείμενα στα απορρίμματα θα διαγραφούν οριστικά." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Ά_δειασμα απορριμμάτων" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Διαγραφή όλων των προσωρινών αρχείων;" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Όλα τα προσωρινά αρχεία θα διαγραφούν μόνιμα." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Εκκαθάριση προσωρινών αρχείων" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Εκκαθάριση απορριμμάτων & προσωρινών αρχείων" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Χρήση λογισμικού" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Αναφορά προβλήματος" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4779,21 +4875,22 @@ "Η αποστολή αναφορών των τεχνικών προβλημάτων μας βοηθά να βελτιώσουμε το %s. " "Οι αναφορές στέλνονται ανώνυμα και αφαιρούνται τα προσωπικά δεδομένα." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Πολιτική ιδιωτικότητας" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Ιδιωτικότητα" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Προστατεύστε τις προσωπικές σας πληροφορίες και ελέγξτε τι βλέπουν οι άλλοι" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4966,21 +5063,21 @@ msgid "Other" msgstr "Άλλο" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Η συνεδρία σας πρέπει να επανεκκινηθεί για να εφαρμοστούν οι αλλαγές" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Επανεκκίνηση τώρα" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Δεν επιλέχτηκαν πηγές εισόδου" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Ο_θόνη σύνδεσης" @@ -5012,18 +5109,19 @@ msgid "Paper" msgstr "Χαρτί" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Περιοχή & γλώσσα" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Επιλέξτε γλώσσα εμφάνισης, μορφές, διατάξεις πληκτρολογίου και πηγές εισόδου" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Γλώσσα;Διάταξη;Πληκτρολόγιο;Είσοδος;Language;Layout;Keyboard;Input;" @@ -5082,7 +5180,7 @@ msgstr "Αριστερό+δεξιό Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "Γ_λώσσα" @@ -5132,26 +5230,11 @@ "Οι ρυθμίσεις σύνδεσης χρησιμοποιούνται από όλους τους χρήστες κατά τη " "σύνδεση στο σύστημα" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Τοποθεσίες" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Σελιδοδείκτες" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Άλλο" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Επιλογή περιοχής" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Εντάξει" @@ -5159,11 +5242,12 @@ msgid "No applications found" msgstr "Δε βρέθηκαν εφαρμογές" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Αναζήτηση" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5171,7 +5255,7 @@ "Δραστηριότητες" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Αναζήτηση;Εύρεση;Ευρετήριο;Απόκρυψη;Ιδιωτικότητα;Αποτελέσματα;Search;Find;" @@ -5181,6 +5265,18 @@ msgid "Search Locations" msgstr "Τοποθεσίες αναζήτησης" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Τοποθεσίες" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Άλλο" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Μετακίνηση προς τα πάνω" @@ -5193,6 +5289,11 @@ msgid "Preferences" msgstr "Προτιμήσεις" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Δεν έχουν επιλεγεί δίκτυα για κοινή χρήση" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5218,21 +5319,55 @@ msgid "Choose a Folder" msgstr "Επιλογή φακέλου" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Η κοινή χρήση προσωπικών αρχείων επιτρέπει να μοιράζεστε τον δημόσιο φάκελό " +"σας με άλλους, στο υπάρχον δίκτυό σας, χρησιμοποιώντας: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Όταν είναι ενεργοποιημένη η απομακρυσμένη σύνδεση, οι απομακρυσμένοι χρήστες " +"μπορούν να συνδεθούν χρησιμοποιώντας εντολή ασφαλούς κελύφους (SSH):\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Η κοινή χρήση οθόνης επιτρέπει σε απομακρυσμένους χρήστες να προβάλουν ή να " +"ελέγχουν την οθόνη σας συνδεόμενοι με: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Αντιγραφή" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Κοινή χρήση" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Κοινή χρήση" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Ελέγξτε τι θέλετε να μοιράζεστε με τους άλλους" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5242,6 +5377,10 @@ "απεικονιστής;share;sharing;ssh;host;name;remote;desktop;media;audio;video;" "pictures;photos;movies;server;renderer;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Δίκτυα" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Ενεργοποίηση η απενεργοποίηση της απομακρυσμένης σύνδεσης" @@ -5252,25 +5391,13 @@ "Απαιτείται πιστοποίηση για την ενεργοποίηση ή απενεργοποίηση της " "απομακρυσμένης σύνδεσης" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Δεν έχουν επιλεγεί δίκτυα για κοινή χρήση" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Δίκτυα" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Όνομα υπολο_γιστή" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Κοινή χρήση _προσωπικών αρχείων" +msgid "_File Sharing" +msgstr "_Κοινή χρήση αρχείων" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5289,86 +5416,54 @@ msgstr "Μερικές υπηρεσίες είναι ανενεργές λόγω έλλειψης πρόσβασης στο δίκτυο." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Κοινή χρήση προσωπικών αρχείων" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Η κοινή χρήση προσωπικών αρχείων επιτρέπει να μοιράζεστε τον δημόσιο φάκελό " -"σας με άλλους, στο υπάρχον δίκτυό σας, χρησιμοποιώντας: dav://%s" +msgid "File Sharing" +msgstr "Κοινή χρήση αρχείων" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Απαιτείται _κωδικός πρόσβασης" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Απομακρυσμένη σύνδεση" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Να επιτρέπεται σε απομακρυσμένους χρήστες να συνδέονται χρησιμοποιώντας την " -"εντολή ασφαλούς κελύφους:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Κοινή χρήση οθόνης" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Να επιτρέπεται σε απομακρυσμένους χρήστες να προβάλουν ή να ελέγχουν την " -"οθόνη σας συνδεόμενοι με: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Να επιτ_ρέπεται ο απομακρυσμένος έλεγχος" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Να επιτ_ρέπεται στις συνδέσεις ο έλεγχος της οθόνης" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "Κω_δικός πρόσβασης:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Ε_μφάνιση κωδικού πρόσβασης" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Επιλογές πρόσβασης" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Οι _νέες συνδέσεις πρέπει να ζητούν πρόσβαση" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Απαιτείται κωδικός πρόσβασης" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Κοινή χρήση πολυμέσων" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Η κοινή χρήση πολυμέσων σας επιτρέπει να μοιραστείτε μουσική, φωτογραφίες " -"και βίντεο μέσω του δικτύου." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Κοινή χρήση μουσικής, φωτογραφιών και βίντεο μέσω δικτύου." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Φάκελοι" @@ -5499,11 +5594,6 @@ msgid "Peak detect" msgstr "Εντοπισμός κορύφωσης" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Όνομα" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Συσκευή" @@ -5598,18 +5688,23 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Προσαρμοσμένη" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Γενική πρόσβαση" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "" "Κάντε πιο εύκολη την προβολή, την ακρόαση, την πληκτρολόγηση, την κατάδειξη " "και το κλικ" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5711,8 +5806,8 @@ msgstr "Πλήκτρα ήχου" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Ήχος κατά την ενεργοποίηση Num Lock ή Caps Lock." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Ήχος κατά την ενεργοποίηση/απενεργοποίηση του Num Lock ή Caps Lock." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6096,98 +6191,69 @@ msgstr "Εφέ χρώματος" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Προσθήκη χρήστη" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Πλήρες όνομα" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Τυπικός" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Διαχειριστής" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Πλήρες όνομα" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Τύπος λογαριασμού" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Να επιτρέπεται στον χρήστη ο ορισμός κωδικού πρόσβασης στην επόμενη σύν_δεση" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Καθο_ρισμός κωδικού πρόσβασης" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Επαλήθευση" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Επιβεβαίωση" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Η εταιρική σύνδεση επιτρέπει σε έναν υπάρχοντα κεντρικά διαχειριζόμενο " -"λογαριασμό χρήστη να χρησιμοποιηθεί σε αυτή τη συσκευή." +"λογαριασμό χρήστη να χρησιμοποιηθεί σε αυτή τη συσκευή. Μπορείτε επίσης να " +"χρησιμοποιήσετε τον λογαριασμό γι να έχετε πρόσβαση σε πόρους της εταιρείας " +"στο διαδίκτυο." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Τομέας" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Συνδεθείτε για να προσθέσετε\n" -"εταιρικούς λογαριασμούς σύνδεσης." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Εταιρική σύνδεση" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Προσθήκη χρήστη" +msgid "You are Offline" +msgstr "Αποσυνδεδεμένο" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Εγγραφή" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Σύνδεση διαχειριστή τομέα" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Για να χρησιμοποιήσετε τις εταιρικές συνδέσεις, αυτός ο υπολογιστής πρέπει " -"να είναι\n" -"εγγεγραμμένος στον τομέα. Παρακαλούμε, πείτε τον διαχειριστή του δικτύου " -"σας\n" -"να πληκτρολογήσει εδώ τον κωδικό πρόσβασης του τομέα." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Ό_νομα διαχειριστή" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Πρέπει να είστε σε σύνδεση για να προσθέσετε εταιρικούς χρήστες." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Κωδικός πρόσβασης διαχειριστή" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Εταιρική σύνδεση" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6222,7 +6288,7 @@ msgstr "Δεξιό μικρό δάκτυλο" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Ενεργοποίηση εισόδου με αποτύπωμα" @@ -6262,9 +6328,34 @@ "Σύνδεση;Όνομα;Δακτυλικό αποτύπωμα;Avatar;Λογότυπο;Πρόσωπο;Κωδικός πρόσβασης;" "Login;Name;Fingerprint;Logo;Face;Password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Ιστορικό συνδέσεων" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Εγγραφή" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Σύνδεση διαχειριστή τομέα" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Για να χρησιμοποιήσετε τις εταιρικές συνδέσεις, αυτός ο υπολογιστής πρέπει " +"να είναι\n" +"εγγεγραμμένος στον τομέα. Παρακαλούμε, πείτε τον διαχειριστή του δικτύου " +"σας\n" +"να πληκτρολογήσει εδώ τον κωδικό πρόσβασης του τομέα." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Ό_νομα διαχειριστή" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Κωδικός πρόσβασης διαχειριστή" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6287,39 +6378,32 @@ msgstr "Τρέχων _κωδικός πρόσβασης" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" -"Να επιτρέπεται στον χρήστη ο ορισμός κωδικού πρόσβασης στην επόμενη σύνδεση" +"Να επιτρέπεται στον χρήστη να αλλάξει τον κωδικό πρόσβασης στην επόμενη " +"σύνδεση" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Καθορισμός κωδικού πρόσβασης" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Προσθήκη λογαριασμού χρήστη" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Αφαίρεση λογαριασμού χρήστη" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "Π_ροσθήκη χρήστη…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Επιλογές σύνδεσης" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Α_υτόματη σύνδεση" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Είσοδος με _δακτυλικό αποτύπωμα" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Εικονίδιο χρήστη" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Τελευταία σύνδεση" @@ -6430,9 +6514,10 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" -"Αναμείξτε κεφαλαία και πεζά γράμματα και χρησιμοποιήστε έναν αριθμό ή δύο." +"Αναμείξτε κεφαλαία και πεζά γράμματα και χρησιμοποιήστε έναν ή περισσότερους " +"αριθμούς." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6525,33 +6610,32 @@ msgstr "Άγνωστο σφάλμα" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "" -"Αν θα πρέπει να ταιριάζει η διεύθυνση ιστού του παρόχου του λογαριασμού σας." +msgid "Should match the web address of your login provider." +msgstr "Πρέπει να ταιριάζει η διεύθυνση ιστού του παρόχου της εισόδου σας." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Αποτυχία προσθήκης λογαριασμού" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Δεν ταιριάζουν οι κωδικοί πρόσβασης." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Αποτυχία εγγραφής του λογαριασμού" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Κανένας υποστηριζόμενος τρόπος πιστοποίησης με αυτόν τον τομέα" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Αποτυχία ένταξης στο τομέα" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6559,7 +6643,7 @@ "Αυτό το όνομα σύνδεσης δεν δούλεψε.\n" "Παρακαλούμε, προσπαθήστε ξανά." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6567,14 +6651,24 @@ "Αυτός ο κωδικός πρόσβασης εισόδου δεν δούλεψε.\n" "Παρακαλούμε, προσπαθήστε ξανά." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Αποτυχία σύνδεσης στο τομέα" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Αδύνατη η εύρεση του τομέα. Μήπως τον γράψατε λαθεμένα;" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Τυπικός" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Διαχειριστής" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6594,15 +6688,15 @@ msgid "Enabled" msgstr "Ενεργοποιημένο" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Διαγραφή των καταχωρημένων αποτυπωμάτων;" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Διαγραφή αποτυπωμάτων" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6610,15 +6704,15 @@ "Επιθυμείτε να διαγράψετε τα καταχωρημένα αποτυπώματα για να απενεργοποιηθεί " "η είσοδος με αποτύπωμα;" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Έγινε!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Δεν ήταν δυνατή η πρόσβαση στη συσκευή '%s'" @@ -6626,16 +6720,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Αδυναμία εκκίνησης της καταγραφής αποτυπωμάτων στη συσκευή '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Δεν είναι δυνατή η πρόσβαση σε καμία συσκευή ανάγνωσης αποτυπωμάτων" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "" "Παρακαλούμε επικοινωνήστε με το διαχειριστή του συστήματος για βοήθεια." @@ -6645,7 +6739,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6654,11 +6748,11 @@ "Για να ενεργοποιήσετε την είσοδο με αποτύπωμα, πρέπει να αποθηκεύσετε ένα " "δακτυλικό σας αποτύπωμα χρησιμοποιώντας τη συσκευή '%s'." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Αριστερός δείκτης" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Καταγραφή δακτυλικών αποτυπωμάτων" @@ -6712,14 +6806,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Η συνεδρία τελείωσε" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Η συνεδρία άρχισε" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Δραστηριότητα λογαριασμού" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Παρακαλούμε επιλέξτε άλλον κωδικό πρόσβασης." @@ -6781,7 +6882,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Αδυναμία σύνδεσης στον τομέα %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Άλλοι λογαριασμοί" @@ -6863,17 +6964,17 @@ msgid "Logged in" msgstr "Συνδεμένος" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Αποτυχία επικοινωνίας με την υπηρεσία λογαριασμών" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Παρακαλούμε βεβαιωθείτε ότι το AccountService έχει εγκατασταθεί και είναι " "ενεργοποιημένο." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6881,12 +6982,12 @@ "Για να κάνετε αλλαγές,\n" "κάντε κλικ στο εικονίδιο * πρώτα" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Δημιουργία νέου λογαριασμού χρήστη" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6894,12 +6995,12 @@ "Για να δημιουργήσετε ένα λογαριασμό χρήστη,\n" "κάντε πρώτα κλικ στο εικονίδιο *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Διαγραφή του επιλεγμένου λογαριασμού χρήστη" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6907,33 +7008,34 @@ "Για να διαγράψετε τον επιλεγμένο λογαριασμό χρήστη,\n" "κάντε πρώτα κλικ στο εικονίδιο *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Ο λογαριασμός μου" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Υπάρχει ήδη ένας χρήστης με όνομα '%s'." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Συγγνώμη, δεν είναι διαθέσιμο το όνομα χρήστη. Παρακαλούμε, δοκιμάστε κάποιο " +"αλλο." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Το όνομα χρήστη είναι πολύ μεγάλο." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Το όνομα χρήστη δεν μπορεί να αρχίζει με '-'." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Το όνομα χρήστη πρέπει να αποτελείται μόνο από πεζά και κεφαλαία γράμματα " -"από a-z, αριθμούς και οποιονδήποτε από τους χαρακτήρες '.', '-' και '_'." +"από a-z, αριθμούς και οποιονδήποτε από τους χαρακτήρες: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Αυτό θα χρησιμοποιηθεί ως όνομα για τον προσωπικό σας φάκελο και δεν μπορεί " @@ -7025,19 +7127,19 @@ msgid "Button" msgstr "Κουμπί" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Wacom Tablet" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Ορίστε τα κουμπιά και ρυθμίστε την ευαισθησία γραφίδας stylus για ταμπλέτες " "γραφικών" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Ταμπλέτα;Wacom;Γραφίδα (Stylus);Σβήστρα (Eraser);Ποντίκι;" @@ -7069,6 +7171,10 @@ msgid "Bluetooth Settings" msgstr "Ρυθμίσεις Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom Tablet" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Χαρτογράφηση στην οθόνη…" @@ -7162,22 +7268,22 @@ msgid "Mode Switch #%d" msgstr "Λειτουργία διακόπτη #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Αριστερό κουμπί #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Δεξί κουμπί #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Πάνω κουμπί #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Κάτω κουμπί #%d" @@ -7254,6 +7360,11 @@ msgid "Tip Pressure Feel" msgstr "Αίσθηση πίεσης μύτης" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Ρυθμίσεις" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Κέντρου ελέγχου GNOME" @@ -7310,22 +7421,18 @@ msgid "Quit" msgstr "Έξοδος" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Ρυθμίσεις" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Προσωπικά" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Υλικό" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Σύστημα" @@ -7364,6 +7471,186 @@ msgid "Cancel search" msgstr "Ακύρωση αναζήτησης" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Σημείο πρόσβασης" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Για να επεξεργασθείτε μια συντόμευση, κάντε κλικ στην αντίστοιχη σειρά " +#~ "και κρατήστε πατημένα τα νέα πλήκτρα ή πατήστε backspace για εκκαθάριση." + +#~ msgid "Error logging into the account" +#~ msgstr "Σφάλμα σύνδεσης στο λογαριασμό" + +#~ msgid "Credentials have expired." +#~ msgstr "Τα διαπιστευτήρια έχουν λήξει." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Συνδεθείτε για την ενεργοποίηση αυτού του λογαριασμού." + +#~ msgid "_Sign In" +#~ msgstr "_Σύνδεση" + +#~ msgid "Color" +#~ msgstr "Χρώμα" + +#~ msgid "_Name:" +#~ msgstr "Ό_νομα:" + +#~ msgid "Add Shortcut" +#~ msgstr "Προσθήκη συντόμευσης" + +#~ msgid "Remove Shortcut" +#~ msgstr "Αφαίρεση συντόμευσης" + +#~ msgid "" +#~ msgstr "<Άγνωστη ενέργεια>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Η συντόμευση \"%s\" δεν θα χρησιμοποιηθεί γιατί θα επηρεάσει την " +#~ "πληκτρολόγηση.\n" +#~ "Χρησιμοποιήστε την σε συνδυασμό με πλήκτρα όπως το Control, Alt ή Shift." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Η συντόμευση \"%s\" χρησιμοποιείται ήδη για:\n" +#~ " \"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Αν αναθέσετε ξανά τη συντόμευση στο \"%s\", η συντόμευση \"%s\" θα " +#~ "απενεργοποιηθεί." + +#~ msgid "_Reassign" +#~ msgstr "Ανά_θεση ξανά" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Η συντόμευση \"%s\" έχει μια συνδεόμενη συντόμευση στο \"%s\". Θέλετε να " +#~ "την ορίσετε αυτόματα στο \"%s\";" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Η \"%s\" συνδέεται προς το παρόν με την \"%s\" και θα απενεργοποιηθεί αν " +#~ "προχωρήσετε." + +#~ msgid "_Assign" +#~ msgstr "_Ανάθεση" + +#~ msgid "Bond" +#~ msgstr "Δεσμός" + +#~ msgid "Team" +#~ msgstr "Ομάδα" + +#~ msgid "Bridge" +#~ msgstr "Γέφυρα" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Αδυναμία φόρτωσης προσθέτων VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Προσθήκη σύνδεσης δικτύου" + +#~ msgid "Bond slaves" +#~ msgstr "Υποτελείς δεσμοί" + +#~ msgid "(none)" +#~ msgstr "(κανένας)" + +#~ msgid "Bridge slaves" +#~ msgstr "Υποτελείς γέφυρες" + +#~ msgid "Team slaves" +#~ msgstr "Υποτελείς ομάδας" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Η συσκευή InfiniBand δεν υποστηρίζει τη λειτουργία σύνδεσης" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Δεν έχει επιλεχθεί πιστοποιητικό της αρχής πιστοποίησης" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Η έλλειψη χρήσης πιστοποιητικού αρχής πιστοποίησης (CA), μπορεί να " +#~ "καταλήξει σε συνδέσεις σε επισφαλή και ευάλωτα δίκτυα Wi-Fi. Θέλετε να " +#~ "επιλέξετε ένα πιστοποιητικό αρχής πιστοποίησης;" + +#~ msgid "Ignore" +#~ msgstr "Παράβλεψη" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Επιλέξτε πιστοποιητικό CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "Ε_ρώτηση για αυτόν τον κωδικό πρόσβασης κάθε φορά" + +#~ msgid "Don't _warn me again" +#~ msgstr "Να _μην προειδοποιηθώ ξανά" + +#~ msgid "No" +#~ msgstr "Όχι" + +#~ msgid "Yes" +#~ msgstr "Ναι" + +#~ msgid "Power" +#~ msgstr "Ενέργεια" + +#~ msgid "Privacy" +#~ msgstr "Ιδιωτικότητα" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Άλλο" + +#~ msgid "Personal File Sharing" +#~ msgstr "Κοινή χρήση προσωπικών αρχείων" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Να επιτ_ρέπεται ο απομακρυσμένος έλεγχος" + +#~ msgid "_Verify" +#~ msgstr "_Επαλήθευση" + +#~ msgid "Login History" +#~ msgstr "Ιστορικό συνδέσεων" + +#~ msgid "Add User Account" +#~ msgstr "Προσθήκη λογαριασμού χρήστη" + +#~ msgid "Remove User Account" +#~ msgstr "Αφαίρεση λογαριασμού χρήστη" + +#~ msgid "Login Options" +#~ msgstr "Επιλογές σύνδεσης" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Υπάρχει ήδη ένας χρήστης με όνομα '%s'." + #~ msgid "Used to determine your geographical location" #~ msgstr "Χρησιμοποιείται για να καθοριστεί η γεωγραφική σας θέση" @@ -7420,9 +7707,6 @@ #~ msgid "Color" #~ msgstr "Χρώμα" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Κύλιση με δύο δάκτυλα" - #~ msgid "_Delay:" #~ msgstr "Καθυ_στέρηση:" @@ -7445,9 +7729,6 @@ #~ msgid "S_peed:" #~ msgstr "Τα_χύτητα:" -#~ msgid "Shortcuts" -#~ msgstr "Συντομεύσεις" - #~ msgid "Test Your Settings" #~ msgstr "Δοκιμή των ρυθμίσεων σας" @@ -7809,9 +8090,6 @@ #~ msgid "Show Status When _Inactive" #~ msgstr "Εμφάνιση κατάστασης όταν είναι α_νενεργό" -#~ msgid "_Confirm Password" -#~ msgstr "Επι_βεβαίωση κωδικού" - #~ msgid "_Login Name" #~ msgstr "Όνομα ει_σόδου" diff -Nru gnome-control-center-3.20.2/po/en_CA.po gnome-control-center-3.22.1/po/en_CA.po --- gnome-control-center-3.20.2/po/en_CA.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/en_CA.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2005-08-06 19:59-0400\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" +"Language: en_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/en_GB.po gnome-control-center-3.22.1/po/en_GB.po --- gnome-control-center-3.20.2/po/en_GB.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/en_GB.po 2016-09-27 12:37:36.000000000 +0000 @@ -2,281 +2,233 @@ # Copyright (C) 1999 Free Software Foundation, Inc. # Robert Brady # Gareth Owen , David Lodge , 2004. -# Bruce Cowan , 2009, 2010, 2011, 2012, 2013. # Philip Withnall , 2010, 2013. # Chris Leonard , 2012. +# Bruce Cowan , 2009, 2010, 2011, 2012, 2013, 2016. +# msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-03 23:08-0600\n" -"PO-Revision-Date: 2013-03-05 20:07+0100\n" -"Last-Translator: Philip Withnall \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-18 12:59+0200\n" +"Last-Translator: David King \n" "Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Gtranslator 2.91.7\n" "X-Project-Style: gnome\n" #: ../panels/background/background.ui.h:1 -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Background" +msgid "_Background" +msgstr "_Background" #. This refers to a slideshow background #: ../panels/background/background.ui.h:3 msgid "Changes throughout the day" msgstr "Changes throughout the day" -#: ../panels/background/background.ui.h:4 -msgid "Lock Screen" -msgstr "Lock Screen" - +#. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 +msgid "_Lock Screen" +msgstr "_Lock Screen" + +#: ../panels/background/background.ui.h:6 msgctxt "background, style" msgid "Tile" msgstr "Tile" -#: ../panels/background/background.ui.h:6 +#: ../panels/background/background.ui.h:7 msgctxt "background, style" msgid "Zoom" msgstr "Zoom" -#: ../panels/background/background.ui.h:7 +#: ../panels/background/background.ui.h:8 msgctxt "background, style" msgid "Center" msgstr "Centre" -#: ../panels/background/background.ui.h:8 +#: ../panels/background/background.ui.h:9 msgctxt "background, style" msgid "Scale" msgstr "Scale" -#: ../panels/background/background.ui.h:9 +#: ../panels/background/background.ui.h:10 msgctxt "background, style" msgid "Fill" msgstr "Fill" -#: ../panels/background/background.ui.h:10 +#: ../panels/background/background.ui.h:11 msgctxt "background, style" msgid "Span" msgstr "Span" -#. translators: This is the title of the wallpaper chooser dialog. -#: ../panels/background/cc-background-chooser-dialog.c:300 -msgid "Select Background" -msgstr "Select Background" - -#: ../panels/background/cc-background-chooser-dialog.c:319 +#: ../panels/background/cc-background-chooser-dialog.c:437 msgid "Wallpapers" msgstr "Wallpapers" -#: ../panels/background/cc-background-chooser-dialog.c:328 -msgid "Pictures" -msgstr "Pictures" - -#: ../panels/background/cc-background-chooser-dialog.c:336 +#: ../panels/background/cc-background-chooser-dialog.c:446 msgid "Colors" msgstr "Colours" -#: ../panels/background/cc-background-chooser-dialog.c:345 -msgid "Flickr" -msgstr "Flickr" +#. translators: This is the title of the wallpaper chooser dialog. +#: ../panels/background/cc-background-chooser-dialog.c:483 +msgid "Select Background" +msgstr "Select Background" + +#: ../panels/background/cc-background-chooser-dialog.c:511 +msgid "Pictures" +msgstr "Pictures" #. translators: No pictures were found -#: ../panels/background/cc-background-chooser-dialog.c:400 +#: ../panels/background/cc-background-chooser-dialog.c:543 msgid "No Pictures Found" msgstr "No Pictures Found" +#. translators: "Home" is used in place of the Pictures +#. * directory in the string below when XDG_PICTURES_DIR is +#. * undefined +#: ../panels/background/cc-background-chooser-dialog.c:561 +#: ../panels/search/cc-search-locations-dialog.c:302 +msgid "Home" +msgstr "Home" + #. translators: %s here is the name of the Pictures directory, the string should be translated in #. * the context "You can add images to your Pictures folder and they will show up here" -#: ../panels/background/cc-background-chooser-dialog.c:415 +#: ../panels/background/cc-background-chooser-dialog.c:573 #, c-format msgid "You can add images to your %s folder and they will show up here" msgstr "You can add images to your %s folder and they will show up here" -#: ../panels/background/cc-background-chooser-dialog.c:443 -#: ../panels/bluetooth/cc-bluetooth-panel.c:631 -#: ../panels/color/cc-color-panel.c:220 ../panels/color/cc-color-panel.c:967 -#: ../panels/display/cc-display-panel.c:1385 -#: ../panels/display/cc-display-panel.c:1783 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1201 -#: ../panels/network/net-device-wifi.c:1407 -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:379 -#: ../panels/printers/cc-printers-panel.c:1946 +#: ../panels/background/cc-background-chooser-dialog.c:580 +#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 +#: ../panels/common/language-chooser.ui.h:3 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 +#: ../panels/network/connection-editor/connection-editor.ui.h:1 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 +#: ../panels/network/network-wifi.ui.h:1 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:467 -#: ../panels/search/cc-search-locations-dialog.c:682 -#: ../panels/sharing/cc-sharing-panel.c:421 -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 -#: ../panels/user-accounts/um-photo-dialog.c:96 -#: ../panels/user-accounts/um-photo-dialog.c:221 -#: ../panels/user-accounts/um-user-panel.c:508 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 +#: ../panels/sharing/cc-sharing-panel.c:372 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 +#: ../panels/user-accounts/data/password-dialog.ui.h:2 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-photo-dialog.c:94 +#: ../panels/user-accounts/um-photo-dialog.c:217 +#: ../panels/user-accounts/um-user-panel.c:705 +#: ../panels/user-accounts/um-user-panel.c:723 msgid "_Cancel" msgstr "_Cancel" -#: ../panels/background/cc-background-chooser-dialog.c:444 -#: ../panels/printers/ppd-selection-dialog.ui.h:3 -#: ../panels/user-accounts/data/photo-dialog.ui.h:9 -#: ../panels/user-accounts/um-photo-dialog.c:98 -msgid "Select" -msgstr "Select" +#: ../panels/background/cc-background-chooser-dialog.c:581 +msgid "_Select" +msgstr "_Select" -#: ../panels/background/cc-background-item.c:150 +#: ../panels/background/cc-background-item.c:203 msgid "multiple sizes" msgstr "multiple sizes" #. translators: 100 × 100px #. * Note that this is not an "x", but U+00D7 MULTIPLICATION SIGN -#: ../panels/background/cc-background-item.c:154 +#: ../panels/background/cc-background-item.c:207 #, c-format msgid "%d × %d" msgstr "%d × %d" -#: ../panels/background/cc-background-item.c:283 +#: ../panels/background/cc-background-item.c:333 msgid "No Desktop Background" msgstr "No Desktop Background" -#: ../panels/background/cc-background-panel.c:497 +#: ../panels/background/cc-background-panel.c:493 msgid "Current background" msgstr "Current background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Back­ground" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Change your background image to a wallpaper or photo" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;Screen;Desktop;" -#: ../panels/bluetooth/bluetooth.ui.h:1 -msgid "Set Up New Device" -msgstr "Set Up New Device" - -#: ../panels/bluetooth/bluetooth.ui.h:2 ../panels/network/network.ui.h:9 -msgid "Remove Device" -msgstr "Remove Device" - -#: ../panels/bluetooth/bluetooth.ui.h:3 -msgid "Connection" -msgstr "Connection" - -#: ../panels/bluetooth/bluetooth.ui.h:4 -#: ../panels/network/connection-editor/8021x-security-page.ui.h:2 -#: ../panels/network/connection-editor/security-page.ui.h:2 -#: ../panels/printers/printers.ui.h:14 -msgid "page 1" -msgstr "page 1" - -#: ../panels/bluetooth/bluetooth.ui.h:5 -#: ../panels/network/connection-editor/8021x-security-page.ui.h:5 -#: ../panels/network/connection-editor/security-page.ui.h:5 -#: ../panels/printers/printers.ui.h:16 -msgid "page 2" -msgstr "page 2" - -#: ../panels/bluetooth/bluetooth.ui.h:6 -msgid "Paired" -msgstr "Paired" - -#: ../panels/bluetooth/bluetooth.ui.h:7 -msgid "Type" -msgstr "Type" - -#: ../panels/bluetooth/bluetooth.ui.h:8 -#: ../panels/network/connection-editor/ce-page-ip4.c:194 -#: ../panels/network/connection-editor/ce-page-ip4.c:456 -#: ../panels/network/connection-editor/ce-page-ip6.c:196 -#: ../panels/network/connection-editor/ce-page-ip6.c:460 -msgid "Address" -msgstr "Address" - -#: ../panels/bluetooth/bluetooth.ui.h:9 -msgid "Mouse & Touchpad Settings" -msgstr "Mouse & Touchpad Settings" - -#: ../panels/bluetooth/bluetooth.ui.h:10 -msgid "Sound Settings" -msgstr "Sound Settings" - -#: ../panels/bluetooth/bluetooth.ui.h:11 -msgid "Keyboard Settings" -msgstr "Keyboard Settings" - -#: ../panels/bluetooth/bluetooth.ui.h:12 -msgid "Send Files…" -msgstr "Send Files…" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:357 -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Yes" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:357 -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "No" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:470 -msgid "Bluetooth is disabled" -msgstr "Bluetooth is disabled" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:475 -msgid "Bluetooth is disabled by hardware switch" -msgstr "Bluetooth is disabled by hardware switch" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:479 -msgid "No Bluetooth adapters found" -msgstr "No Bluetooth adapters found" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:578 -msgid "Visibility" -msgstr "Visibility" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:582 -#, c-format -msgid "Visibility of “%s”" -msgstr "Visibility of “%s”" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:626 -#, c-format -msgid "Remove '%s' from the list of devices?" -msgstr "Remove ‘%s’ from the list of devices?" - -#: ../panels/bluetooth/cc-bluetooth-panel.c:628 -msgid "" -"If you remove the device, you will have to set it up again before next use." -msgstr "" -"If you remove the device, you will have to set it up again before next use." - -#: ../panels/bluetooth/cc-bluetooth-panel.c:632 -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 -msgid "_Remove" -msgstr "_Remove" - -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -msgid "Bluetooth" -msgstr "Bluetooth" +#: ../panels/bluetooth/cc-bluetooth-panel.c:264 +msgid "Turn Off Airplane Mode" +msgstr "Turn Off Aeroplane Mode" + +#: ../panels/bluetooth/cc-bluetooth-panel.c:330 +msgid "No Bluetooth Found" +msgstr "No Bluetooth Found" + +#: ../panels/bluetooth/cc-bluetooth-panel.c:330 +msgid "Plug in a dongle to use Bluetooth." +msgstr "Plug in a dongle to use Bluetooth." + +#: ../panels/bluetooth/cc-bluetooth-panel.c:331 +msgid "Bluetooth Turned Off" +msgstr "Bluetooth Turned Off" + +#: ../panels/bluetooth/cc-bluetooth-panel.c:331 +msgid "Turn on to connect devices and receive file transfers." +msgstr "Turn on to connect devices and receive file transfers." + +#: ../panels/bluetooth/cc-bluetooth-panel.c:332 +msgid "Airplane Mode is on" +msgstr "Aeroplane Mode is on" + +#: ../panels/bluetooth/cc-bluetooth-panel.c:332 +msgid "Bluetooth is disabled when airplane mode is on." +msgstr "Bluetooth is disabled when aeroplane mode is on." + +#: ../panels/bluetooth/cc-bluetooth-panel.c:333 +msgid "Hardware Airplane Mode is on" +msgstr "Hardware Aeroplane Mode is on" + +#: ../panels/bluetooth/cc-bluetooth-panel.c:333 +msgid "Turn off the Airplane mode switch to enable Bluetooth." +msgstr "Turn off the Aeroplane mode switch to enable Bluetooth." +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Turn Bluetooth on and off and connect your devices" +#. Translators: those are keywords for the bluetooth control-center panel +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 +msgid "share;sharing;bluetooth;obex;" +msgstr "share;sharing;bluetooth;obex;" + #. TRANSLATORS: The user has to attach the sensor to the screen -#: ../panels/color/cc-color-calibrate.c:360 +#: ../panels/color/cc-color-calibrate.c:361 msgid "Place your calibration device over the square and press 'Start'" msgstr "Place your calibration device over the square and press ‘Start’" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... -#: ../panels/color/cc-color-calibrate.c:366 +#: ../panels/color/cc-color-calibrate.c:367 msgid "" "Move your calibration device to the calibrate position and press 'Continue'" msgstr "" @@ -285,7 +237,7 @@ #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... -#: ../panels/color/cc-color-calibrate.c:372 +#: ../panels/color/cc-color-calibrate.c:373 msgid "" "Move your calibration device to the surface position and press 'Continue'" msgstr "" @@ -294,54 +246,54 @@ #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor #. * is built into the palmrest and we need to fullscreen the #. * sample widget and shut the lid. -#: ../panels/color/cc-color-calibrate.c:378 +#: ../panels/color/cc-color-calibrate.c:379 msgid "Shut the laptop lid" msgstr "Shut the laptop lid" #. TRANSLATORS: We suck, the calibation failed and we have no #. * good idea why or any suggestions -#: ../panels/color/cc-color-calibrate.c:409 +#: ../panels/color/cc-color-calibrate.c:410 msgid "An internal error occurred that could not be recovered." msgstr "An internal error occurred that could not be recovered." #. TRANSLATORS: Some required-at-runtime tools were not #. * installed, which should only affect insane distros -#: ../panels/color/cc-color-calibrate.c:414 +#: ../panels/color/cc-color-calibrate.c:415 msgid "Tools required for calibration are not installed." msgstr "Tools required for calibration are not installed." #. TRANSLATORS: The profile failed for some reason -#: ../panels/color/cc-color-calibrate.c:420 +#: ../panels/color/cc-color-calibrate.c:421 msgid "The profile could not be generated." msgstr "The profile could not be generated." #. TRANSLATORS: The user specified a whitepoint that was #. * unobtainable with the hardware they've got -- see #. * https://en.wikipedia.org/wiki/White_point for details -#: ../panels/color/cc-color-calibrate.c:426 +#: ../panels/color/cc-color-calibrate.c:427 msgid "The target whitepoint was not obtainable." msgstr "The target whitepoint was not obtainable." #. TRANSLATORS: the display calibration process is finished -#: ../panels/color/cc-color-calibrate.c:466 +#: ../panels/color/cc-color-calibrate.c:467 msgid "Complete!" msgstr "Complete!" #. TRANSLATORS: the display calibration failed, and we also show #. * the translated (or untranslated) error string after this -#: ../panels/color/cc-color-calibrate.c:474 +#: ../panels/color/cc-color-calibrate.c:475 msgid "Calibration failed!" msgstr "Calibration failed!" #. TRANSLATORS: The user can now remove the sensor from the screen -#: ../panels/color/cc-color-calibrate.c:481 +#: ../panels/color/cc-color-calibrate.c:482 msgid "You can remove the calibration device." msgstr "You can remove the calibration device." #. TRANSLATORS: The user has to be careful not to knock the #. * display off the screen (although we do cope if this is #. * detected early enough) -#: ../panels/color/cc-color-calibrate.c:552 +#: ../panels/color/cc-color-calibrate.c:553 msgid "Do not disturb the calibration device while in progress" msgstr "Do not disturb the calibration device while in progress" @@ -397,54 +349,54 @@ msgstr "Show colour profiles for %s" #. not calibrated -#: ../panels/color/cc-color-device.c:322 +#: ../panels/color/cc-color-device.c:323 msgid "Not calibrated" msgstr "Not calibrated" #. TRANSLATORS: this is a profile prefix to signify the #. * profile has been auto-generated for this hardware -#: ../panels/color/cc-color-panel.c:135 +#: ../panels/color/cc-color-panel.c:141 msgid "Default: " msgstr "Default: " #. TRANSLATORS: this is a profile prefix to signify the #. * profile his a standard space like AdobeRGB -#: ../panels/color/cc-color-panel.c:143 +#: ../panels/color/cc-color-panel.c:149 msgid "Colorspace: " msgstr "Colourspace: " #. TRANSLATORS: this is a profile prefix to signify the #. * profile is a test profile -#: ../panels/color/cc-color-panel.c:150 +#: ../panels/color/cc-color-panel.c:156 msgid "Test profile: " msgstr "Test profile: " #. TRANSLATORS: an ICC profile is a file containing colorspace data -#: ../panels/color/cc-color-panel.c:218 +#: ../panels/color/cc-color-panel.c:223 msgid "Select ICC Profile File" msgstr "Select ICC Profile File" -#: ../panels/color/cc-color-panel.c:221 +#: ../panels/color/cc-color-panel.c:226 msgid "_Import" msgstr "_Import" #. TRANSLATORS: filter name on the file->open dialog -#: ../panels/color/cc-color-panel.c:232 +#: ../panels/color/cc-color-panel.c:237 msgid "Supported ICC profiles" msgstr "Supported ICC profiles" #. TRANSLATORS: filter name on the file->open dialog -#: ../panels/color/cc-color-panel.c:239 -#: ../panels/network/wireless-security/eap-method-fast.c:410 +#: ../panels/color/cc-color-panel.c:244 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "All files" -#: ../panels/color/cc-color-panel.c:586 +#: ../panels/color/cc-color-panel.c:583 msgid "Screen" msgstr "Screen" #. TRANSLATORS: this is when the upload of the profile failed -#: ../panels/color/cc-color-panel.c:912 +#: ../panels/color/cc-color-panel.c:908 #, c-format msgid "Failed to upload file: %s" msgstr "Failed to upload file: %s" @@ -452,39 +404,39 @@ #. TRANSLATORS: these are instructions on how to recover #. * the ICC profile on the native operating system and are #. * only shown when the user uses a LiveCD to calibrate -#: ../panels/color/cc-color-panel.c:926 +#: ../panels/color/cc-color-panel.c:922 msgid "The profile has been uploaded to:" msgstr "The profile has been uploaded to:" -#: ../panels/color/cc-color-panel.c:928 +#: ../panels/color/cc-color-panel.c:924 msgid "Write down this URL." msgstr "Write down this URL." -#: ../panels/color/cc-color-panel.c:929 +#: ../panels/color/cc-color-panel.c:925 msgid "Restart this computer and boot your normal operating system." msgstr "Restart this computer and boot your normal operating system." -#: ../panels/color/cc-color-panel.c:930 +#: ../panels/color/cc-color-panel.c:926 msgid "Type the URL into your browser to download and install the profile." msgstr "Type the URL into your browser to download and install the profile." #. TRANSLATORS: this is the dialog to save the ICC profile -#: ../panels/color/cc-color-panel.c:964 +#: ../panels/color/cc-color-panel.c:960 msgid "Save Profile" msgstr "Save Profile" -#: ../panels/color/cc-color-panel.c:968 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/color/cc-color-panel.c:964 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Save" #. TRANSLATORS: this is when the button is sensitive -#: ../panels/color/cc-color-panel.c:1328 +#: ../panels/color/cc-color-panel.c:1324 msgid "Create a color profile for the selected device" msgstr "Create a colour profile for the selected device" #. TRANSLATORS: this is when the button is insensitive -#: ../panels/color/cc-color-panel.c:1343 ../panels/color/cc-color-panel.c:1367 +#: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363 msgid "" "The measuring instrument is not detected. Please check it is turned on and " "correctly connected." @@ -493,24 +445,24 @@ "correctly connected." #. TRANSLATORS: this is when the button is insensitive -#: ../panels/color/cc-color-panel.c:1377 +#: ../panels/color/cc-color-panel.c:1373 msgid "The measuring instrument does not support printer profiling." msgstr "The measuring instrument does not support printer profiling." #. TRANSLATORS: this is when the button is insensitive -#: ../panels/color/cc-color-panel.c:1388 +#: ../panels/color/cc-color-panel.c:1384 msgid "The device type is not currently supported." msgstr "The device type is not currently supported." #. TRANSLATORS: standard spaces are well known colorspaces like #. * sRGB, AdobeRGB and ProPhotoRGB -#: ../panels/color/cc-color-profile.c:102 +#: ../panels/color/cc-color-profile.c:103 msgid "Standard Space" msgstr "Standard Space" #. TRANSLATORS: test profiles do things like changing the screen #. * a different color, or swap the red and green channels -#: ../panels/color/cc-color-profile.c:108 +#: ../panels/color/cc-color-profile.c:109 msgid "Test Profile" msgstr "Test Profile" @@ -518,7 +470,7 @@ #. * by the color management system based on manufacturing data, #. * for instance the default monitor profile is created from the #. * primaries specified in the monitor EDID -#: ../panels/color/cc-color-profile.c:116 +#: ../panels/color/cc-color-profile.c:117 msgctxt "Automatically generated profile" msgid "Automatic" msgstr "Automatic" @@ -526,13 +478,13 @@ #. TRANSLATORS: the profile quality - low quality profiles take #. * much less time to generate but may be a poor reflection of the #. * device capability -#: ../panels/color/cc-color-profile.c:126 +#: ../panels/color/cc-color-profile.c:127 msgctxt "Profile quality" msgid "Low Quality" msgstr "Low Quality" #. TRANSLATORS: the profile quality -#: ../panels/color/cc-color-profile.c:131 +#: ../panels/color/cc-color-profile.c:132 msgctxt "Profile quality" msgid "Medium Quality" msgstr "Medium Quality" @@ -540,41 +492,41 @@ #. TRANSLATORS: the profile quality - high quality profiles take #. * a *long* time, and have the best calibration and #. * characterisation data. -#: ../panels/color/cc-color-profile.c:138 +#: ../panels/color/cc-color-profile.c:139 msgctxt "Profile quality" msgid "High Quality" msgstr "High Quality" #. TRANSLATORS: this default RGB space is used for printers that #. * do not have additional printer profiles specified in the PPD -#: ../panels/color/cc-color-profile.c:155 +#: ../panels/color/cc-color-profile.c:156 msgctxt "Colorspace fallback" msgid "Default RGB" msgstr "Default RGB" #. TRANSLATORS: this default CMYK space is used for printers that #. * do not have additional printer profiles specified in the PPD -#: ../panels/color/cc-color-profile.c:162 +#: ../panels/color/cc-color-profile.c:163 msgctxt "Colorspace fallback" msgid "Default CMYK" msgstr "Default CMYK" #. TRANSLATORS: this default gray space is used for printers that #. * do not have additional printer profiles specified in the PPD -#: ../panels/color/cc-color-profile.c:169 +#: ../panels/color/cc-color-profile.c:170 msgctxt "Colorspace fallback" msgid "Default Gray" msgstr "Default Grey" -#: ../panels/color/cc-color-profile.c:193 +#: ../panels/color/cc-color-profile.c:194 msgid "Vendor supplied factory calibration data" msgstr "Vendor supplied factory calibration data" -#: ../panels/color/cc-color-profile.c:202 +#: ../panels/color/cc-color-profile.c:203 msgid "Full-screen display correction not possible with this profile" msgstr "Full-screen display correction not possible with this profile" -#: ../panels/color/cc-color-profile.c:224 +#: ../panels/color/cc-color-profile.c:225 msgid "This profile may no longer be accurate" msgstr "This profile may no longer be accurate" @@ -582,34 +534,28 @@ msgid "Display Calibration" msgstr "Display Calibration" -#: ../panels/color/color-calibrate.ui.h:2 -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -#: ../panels/user-accounts/data/photo-dialog.ui.h:8 -#: ../panels/user-accounts/um-account-dialog.c:1470 -msgid "Cancel" -msgstr "Cancel" - #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -msgid "Start" -msgstr "Start" +msgid "_Start" +msgstr "_Start" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -msgid "Resume" -msgstr "Resume" +msgid "_Resume" +msgstr "_Resume" #. This button returns the user back to the color control panel #: ../panels/color/color-calibrate.ui.h:8 -msgid "Done" -msgstr "Done" +#: ../panels/common/language-chooser.ui.h:2 +#: ../panels/region/format-chooser.ui.h:2 +msgid "_Done" +msgstr "_Done" #. Timeout parameters -#. 5000 = 5 sec +#. 15000 = 15 sec #. 750 = 0.75 sec #. Text printed on screen -#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:81 +#: ../panels/color/color.ui.h:1 ../panels/wacom/calibrator/calibrator-gui.c:82 msgid "Screen Calibration" msgstr "Screen Calibration" @@ -738,15 +684,27 @@ "\">Microsoft Windows systems useful." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:742 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Summary" #: ../panels/color/color.ui.h:28 -msgid "Import File…" -msgstr "Import File…" +msgid "Add profile" +msgstr "Add profile" #: ../panels/color/color.ui.h:29 +msgid "_Import File…" +msgstr "_Import File…" + +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 +#: ../panels/printers/new-printer-dialog.ui.h:3 +#: ../panels/region/input-chooser.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 +msgid "_Add" +msgstr "_Add" + +#: ../panels/color/color.ui.h:32 msgid "" "Problems detected. The profile may not work correctly. Show " "details." @@ -754,205 +712,165 @@ "Problems detected. The profile may not work correctly. Show " "details." -#: ../panels/color/color.ui.h:30 -msgid "Device type:" -msgstr "Device type:" - -#: ../panels/color/color.ui.h:31 -msgid "Manufacturer:" -msgstr "Manufacturer:" - -#: ../panels/color/color.ui.h:32 -msgid "Model:" -msgstr "Model:" - #: ../panels/color/color.ui.h:33 -msgid "" -"Image files can be dragged on this window to auto-complete the above fields." -msgstr "" -"Image files can be dragged on this window to auto-complete the above fields." - -#: ../panels/color/color.ui.h:34 -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Colour" - -#: ../panels/color/color.ui.h:35 msgid "Each device needs an up to date color profile to be color managed." msgstr "Each device needs an up to date colour profile to be colour managed." -#: ../panels/color/color.ui.h:36 +#: ../panels/color/color.ui.h:34 msgid "Learn more" msgstr "Learn more" -#: ../panels/color/color.ui.h:37 +#: ../panels/color/color.ui.h:35 msgid "Learn more about color management" msgstr "Learn more about colour management" -#: ../panels/color/color.ui.h:38 -msgid "Set for all users" -msgstr "Set for all users" +#: ../panels/color/color.ui.h:36 +msgid "_Set for all users" +msgstr "_Set for all users" -#: ../panels/color/color.ui.h:39 +#: ../panels/color/color.ui.h:37 msgid "Set this profile for all users on this computer" msgstr "Set this profile for all users on this computer" +#: ../panels/color/color.ui.h:38 +msgid "_Enable" +msgstr "_Enable" + +#: ../panels/color/color.ui.h:39 +msgid "_Add profile" +msgstr "_Add profile" + #: ../panels/color/color.ui.h:40 -msgid "Enable" -msgstr "Enable" +msgid "_Calibrate…" +msgstr "_Calibrate…" #: ../panels/color/color.ui.h:41 -msgid "Add profile" -msgstr "Add profile" +msgid "Calibrate the device" +msgstr "Calibrate the device" #: ../panels/color/color.ui.h:42 -#: ../panels/wacom/gnome-wacom-properties.ui.h:10 -msgid "Calibrate…" -msgstr "Calibrate…" +msgid "_Remove profile" +msgstr "_Remove profile" #: ../panels/color/color.ui.h:43 -msgid "Calibrate the device" -msgstr "Calibrate the device" +msgid "_View details" +msgstr "_View details" #: ../panels/color/color.ui.h:44 -msgid "Remove profile" -msgstr "Remove profile" - -#: ../panels/color/color.ui.h:45 -msgid "View details" -msgstr "View details" - -#: ../panels/color/color.ui.h:46 msgid "Unable to detect any devices that can be color managed" msgstr "Unable to detect any devices that can be colour managed" -#: ../panels/color/color.ui.h:47 +#: ../panels/color/color.ui.h:45 msgid "LCD" msgstr "LCD" -#: ../panels/color/color.ui.h:48 +#: ../panels/color/color.ui.h:46 msgid "LED" msgstr "LED" -#: ../panels/color/color.ui.h:49 +#: ../panels/color/color.ui.h:47 msgid "CRT" msgstr "CRT" -#: ../panels/color/color.ui.h:50 +#: ../panels/color/color.ui.h:48 msgid "Projector" msgstr "Projector" -#: ../panels/color/color.ui.h:51 +#: ../panels/color/color.ui.h:49 msgid "Plasma" msgstr "Plasma" -#: ../panels/color/color.ui.h:52 +#: ../panels/color/color.ui.h:50 msgid "LCD (CCFL backlight)" msgstr "LCD (CCFL backlight)" -#: ../panels/color/color.ui.h:53 +#: ../panels/color/color.ui.h:51 msgid "LCD (RGB LED backlight)" msgstr "LCD (RGB LED backlight)" -#: ../panels/color/color.ui.h:54 +#: ../panels/color/color.ui.h:52 msgid "LCD (white LED backlight)" msgstr "LCD (white LED backlight)" -#: ../panels/color/color.ui.h:55 +#: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" msgstr "Wide gamut LCD (CCFL backlight)" -#: ../panels/color/color.ui.h:56 +#: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" msgstr "Wide gamut LCD (RGB LED backlight)" -#: ../panels/color/color.ui.h:57 +#: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" msgid "High" msgstr "High" -#: ../panels/color/color.ui.h:58 +#: ../panels/color/color.ui.h:56 msgid "40 minutes" msgstr "40 minutes" -#: ../panels/color/color.ui.h:59 +#: ../panels/color/color.ui.h:57 msgctxt "Calibration quality" msgid "Medium" msgstr "Medium" -#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:4 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 #: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "30 minutes" -#: ../panels/color/color.ui.h:61 +#: ../panels/color/color.ui.h:59 msgctxt "Calibration quality" msgid "Low" msgstr "Low" -#: ../panels/color/color.ui.h:62 ../panels/power/power.ui.h:3 +#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1 msgid "15 minutes" msgstr "15 minutes" -#: ../panels/color/color.ui.h:63 +#: ../panels/color/color.ui.h:61 msgid "Native to display" msgstr "Native to display" -#: ../panels/color/color.ui.h:64 +#: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" msgstr "D50 (Printing and publishing)" -#: ../panels/color/color.ui.h:65 +#: ../panels/color/color.ui.h:63 msgid "D55" msgstr "D55" -#: ../panels/color/color.ui.h:66 +#: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" msgstr "D65 (Photography and graphics)" -#: ../panels/color/color.ui.h:67 +#: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Colour" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibrate the colour of your devices, such as displays, cameras or printers" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Colour;ICC;Profile;Calibrate;Printer;Display;" -#. Add some common regions -#: ../panels/common/cc-common-language.c:685 -msgid "United States" -msgstr "United States" - -#: ../panels/common/cc-common-language.c:686 -msgid "Germany" -msgstr "Germany" - -#: ../panels/common/cc-common-language.c:687 -msgid "France" -msgstr "France" - -#: ../panels/common/cc-common-language.c:688 -msgid "Spain" -msgstr "Spain" - -#: ../panels/common/cc-common-language.c:689 -msgid "China" -msgstr "China" - -#: ../panels/common/cc-common-language.c:759 +#: ../panels/common/cc-common-language.c:323 msgid "Other…" msgstr "Other…" -#: ../panels/common/cc-language-chooser.c:123 -#: ../panels/region/cc-format-chooser.c:268 -#: ../panels/region/cc-input-chooser.c:172 +#: ../panels/common/cc-language-chooser.c:124 +#: ../panels/region/cc-format-chooser.c:271 +#: ../panels/region/cc-input-chooser.c:169 msgid "More…" msgstr "More…" @@ -960,41 +878,94 @@ msgid "No languages found" msgstr "No languages found" -#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 +msgid "Today" +msgstr "Today" + +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 +msgid "Yesterday" +msgstr "Yesterday" + +#. Translators: This is a date format string in the style of "Feb 24". +#: ../panels/common/cc-util.c:138 +msgid "%b %e" +msgstr "%e %b" + +#. Translators: This is a date format string in the style of "Feb 24, 2013". +#: ../panels/common/cc-util.c:143 +msgid "%b %e, %Y" +msgstr "%e %b, %Y" + +#: ../panels/common/language-chooser.ui.h:1 msgid "Language" msgstr "Language" -#: ../panels/common/language-chooser.ui.h:2 -#: ../panels/mouse/cc-mouse-panel.c:120 ../panels/region/format-chooser.ui.h:2 -msgid "_Done" -msgstr "_Done" +#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1 +#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1 +msgid "Day" +msgstr "Day" + +#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2 +#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2 +msgid "Month" +msgstr "Month" + +#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3 +#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3 +msgid "Year" +msgstr "Year" #. Translators: This is the full date and time format used in 12-hour mode. -#: ../panels/datetime/cc-datetime-panel.c:328 +#: ../panels/datetime/cc-datetime-panel.c:340 msgid "%e %B %Y, %l:%M %p" msgstr "%e %B %Y, %l:%M %p" #. Translators: This is the full date and time format used in 24-hour mode. -#: ../panels/datetime/cc-datetime-panel.c:333 +#: ../panels/datetime/cc-datetime-panel.c:345 msgid "%e %B %Y, %R" msgstr "%e %B %Y, %R" +#. Translators: "city, country" +#: ../panels/datetime/cc-datetime-panel.c:523 +#, c-format +msgctxt "timezone loc" +msgid "%s, %s" +msgstr "%s, %s" + +#. Update the timezone on the listbow row +#. Translators: "timezone (details)" +#: ../panels/datetime/cc-datetime-panel.c:553 +#, c-format +msgctxt "timezone desc" +msgid "%s (%s)" +msgstr "%s (%s)" + #. Translators: UTC here means the Coordinated Universal Time. #. * %:::z will be replaced by the offset from UTC e.g. UTC+02 -#: ../panels/datetime/cc-datetime-panel.c:549 +#: ../panels/datetime/cc-datetime-panel.c:561 msgid "UTC%:::z" msgstr "UTC%:::z" #. Translators: This is the time format used in 12-hour mode. -#: ../panels/datetime/cc-datetime-panel.c:554 +#: ../panels/datetime/cc-datetime-panel.c:566 msgid "%l:%M %p" msgstr "%H:%M" #. Translators: This is the time format used in 24-hour mode. -#: ../panels/datetime/cc-datetime-panel.c:559 +#: ../panels/datetime/cc-datetime-panel.c:571 msgid "%R" msgstr "%R" +#. Update the text bubble in the timezone map +#. Translators: "timezone (utc shift)" +#: ../panels/datetime/cc-datetime-panel.c:576 +#, c-format +msgctxt "timezone map" +msgid "%s (%s)" +msgstr "%s (%s)" + #: ../panels/datetime/datetime.ui.h:1 msgid "January" msgstr "January" @@ -1043,8 +1014,9 @@ msgid "December" msgstr "December" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Date & Time" @@ -1062,67 +1034,51 @@ msgstr "Minute" #: ../panels/datetime/datetime.ui.h:18 -msgid "Switch between AM and PM." -msgstr "Switch between AM and PM." - -#: ../panels/datetime/datetime.ui.h:19 -msgid "Day" -msgstr "Day" - -#: ../panels/datetime/datetime.ui.h:20 -msgid "Month" -msgstr "Month" - -#: ../panels/datetime/datetime.ui.h:21 -msgid "Year" -msgstr "Year" - -#: ../panels/datetime/datetime.ui.h:22 msgid "Time Zone" msgstr "Time Zone" -#: ../panels/datetime/datetime.ui.h:23 +#: ../panels/datetime/datetime.ui.h:19 msgid "Search for a city" msgstr "Search for a city" -#: ../panels/datetime/datetime.ui.h:24 +#: ../panels/datetime/datetime.ui.h:20 msgid "Automatic _Date & Time" msgstr "Automatic _Date & Time" -#: ../panels/datetime/datetime.ui.h:25 +#: ../panels/datetime/datetime.ui.h:21 msgid "Requires internet access" msgstr "Requires internet access" -#: ../panels/datetime/datetime.ui.h:26 +#: ../panels/datetime/datetime.ui.h:22 msgid "Automatic Time _Zone" msgstr "Automatic Time _Zone" -#: ../panels/datetime/datetime.ui.h:27 +#: ../panels/datetime/datetime.ui.h:23 msgid "Date & _Time" msgstr "Date & _Time" -#: ../panels/datetime/datetime.ui.h:28 -msgid "Time _Zone" -msgstr "Time _Zone" +#: ../panels/datetime/datetime.ui.h:24 +msgid "Time Z_one" +msgstr "Time Z_one" -#: ../panels/datetime/datetime.ui.h:29 +#: ../panels/datetime/datetime.ui.h:25 msgid "Time _Format" msgstr "Time _Format" -#: ../panels/datetime/datetime.ui.h:30 +#: ../panels/datetime/datetime.ui.h:26 msgid "24-hour" msgstr "24-hour" -#: ../panels/datetime/datetime.ui.h:31 +#: ../panels/datetime/datetime.ui.h:27 msgid "AM / PM" msgstr "AM/PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Change the date and time, including time zone" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Clock;Timezone;Location;" @@ -1134,199 +1090,222 @@ msgid "To change time or date settings, you need to authenticate." msgstr "To change time or date settings, you need to authenticate." -#: ../panels/display/cc-display-panel.c:458 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Lid Closed" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:461 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Mirrored" -#: ../panels/display/cc-display-panel.c:463 -#: ../panels/display/cc-display-panel.c:1914 -#: ../panels/display/display-capplet.ui.h:1 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primary" -#: ../panels/display/cc-display-panel.c:465 -#: ../panels/notifications/cc-notifications-panel.c:205 -#: ../panels/power/cc-power-panel.c:1745 ../panels/power/cc-power-panel.c:1756 -#: ../panels/privacy/cc-privacy-panel.c:77 -#: ../panels/privacy/cc-privacy-panel.c:117 -#: ../panels/universal-access/cc-ua-panel.c:253 -#: ../panels/universal-access/cc-ua-panel.c:573 -#: ../panels/universal-access/cc-ua-panel.c:699 +#: ../panels/display/cc-display-panel.c:580 +#: ../panels/notifications/cc-notifications-panel.c:257 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 +#: ../panels/universal-access/cc-ua-panel.c:269 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Off" -#: ../panels/display/cc-display-panel.c:468 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secondary" -#: ../panels/display/cc-display-panel.c:1382 +#. Title of displays dialog when multiple monitors are present. +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Arrange Combined Displays" -#: ../panels/display/cc-display-panel.c:1386 -#: ../panels/display/cc-display-panel.c:1784 -#: ../panels/network/connection-editor/connection-editor.ui.h:1 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 +#: ../panels/network/connection-editor/connection-editor.ui.h:2 +#: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Apply" -#: ../panels/display/cc-display-panel.c:1406 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Drag displays to rearrange them" -#. size -#: ../panels/display/cc-display-panel.c:1848 +#. translators: example string is "60 Hz (NTSC)" +#. * NTSC is https://en.wikipedia.org/wiki/NTSC +#: ../panels/display/cc-display-panel.c:1793 +#, c-format +msgid "%d Hz (NTSC)" +msgstr "%d Hz (NTSC)" + +#. translators: example string is "60 Hz" +#: ../panels/display/cc-display-panel.c:1799 +#, c-format +msgid "%d Hz" +msgstr "%d Hz" + +#: ../panels/display/cc-display-panel.c:2259 +msgid "Rotate counterclockwise by 90°" +msgstr "Rotate anticlockwise by 90°" + +#: ../panels/display/cc-display-panel.c:2277 +msgid "Rotate by 180°" +msgstr "Rotate by 180°" + +#: ../panels/display/cc-display-panel.c:2295 +msgid "Rotate clockwise by 90°" +msgstr "Rotate clockwise by 90°" + +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Size" #. aspect ratio -#: ../panels/display/cc-display-panel.c:1863 -#: ../panels/display/display-capplet.ui.h:12 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Aspect Ratio" -#: ../panels/display/cc-display-panel.c:1884 -#: ../panels/display/display-capplet.ui.h:13 -#: ../panels/printers/pp-options-dialog.c:86 +#: ../panels/display/cc-display-panel.c:2354 +#: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolution" -#: ../panels/display/cc-display-panel.c:1915 -#: ../panels/display/display-capplet.ui.h:2 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Adjust for TV" + +#: ../panels/display/cc-display-panel.c:2398 +msgid "Refresh Rate" +msgstr "Refresh Rate" + +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Show the top bar and Activities Overview on this display" -#: ../panels/display/cc-display-panel.c:1921 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Secondary Display" -#: ../panels/display/cc-display-panel.c:1922 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Join this display with another to create an extra workspace" -#: ../panels/display/cc-display-panel.c:1929 -#: ../panels/display/display-capplet.ui.h:3 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentation" -#: ../panels/display/cc-display-panel.c:1930 -#: ../panels/display/display-capplet.ui.h:4 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Show slideshows and media only" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:1935 -#: ../panels/display/display-capplet.ui.h:5 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Mirror" -#: ../panels/display/cc-display-panel.c:1936 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Show your existing view on both displays" -#: ../panels/display/cc-display-panel.c:2138 -msgid "Could not get screen information" -msgstr "Could not get screen information" - -#: ../panels/display/cc-display-panel.c:2169 -msgid "_Arrange Combined Displays" -msgstr "_Arrange Combined Displays" - -#: ../panels/display/display-capplet.ui.h:6 -msgid "Show your primary display on this screen also" -msgstr "Show your primary display on this screen also" - -#: ../panels/display/display-capplet.ui.h:7 -msgid "Combine" -msgstr "Combine" - -#: ../panels/display/display-capplet.ui.h:8 -msgid "Join with the primary display to create an extra space" -msgstr "Join with the primary display to create an extra space" - -#: ../panels/display/display-capplet.ui.h:9 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Turn Off" -#: ../panels/display/display-capplet.ui.h:10 -msgid "Don't use the display" -msgstr "Don’t use the display" - -#: ../panels/display/display-capplet.ui.h:11 -#: ../panels/printers/printers.ui.h:12 -msgid "Model" -msgstr "Model" +#: ../panels/display/cc-display-panel.c:2458 +msgid "Don't use this display" +msgstr "Don't use this display" -#: ../panels/display/display-capplet.ui.h:14 -msgid "Refresh Rate" -msgstr "Refresh Rate" +#: ../panels/display/cc-display-panel.c:2769 +msgid "Could not get screen information" +msgstr "Could not get screen information" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Displays" +#: ../panels/display/cc-display-panel.c:2800 +msgid "_Arrange Combined Displays" +msgstr "_Arrange Combined Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Dis­plays" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Choose how to use connected monitors and projectors" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 -msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;" -msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;" +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 +msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" +msgstr "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" + +#: ../panels/info/cc-info-panel.c:345 +msgid "Wayland" +msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:450 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Unknown" -#: ../panels/info/cc-info-panel.c:532 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (Build ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (Build ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:534 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1214 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Ask what to do" -#: ../panels/info/cc-info-panel.c:1218 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Do nothing" -#: ../panels/info/cc-info-panel.c:1222 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Open folder" -#: ../panels/info/cc-info-panel.c:1313 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Other Media" -#: ../panels/info/cc-info-panel.c:1344 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Select an application for audio CDs" -#: ../panels/info/cc-info-panel.c:1345 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Select an application for video DVDs" -#: ../panels/info/cc-info-panel.c:1346 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Select an application to run when a music player is connected" -#: ../panels/info/cc-info-panel.c:1347 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Select an application to run when a camera is connected" -#: ../panels/info/cc-info-panel.c:1348 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Select an application for software CDs" @@ -1335,104 +1314,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1360 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "audio DVD" -#: ../panels/info/cc-info-panel.c:1361 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "blank Blu-ray disc" -#: ../panels/info/cc-info-panel.c:1362 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "blank CD disc" -#: ../panels/info/cc-info-panel.c:1363 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "blank DVD disc" -#: ../panels/info/cc-info-panel.c:1364 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "blank HD DVD disc" -#: ../panels/info/cc-info-panel.c:1365 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray video disc" -#: ../panels/info/cc-info-panel.c:1366 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-book reader" -#: ../panels/info/cc-info-panel.c:1367 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD video disc" -#: ../panels/info/cc-info-panel.c:1368 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1369 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1370 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1371 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows software" -#: ../panels/info/cc-info-panel.c:1372 -msgid "Software" -msgstr "Software" - -#: ../panels/info/cc-info-panel.c:1495 -#: ../panels/keyboard/keyboard-shortcuts.c:1696 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Section" -#: ../panels/info/cc-info-panel.c:1504 ../panels/info/info.ui.h:13 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Overview" -#: ../panels/info/cc-info-panel.c:1510 ../panels/info/info.ui.h:20 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Default Applications" -#: ../panels/info/cc-info-panel.c:1515 ../panels/info/info.ui.h:28 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Removable Media" -#: ../panels/info/cc-info-panel.c:1540 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/cc-info-panel.c:1590 -msgid "Install Updates" -msgstr "Install Updates" - -#: ../panels/info/cc-info-panel.c:1594 -msgid "System Up-To-Date" -msgstr "System Up-To-Date" - -#: ../panels/info/cc-info-panel.c:1598 -msgid "Checking for Updates" -msgstr "Checking for Updates" - -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:44 -msgid "Details" -msgstr "Details" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "De­tails" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "View information about your system" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1485,55 +1446,59 @@ msgid "Virtualization" msgstr "Virtualisation" -#: ../panels/info/info.ui.h:14 +#: ../panels/info/info.ui.h:13 +msgid "Check for updates" +msgstr "Check for updates" + +#: ../panels/info/info.ui.h:15 msgid "_Web" msgstr "_Web" -#: ../panels/info/info.ui.h:15 +#: ../panels/info/info.ui.h:16 msgid "_Mail" msgstr "_Mail" -#: ../panels/info/info.ui.h:16 +#: ../panels/info/info.ui.h:17 msgid "_Calendar" msgstr "_Calendar" -#: ../panels/info/info.ui.h:17 +#: ../panels/info/info.ui.h:18 msgid "M_usic" msgstr "M_usic" -#: ../panels/info/info.ui.h:18 +#: ../panels/info/info.ui.h:19 msgid "_Video" msgstr "_Video" -#: ../panels/info/info.ui.h:19 +#: ../panels/info/info.ui.h:20 msgid "_Photos" msgstr "_Photos" -#: ../panels/info/info.ui.h:21 +#: ../panels/info/info.ui.h:22 msgid "Select how media should be handled" msgstr "Select how media should be handled" -#: ../panels/info/info.ui.h:22 +#: ../panels/info/info.ui.h:23 msgid "CD _audio" msgstr "CD _audio" -#: ../panels/info/info.ui.h:23 +#: ../panels/info/info.ui.h:24 msgid "_DVD video" msgstr "_DVD video" -#: ../panels/info/info.ui.h:24 +#: ../panels/info/info.ui.h:25 msgid "_Music player" msgstr "_Music player" -#: ../panels/info/info.ui.h:25 +#: ../panels/info/info.ui.h:26 msgid "_Software" msgstr "_Software" -#: ../panels/info/info.ui.h:26 +#: ../panels/info/info.ui.h:27 msgid "_Other Media…" msgstr "_Other Media…" -#: ../panels/info/info.ui.h:27 +#: ../panels/info/info.ui.h:28 msgid "_Never prompt or start programs on media insertion" msgstr "_Never prompt or start programs on media insertion" @@ -1582,7 +1547,6 @@ msgstr "Eject" #: ../panels/keyboard/01-input-sources.xml.in.h:1 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:19 #: ../panels/universal-access/uap.ui.h:11 msgid "Typing" msgstr "Typing" @@ -1603,23 +1567,29 @@ msgid "Launch help browser" msgstr "Launch help browser" -#: ../panels/keyboard/01-launchers.xml.in.h:3 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 +msgid "Settings" +msgstr "Settings" + +#: ../panels/keyboard/01-launchers.xml.in.h:4 msgid "Launch calculator" msgstr "Launch calculator" -#: ../panels/keyboard/01-launchers.xml.in.h:4 +#: ../panels/keyboard/01-launchers.xml.in.h:5 msgid "Launch email client" msgstr "Launch e-mail client" -#: ../panels/keyboard/01-launchers.xml.in.h:5 +#: ../panels/keyboard/01-launchers.xml.in.h:6 msgid "Launch web browser" msgstr "Launch web browser" -#: ../panels/keyboard/01-launchers.xml.in.h:6 +#: ../panels/keyboard/01-launchers.xml.in.h:7 msgid "Home folder" msgstr "Home folder" -#: ../panels/keyboard/01-launchers.xml.in.h:7 +#: ../panels/keyboard/01-launchers.xml.in.h:8 msgctxt "keybinding" msgid "Search" msgstr "Search" @@ -1672,7 +1642,6 @@ msgstr "Lock screen" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Universal Access" @@ -1708,15 +1677,24 @@ msgid "High contrast on or off" msgstr "High contrast on or off" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Custom Shortcuts" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled -#: ../panels/keyboard/cc-keyboard-option.c:271 -#: ../panels/keyboard/cc-keyboard-option.c:390 -#: ../panels/keyboard/keyboard-shortcuts.c:1159 -#: ../panels/network/network-wifi.ui.h:29 +#: ../panels/keyboard/cc-keyboard-option.c:276 +#: ../panels/keyboard/cc-keyboard-option.c:395 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 +#: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 -#: ../panels/user-accounts/um-fingerprint-dialog.c:216 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Disabled" @@ -1724,7 +1702,7 @@ #. * chooser'. AltGr is often used for this purpose. See #. * https://live.gnome.org/Design/SystemSettings/RegionAndLanguage #. -#: ../panels/keyboard/cc-keyboard-option.c:349 +#: ../panels/keyboard/cc-keyboard-option.c:354 msgid "Alternative Characters Key" msgstr "Alternative Characters Key" @@ -1732,313 +1710,244 @@ #. * sequences that are combined to form a single character. #. * See http://en.wikipedia.org/wiki/Compose_key #. -#: ../panels/keyboard/cc-keyboard-option.c:358 +#: ../panels/keyboard/cc-keyboard-option.c:363 msgid "Compose Key" msgstr "Compose Key" -#: ../panels/keyboard/cc-keyboard-option.c:363 +#: ../panels/keyboard/cc-keyboard-option.c:368 msgid "Modifiers-only switch to next source" msgstr "Modifiers-only switch to next source" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "Keyboard" -msgstr "Keyboard" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Reset the shortcut to its default value" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Set Custom Shortcuts" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Set Shortcut" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Enter new shortcut to change %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Add Custom Shortcut" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Key­board" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "View and change keyboard shortcuts and set your typing preferences" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Shortcut;Repeat;Blink;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Custom Shortcut" +msgid "No keyboard shortcut found" +msgstr "No keyboard shortcut found" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 -msgid "_Name:" -msgstr "_Name:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -msgid "C_ommand:" -msgstr "C_ommand:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "Repeat Keys" -msgstr "Repeat Keys" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Key presses _repeat when key is held down" -msgstr "Key presses _repeat when key is held down" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "_Delay:" -msgstr "_Delay:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "_Speed:" -msgstr "_Speed:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:9 -msgctxt "keyboard, delay" -msgid "Short" -msgstr "Short" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:10 -msgctxt "keyboard, speed" -msgid "Slow" -msgstr "Slow" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:11 -msgid "Repeat keys speed" -msgstr "Repeat keys speed" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:12 -msgctxt "keyboard, delay" -msgid "Long" -msgstr "Long" +msgid "Try a different search" +msgstr "Try a different search" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:13 -msgctxt "keyboard, speed" -msgid "Fast" -msgstr "Fast" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:14 -msgid "Cursor Blinking" -msgstr "Cursor Blinking" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:15 -msgid "Cursor _blinks in text fields" -msgstr "Cursor _blinks in text fields" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:16 -msgid "S_peed:" -msgstr "S_peed:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:17 -msgid "Cursor blink speed" -msgstr "Cursor blink speed" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:18 -#: ../panels/region/region.ui.h:5 -msgid "Input Sources" -msgstr "Input Sources" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:20 -msgid "Add Shortcut" -msgstr "Add Shortcut" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:21 -msgid "Remove Shortcut" -msgstr "Remove Shortcut" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:22 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:23 -msgid "Shortcuts" -msgstr "Shortcuts" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Press Esc to cancel." + +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Name" -#: ../panels/keyboard/keyboard-shortcuts.c:585 -#: ../panels/keyboard/keyboard-shortcuts.c:593 -msgid "Custom Shortcuts" -msgstr "Custom Shortcuts" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Command" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Shortcut" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Edit" -#: ../panels/keyboard/keyboard-shortcuts.c:804 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "None" -#: ../panels/keyboard/keyboard-shortcuts.c:1300 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Remove" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Enter the new shortcut" -#: ../panels/keyboard/keyboard-shortcuts.c:1332 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Cancel" -#: ../panels/keyboard/keyboard-shortcuts.c:1337 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Add" -#: ../panels/keyboard/keyboard-shortcuts.c:1343 -msgid "_Reassign" -msgstr "_Reassign" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Replace" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Set" -#: ../panels/mouse/cc-mouse-panel.c:100 +#: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Test Your _Settings" -#: ../panels/mouse/cc-mouse-panel.c:117 -msgid "Test Your Settings" -msgstr "Test Your Settings" - -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mouse & Touchpad" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Mouse & Touch­pad" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Change your mouse or touchpad sensitivity and select right or left-handed" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;Touchpad;" #: ../panels/mouse/gnome-mouse-properties.ui.h:1 -msgid "Mouse Preferences" -msgstr "Mouse Preferences" - -#: ../panels/mouse/gnome-mouse-properties.ui.h:2 msgid "General" msgstr "General" +#: ../panels/mouse/gnome-mouse-properties.ui.h:2 +msgid "Primary Button" +msgstr "Primary Button" + #: ../panels/mouse/gnome-mouse-properties.ui.h:3 -msgctxt "double click, speed" -msgid "Slow" -msgstr "Slow" +msgid "Sets the order of physical buttons on mice and touchpads." +msgstr "Sets the order of physical buttons on mice and touchpads." #: ../panels/mouse/gnome-mouse-properties.ui.h:4 -msgid "Double-click timeout" -msgstr "Double-click timeout" +msgid "Left" +msgstr "Left" #: ../panels/mouse/gnome-mouse-properties.ui.h:5 -msgctxt "double click, speed" -msgid "Fast" -msgstr "Fast" +msgid "Right" +msgstr "Right" #: ../panels/mouse/gnome-mouse-properties.ui.h:6 -msgid "_Double-click" -msgstr "_Double-click" +msgid "Mouse" +msgstr "Mouse" #: ../panels/mouse/gnome-mouse-properties.ui.h:7 -msgid "Primary _button" -msgstr "Primary _button" +msgid "Mouse Speed" +msgstr "Mouse Speed" #: ../panels/mouse/gnome-mouse-properties.ui.h:8 -msgctxt "mouse, left button as primary" -msgid "_Left" -msgstr "_Left" - -#: ../panels/mouse/gnome-mouse-properties.ui.h:9 -msgctxt "mouse, right button as primary" -msgid "_Right" -msgstr "_Right" +msgid "Double-click timeout" +msgstr "Double-click timeout" +#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. #: ../panels/mouse/gnome-mouse-properties.ui.h:10 -msgid "Mouse" -msgstr "Mouse" +msgid "Natural Scrolling" +msgstr "Natural Scrolling" #: ../panels/mouse/gnome-mouse-properties.ui.h:11 -msgid "_Pointer speed" -msgstr "_Pointer speed" +msgid "Scrolling moves the content, not the view." +msgstr "Scrolling moves the content, not the view." #: ../panels/mouse/gnome-mouse-properties.ui.h:12 -msgctxt "mouse pointer, speed" -msgid "Slow" -msgstr "Slow" +msgid "Touchpad" +msgstr "Touchpad" #: ../panels/mouse/gnome-mouse-properties.ui.h:13 -msgctxt "mouse pointer, speed" -msgid "Fast" -msgstr "Fast" +msgid "Touchpad Speed" +msgstr "Touchpad Speed" #: ../panels/mouse/gnome-mouse-properties.ui.h:14 -msgid "Touchpad" -msgstr "Touchpad" +msgid "Tap to Click" +msgstr "Tap to Click" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 -msgctxt "touchpad pointer, speed" -msgid "Slow" -msgstr "Slow" +msgid "Two-finger Scrolling" +msgstr "Two-finger Scrolling" #: ../panels/mouse/gnome-mouse-properties.ui.h:16 -msgctxt "touchpad pointer, speed" -msgid "Fast" -msgstr "Fast" - -#: ../panels/mouse/gnome-mouse-properties.ui.h:17 -msgid "Disable while _typing" -msgstr "Disable while _typing" - -#: ../panels/mouse/gnome-mouse-properties.ui.h:18 -msgid "Tap to _click" -msgstr "Tap to _click" - -#: ../panels/mouse/gnome-mouse-properties.ui.h:19 -msgid "Two _finger scroll" -msgstr "Two _finger scroll" - -#. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. -#: ../panels/mouse/gnome-mouse-properties.ui.h:21 -msgid "_Natural scrolling" -msgstr "_Natural scrolling" +msgid "Edge Scrolling" +msgstr "Edge Scrolling" -#: ../panels/mouse/gnome-mouse-test.c:132 +#: ../panels/mouse/gnome-mouse-test.c:130 #: ../panels/mouse/gnome-mouse-test.ui.h:1 msgid "Try clicking, double clicking, scrolling" msgstr "Try clicking, double clicking, scrolling" -#: ../panels/mouse/gnome-mouse-test.c:137 +#: ../panels/mouse/gnome-mouse-test.c:135 msgid "Five clicks, GEGL time!" msgstr "Five clicks, GEGL time!" -#: ../panels/mouse/gnome-mouse-test.c:142 +#: ../panels/mouse/gnome-mouse-test.c:140 msgid "Double click, primary button" msgstr "Double click, primary button" -#: ../panels/mouse/gnome-mouse-test.c:142 +#: ../panels/mouse/gnome-mouse-test.c:140 msgid "Single click, primary button" msgstr "Single click, primary button" -#: ../panels/mouse/gnome-mouse-test.c:145 +#: ../panels/mouse/gnome-mouse-test.c:143 msgid "Double click, middle button" msgstr "Double click, middle button" -#: ../panels/mouse/gnome-mouse-test.c:145 +#: ../panels/mouse/gnome-mouse-test.c:143 msgid "Single click, middle button" msgstr "Single click, middle button" -#: ../panels/mouse/gnome-mouse-test.c:148 +#: ../panels/mouse/gnome-mouse-test.c:146 msgid "Double click, secondary button" msgstr "Double click, secondary button" -#: ../panels/mouse/gnome-mouse-test.c:148 +#: ../panels/mouse/gnome-mouse-test.c:146 msgid "Single click, secondary button" msgstr "Single click, secondary button" #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Aero_plane Mode" -#: ../panels/network/cc-network-panel.c:925 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Network proxy" @@ -2046,97 +1955,107 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1104 ../panels/network/net-vpn.c:285 -#: ../panels/network/net-vpn.c:438 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#. TRANSLATORS: the user is running a NM that is not API compatible -#: ../panels/network/cc-network-panel.c:1239 -msgid "The system network services are not compatible with this version." -msgstr "The system network services are not compatible with this version." +#: ../panels/network/cc-network-panel.c:1194 +msgid "Oops, something has gone wrong. Please contact your software vendor." +msgstr "Oops, something has gone wrong. Please contact your software vendor." + +#: ../panels/network/cc-network-panel.c:1200 +msgid "NetworkManager needs to be running." +msgstr "NetworkManager needs to be running." #: ../panels/network/connection-editor/8021x-security-page.ui.h:1 msgid "802.1x _Security" msgstr "802.1x _Security" -#: ../panels/network/connection-editor/8021x-security-page.ui.h:3 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:2 #: ../panels/network/connection-editor/security-page.ui.h:3 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/printers/printers.ui.h:14 +msgid "page 1" +msgstr "page 1" + +#: ../panels/network/connection-editor/8021x-security-page.ui.h:3 +#: ../panels/network/connection-editor/security-page.ui.h:4 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" msgstr "Anony_mous identity" #: ../panels/network/connection-editor/8021x-security-page.ui.h:4 -#: ../panels/network/connection-editor/security-page.ui.h:4 +#: ../panels/network/connection-editor/security-page.ui.h:5 msgid "Inner _authentication" msgstr "Inner _authentication" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:455 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:5 +#: ../panels/network/connection-editor/security-page.ui.h:6 +#: ../panels/printers/printers.ui.h:16 +msgid "page 2" +msgstr "page 2" + +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 -#: ../panels/network/network-wifi.ui.h:4 +#: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Security" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatic" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profile %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:221 -#: ../panels/network/net-device-wifi.c:382 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:225 -#: ../panels/network/net-device-wifi.c:387 -#: ../panels/network/network-wifi.ui.h:17 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:229 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:234 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:239 -#: ../panels/network/net-device-wifi.c:372 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "None" -#: ../panels/network/connection-editor/ce-page-details.c:91 -#: ../panels/power/power.ui.h:19 +#: ../panels/network/connection-editor/ce-page-details.c:89 +#: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Never" -#: ../panels/network/connection-editor/ce-page-details.c:102 -#: ../panels/user-accounts/um-utils.c:803 -msgid "Today" -msgstr "Today" - #: ../panels/network/connection-editor/ce-page-details.c:104 -#: ../panels/user-accounts/um-utils.c:806 -msgid "Yesterday" -msgstr "Yesterday" - -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:125 -#: ../panels/network/net-device-wifi.c:476 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2144,221 +2063,230 @@ msgstr[1] "%i days ago" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:53 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "None" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Weak" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Good" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excellent" -#: ../panels/network/connection-editor/ce-page-ethernet.c:213 -#: ../panels/network/connection-editor/ce-page-vpn.c:204 -#: ../panels/network/connection-editor/ce-page-wifi.c:255 -#: ../panels/network/network-wifi.ui.h:45 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Details" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 +#: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identity" -#: ../panels/network/connection-editor/ce-page-ip4.c:207 -#: ../panels/network/connection-editor/ce-page-ip4.c:469 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 +msgid "Address" +msgstr "Address" + +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip4.c:482 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 -#: ../panels/network/connection-editor/ce-page-ip6.c:490 -#: ../panels/network/network-vpn.ui.h:3 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 +#: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:238 -#: ../panels/network/connection-editor/ce-page-ip6.c:239 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Delete Address" -#: ../panels/network/connection-editor/ce-page-ip4.c:292 -#: ../panels/network/connection-editor/ce-page-ip6.c:293 -msgid "Add" -msgstr "Add" - -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:377 -#: ../panels/network/connection-editor/ce-page-ip6.c:381 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Delete DNS Server" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:496 -#: ../panels/network/connection-editor/ce-page-ip6.c:504 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metric" -#: ../panels/network/connection-editor/ce-page-ip4.c:517 -#: ../panels/network/connection-editor/ce-page-ip6.c:525 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Delete Route" -#: ../panels/network/connection-editor/ce-page-ip4.c:632 -#: ../panels/network/network-wifi.ui.h:25 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 +#: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatic (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:636 -#: ../panels/network/connection-editor/ce-page-ip6.c:638 -#: ../panels/network/network-wifi.ui.h:24 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 +#: ../panels/network/network-wifi.ui.h:26 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:640 -#: ../panels/network/connection-editor/ce-page-ip6.c:642 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Link-Local Only" -#: ../panels/network/connection-editor/ce-page-ip4.c:942 -#: ../panels/network/network-wifi.ui.h:46 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 +#: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:209 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefix" -#: ../panels/network/connection-editor/ce-page-ip6.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatic" -#: ../panels/network/connection-editor/ce-page-ip6.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatic, DHCP only" -#: ../panels/network/connection-editor/ce-page-ip6.c:902 -#: ../panels/network/network-wifi.ui.h:47 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 +#: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 -#: ../panels/network/network-wifi.ui.h:49 +#: ../panels/network/connection-editor/ce-page-reset.c:78 +#: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reset" -#: ../panels/network/connection-editor/ce-page-security.c:250 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "None" -#: ../panels/network/connection-editor/ce-page-security.c:273 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bit Key (Hex or ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:283 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bit Passphrase" -#: ../panels/network/connection-editor/ce-page-security.c:296 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:309 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamic WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:323 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:337 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" #: ../panels/network/connection-editor/details-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:2 +#: ../panels/network/network-wifi.ui.h:4 msgid "Signal Strength" msgstr "Signal Strength" #: ../panels/network/connection-editor/details-page.ui.h:2 -#: ../panels/network/network-wifi.ui.h:3 +#: ../panels/network/network-wifi.ui.h:5 msgid "Link speed" msgstr "Link speed" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:158 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:5 ../panels/network/panel-common.c:693 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 Address" #: ../panels/network/connection-editor/details-page.ui.h:5 -#: ../panels/network/net-device-ethernet.c:159 -#: ../panels/network/net-device-ethernet.c:163 +#: ../panels/network/net-device-ethernet.c:154 +#: ../panels/network/net-device-ethernet.c:158 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:6 ../panels/network/panel-common.c:694 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 Address" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:166 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 -#: ../panels/network/network-wifi.ui.h:7 +#: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardware Address" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:170 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 -#: ../panels/network/network-wifi.ui.h:8 +#: ../panels/network/network-wifi.ui.h:10 msgid "Default Route" msgstr "Default Route" #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:172 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 -#: ../panels/network/network-wifi.ui.h:9 +#: ../panels/network/network-wifi.ui.h:11 msgid "DNS" msgstr "DNS" @@ -2405,7 +2333,7 @@ #: ../panels/network/connection-editor/ethernet-page.ui.h:11 #: ../panels/network/connection-editor/wifi-page.ui.h:4 -#: ../panels/network/network-wifi.ui.h:36 +#: ../panels/network/network-wifi.ui.h:38 msgid "_MAC Address" msgstr "_MAC Address" @@ -2433,29 +2361,29 @@ msgstr "Connect _automatically" #: ../panels/network/connection-editor/ethernet-page.ui.h:17 +#: ../panels/network/connection-editor/security-page.ui.h:2 #: ../panels/network/connection-editor/vpn-page.ui.h:2 -#: ../panels/network/connection-editor/wifi-page.ui.h:8 msgid "Firewall _Zone" msgstr "Firewall _Zone" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:112 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Default" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "The zone defines the trust level of the connection" #: ../panels/network/connection-editor/ip4-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:22 +#: ../panels/network/network-wifi.ui.h:24 msgid "IPv_4" msgstr "IPv_4" #: ../panels/network/connection-editor/ip4-page.ui.h:2 #: ../panels/network/connection-editor/ip6-page.ui.h:2 -#: ../panels/network/network-wifi.ui.h:23 +#: ../panels/network/network-wifi.ui.h:25 msgid "_Addresses" msgstr "_Addresses" @@ -2466,7 +2394,7 @@ #: ../panels/network/connection-editor/ip4-page.ui.h:6 #: ../panels/network/connection-editor/ip6-page.ui.h:6 -#: ../panels/network/network-wifi.ui.h:30 +#: ../panels/network/network-wifi.ui.h:32 msgid "Routes" msgstr "Routes" @@ -2477,66 +2405,43 @@ #: ../panels/network/connection-editor/ip4-page.ui.h:8 #: ../panels/network/connection-editor/ip6-page.ui.h:8 -#: ../panels/network/network-wifi.ui.h:32 +#: ../panels/network/network-wifi.ui.h:34 msgid "Use this connection _only for resources on its network" msgstr "Use this connection _only for resources on its network" #: ../panels/network/connection-editor/ip6-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:34 +#: ../panels/network/network-wifi.ui.h:36 msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:266 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Unable to open connection editor" -#: ../panels/network/connection-editor/net-connection-editor.c:284 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "New Profile" -#: ../panels/network/connection-editor/net-connection-editor.c:509 -#: ../panels/printers/new-printer-dialog.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1471 -msgid "_Add" -msgstr "_Add" - -#: ../panels/network/connection-editor/net-connection-editor.c:593 -#: ../panels/network/network.ui.h:4 ../panels/network/network-vpn.ui.h:1 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:594 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:595 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:596 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:747 -msgid "Could not load VPN plugins" -msgstr "Could not load VPN plugins" - -#: ../panels/network/connection-editor/net-connection-editor.c:816 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Import from file…" -#: ../panels/network/connection-editor/net-connection-editor.c:887 -msgid "Add Network Connection" -msgstr "Add Network Connection" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Add VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:39 +#: ../panels/network/network-wifi.ui.h:41 msgid "_Reset" msgstr "_Reset" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1408 -#: ../panels/network/network-wifi.ui.h:40 +#: ../panels/network/net-device-wifi.c:1536 +#: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Forget" @@ -2557,15 +2462,15 @@ "connect" #: ../panels/network/connection-editor/security-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:14 +#: ../panels/network/network-wifi.ui.h:16 msgid "S_ecurity" msgstr "S_ecurity" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Cannot import VPN connection" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2578,36 +2483,36 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Select file to import" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:1947 -#: ../panels/sharing/cc-sharing-panel.c:422 -#: ../panels/user-accounts/um-photo-dialog.c:222 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 +#: ../panels/sharing/cc-sharing-panel.c:373 +#: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Open" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "A file named \"%s\" already exists." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Replace" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Do you want to replace %s with the VPN connection you are saving?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Cannot export VPN connection" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2618,26 +2523,26 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 -msgid "Export VPN connection..." -msgstr "Export VPN connection…" +#: ../panels/network/connection-editor/vpn-helpers.c:307 +msgid "Export VPN connection" +msgstr "Export VPN connection" #: ../panels/network/connection-editor/vpn-page.ui.h:4 msgid "(Error: unable to load VPN connection editor)" msgstr "(Error: unable to load VPN connection editor)" #: ../panels/network/connection-editor/wifi-page.ui.h:1 -#: ../panels/network/network-wifi.ui.h:12 +#: ../panels/network/network-wifi.ui.h:14 msgid "_SSID" msgstr "_SSID" #: ../panels/network/connection-editor/wifi-page.ui.h:2 -#: ../panels/network/network-wifi.ui.h:13 +#: ../panels/network/network-wifi.ui.h:15 msgid "_BSSID" msgstr "_BSSID" #: ../panels/network/connection-editor/wifi-page.ui.h:3 -#: ../panels/network/network-wifi.ui.h:16 +#: ../panels/network/network-wifi.ui.h:18 msgid "My Home Network" msgstr "My Home Network" @@ -2645,56 +2550,47 @@ msgid "Make available to _other users" msgstr "Make available to _other users" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Network" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Net­work" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Control how you connect to the Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;" +"DNS;" msgstr "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond slaves" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge slaves" +"DNS;" -#: ../panels/network/net-device-ethernet.c:111 -#: ../panels/network/net-device-wifi.c:462 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "never" -#: ../panels/network/net-device-ethernet.c:121 -#: ../panels/network/net-device-wifi.c:472 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "today" -#: ../panels/network/net-device-ethernet.c:123 -#: ../panels/network/net-device-wifi.c:474 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "yesterday" -#: ../panels/network/net-device-ethernet.c:161 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:696 ../panels/network/panel-common.c:698 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP Address" -#: ../panels/network/net-device-ethernet.c:177 -#: ../panels/network/network-wifi.ui.h:10 +#: ../panels/network/net-device-ethernet.c:172 +#: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Last used" @@ -2703,31 +2599,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:287 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Wired" -#: ../panels/network/net-device-ethernet.c:355 -#: ../panels/network/net-device-wifi.c:1549 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:8 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Options…" -#: ../panels/network/net-device-ethernet.c:492 -#, c-format -msgid "Profile %d" -msgstr "Profile %d" - -#: ../panels/network/net-device-mobile.c:239 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Add new connection" -#: ../panels/network/net-device-wifi.c:1117 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2735,12 +2625,12 @@ "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." -#: ../panels/network/net-device-wifi.c:1121 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Switching on the wireless hotspot will disconnect you from %s." -#: ../panels/network/net-device-wifi.c:1125 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2748,23 +2638,23 @@ "It is not possible to access the Internet through your wireless while the " "hotspot is active." -#: ../panels/network/net-device-wifi.c:1199 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Stop hotspot and disconnect any users?" -#: ../panels/network/net-device-wifi.c:1202 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Stop Hotspot" -#: ../panels/network/net-device-wifi.c:1274 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "System policy prohibits use as a Hotspot" -#: ../panels/network/net-device-wifi.c:1277 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Wireless device does not support Hotspot mode" -#: ../panels/network/net-device-wifi.c:1404 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2772,19 +2662,19 @@ "Network details for the selected networks, including passwords and any " "custom configuration will be lost." -#: ../panels/network/net-device-wifi.c:1714 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "History" -#: ../panels/network/net-device-wifi.c:1718 ../panels/power/power.ui.h:21 -#: ../panels/privacy/privacy.ui.h:23 ../panels/sound/gvc-mixer-dialog.c:1596 -#: ../panels/wacom/cc-wacom-page.c:525 +#: ../panels/network/net-device-wifi.c:1846 +#: ../panels/printers/options-dialog.ui.h:2 +#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 +#: ../panels/wacom/gnome-wacom-properties.ui.h:5 msgid "_Close" msgstr "_Close" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1726 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Forget" @@ -2804,7 +2694,7 @@ msgid "This is not recommended for untrusted public networks." msgstr "This is not recommended for untrusted public networks." -#: ../panels/network/net-proxy.c:408 +#: ../panels/network/net-proxy.c:410 msgid "Proxy" msgstr "Proxy" @@ -2820,17 +2710,21 @@ msgid "Provider" msgstr "Provider" -#: ../panels/network/network-proxy.ui.h:1 ../panels/network/network.ui.h:5 +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Network" + +#: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" msgstr "None" -#: ../panels/network/network-proxy.ui.h:2 ../panels/network/network.ui.h:6 +#: ../panels/network/network-proxy.ui.h:2 msgctxt "proxy method" msgid "Manual" msgstr "Manual" -#: ../panels/network/network-proxy.ui.h:3 ../panels/network/network.ui.h:7 +#: ../panels/network/network-proxy.ui.h:3 msgctxt "proxy method" msgid "Automatic" msgstr "Automatic" @@ -2884,109 +2778,98 @@ msgstr "Turn device off" #: ../panels/network/network.ui.h:1 -msgid "Select the interface to use for the new service" -msgstr "Select the interface to use for the new service" - -#: ../panels/network/network.ui.h:2 -msgid "C_reate…" -msgstr "C_reate…" - -#: ../panels/network/network.ui.h:3 -msgid "_Interface" -msgstr "_Interface" - -#: ../panels/network/network.ui.h:8 msgid "Add Device" msgstr "Add Device" -#: ../panels/network/network-vpn.ui.h:2 +#: ../panels/network/network.ui.h:2 +msgid "Remove Device" +msgstr "Remove Device" + +#: ../panels/network/network-vpn.ui.h:1 msgid "VPN Type" msgstr "VPN Type" -#: ../panels/network/network-vpn.ui.h:4 +#: ../panels/network/network-vpn.ui.h:3 msgid "Group Name" msgstr "Group Name" -#: ../panels/network/network-vpn.ui.h:5 +#: ../panels/network/network-vpn.ui.h:4 msgid "Group Password" msgstr "Group Password" -#: ../panels/network/network-vpn.ui.h:6 +#: ../panels/network/network-vpn.ui.h:5 #: ../panels/printers/authentication-dialog.ui.h:4 msgid "Username" msgstr "Username" -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-vpn.ui.h:6 msgid "Turn VPN connection off" msgstr "Turn VPN connection off" -#: ../panels/network/network-wifi.ui.h:1 +#: ../panels/network/network-wifi.ui.h:3 msgid "Automatic _Connect" msgstr "Automatic _Connect" -#: ../panels/network/network-wifi.ui.h:11 +#: ../panels/network/network-wifi.ui.h:13 msgid "details" msgstr "details" -#: ../panels/network/network-wifi.ui.h:15 +#: ../panels/network/network-wifi.ui.h:17 #: ../panels/network/wireless-security/eap-method-leap.ui.h:2 #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Password" -#: ../panels/network/network-wifi.ui.h:18 -msgid "None" -msgstr "None" - -#: ../panels/network/network-wifi.ui.h:19 +#: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Show P_assword" -#: ../panels/network/network-wifi.ui.h:20 +#: ../panels/network/network-wifi.ui.h:22 msgid "Make available to other users" msgstr "Make available to other users" -#: ../panels/network/network-wifi.ui.h:21 +#: ../panels/network/network-wifi.ui.h:23 msgid "identity" msgstr "identity" -#: ../panels/network/network-wifi.ui.h:26 +#: ../panels/network/network-wifi.ui.h:28 msgid "Automatic (DHCP) addresses only" msgstr "Automatic (DHCP) addresses only" -#: ../panels/network/network-wifi.ui.h:27 +#: ../panels/network/network-wifi.ui.h:29 msgid "Link-local only" msgstr "Link-local only" -#: ../panels/network/network-wifi.ui.h:28 +#: ../panels/network/network-wifi.ui.h:30 msgid "Shared with other computers" msgstr "Shared with other computers" -#: ../panels/network/network-wifi.ui.h:31 +#: ../panels/network/network-wifi.ui.h:33 msgid "_Ignore automatically obtained routes" msgstr "_Ignore automatically obtained routes" -#: ../panels/network/network-wifi.ui.h:33 +#: ../panels/network/network-wifi.ui.h:35 msgid "ipv4" msgstr "ipv4" -#: ../panels/network/network-wifi.ui.h:35 +#: ../panels/network/network-wifi.ui.h:37 msgid "ipv6" msgstr "ipv6" -#: ../panels/network/network-wifi.ui.h:37 +#: ../panels/network/network-wifi.ui.h:39 msgid "_Cloned MAC Address" msgstr "_Cloned MAC Address" -#: ../panels/network/network-wifi.ui.h:38 +#: ../panels/network/network-wifi.ui.h:40 msgid "hardware" msgstr "hardware" -#: ../panels/network/network-wifi.ui.h:41 +#: ../panels/network/network-wifi.ui.h:43 msgid "" "Reset the settings for this connection to their defaults, but remember as a " "preferred connection." @@ -2994,7 +2877,7 @@ "Reset the settings for this connection to their defaults, but remember as a " "preferred connection." -#: ../panels/network/network-wifi.ui.h:42 +#: ../panels/network/network-wifi.ui.h:44 msgid "" "Remove all details relating to this network and do not try to automatically " "connect to it." @@ -3002,412 +2885,390 @@ "Remove all details relating to this network and do not try to automatically " "connect to it." -#: ../panels/network/network-wifi.ui.h:43 +#: ../panels/network/network-wifi.ui.h:45 msgid "reset" msgstr "reset" -#: ../panels/network/network-wifi.ui.h:48 +#: ../panels/network/network-wifi.ui.h:50 msgid "Hardware" msgstr "Hardware" -#: ../panels/network/network-wifi.ui.h:50 +#: ../panels/network/network-wifi.ui.h:52 msgid "Wi-Fi Hotspot" msgstr "Wi-Fi Hotspot" -#: ../panels/network/network-wifi.ui.h:51 +#: ../panels/network/network-wifi.ui.h:53 msgid "_Turn On" msgstr "_Turn On" -#: ../panels/network/network-wifi.ui.h:52 +#: ../panels/network/network-wifi.ui.h:54 msgid "Wi-Fi" msgstr "Wi-Fi" -#: ../panels/network/network-wifi.ui.h:53 +#: ../panels/network/network-wifi.ui.h:55 msgid "Turn Wi-Fi off" msgstr "Turn Wi-Fi off" -#: ../panels/network/network-wifi.ui.h:54 +#: ../panels/network/network-wifi.ui.h:56 msgid "_Use as Hotspot…" msgstr "_Use as Hotspot…" -#: ../panels/network/network-wifi.ui.h:55 +#: ../panels/network/network-wifi.ui.h:57 msgid "_Connect to Hidden Network…" msgstr "_Connect to Hidden Network…" -#: ../panels/network/network-wifi.ui.h:56 +#: ../panels/network/network-wifi.ui.h:58 msgid "_History" msgstr "_History" -#: ../panels/network/network-wifi.ui.h:57 +#: ../panels/network/network-wifi.ui.h:59 msgid "Switch off to connect to a Wi-Fi network" msgstr "Switch off to connect to a Wi-Fi network" -#: ../panels/network/network-wifi.ui.h:58 +#: ../panels/network/network-wifi.ui.h:60 msgid "Network Name" msgstr "Network Name" -#: ../panels/network/network-wifi.ui.h:59 +#: ../panels/network/network-wifi.ui.h:61 msgid "Connected Devices" msgstr "Connected Devices" -#: ../panels/network/network-wifi.ui.h:60 +#: ../panels/network/network-wifi.ui.h:62 msgid "Security type" msgstr "Security type" -#: ../panels/network/network-wifi.ui.h:61 -msgid "Security key" -msgstr "Security key" +#: ../panels/network/network-wifi.ui.h:63 +#: ../panels/printers/authentication-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 +msgid "Password" +msgstr "Password" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructure" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Status unknown" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Unmanaged" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Unavailable" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Connecting" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Authentication required" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Connected" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Disconnecting" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Connection failed" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Status unknown (missing)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Not connected" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Configuration failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP configuration failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP configuration expired" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Secrets were required, but not provided" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x supplicant disconnected" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x supplicant configuration failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x supplicant failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x supplicant took too long to authenticate" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP service failed to start" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP service disconnected" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP client failed to start" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP client error" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP client failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Shared connection service failed to start" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Shared connection service failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP service failed to start" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP service error" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP service failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Line busy" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "No dial tone" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "No carrier could be established" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Dialing request timed out" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Dialing attempt failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modem initialisation failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Failed to select the specified APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Not searching for networks" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Network registration denied" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Network registration timed out" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Failed to register with the requested network" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN check failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmware for the device may be missing" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Connection disappeared" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Existing connection was assumed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem not found" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth connection failed" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM Card not inserted" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM Pin required" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM Puk required" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM wrong" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand device does not support connected mode" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Connection dependency failed" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware missing" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cable unplugged" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "No Certificate Authority certificate chosen" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "undefined error in 802.1x security (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "no file selected" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignore" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Choose CA Certificate" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "unspecified error validating eap-method file" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:261 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "missing EAP-FAST PAC file" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:277 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:399 -msgid "Choose a PAC file..." -msgstr "Choose a PAC file…" - #: ../panels/network/wireless-security/eap-method-fast.c:406 +msgid "Choose a PAC file" +msgstr "Choose a PAC file" + +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC files (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _file" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Inner authentication" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC pro_visioning" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3416,43 +3277,75 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonymous" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Authenticated" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Both" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _file" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Inner authentication" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Allow automatic PAC pro_visioning" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "missing EAP-LEAP username" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "missing EAP-LEAP password" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Username" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Sho_w password" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "invalid EAP-PEAP CA certificate: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "invalid EAP-PEAP CA certificate: no certificate specified" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:434 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 -msgid "Choose a Certificate Authority certificate..." -msgstr "Choose a Certificate Authority certificate…" +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 +msgid "Choose a Certificate Authority certificate" +msgstr "Choose a Certificate Authority certificate" #: ../panels/network/wireless-security/eap-method-peap.ui.h:3 msgid "Version 0" @@ -3468,19 +3361,56 @@ msgid "C_A certificate" msgstr "C_A certificate" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "No CA certificate is _required" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _version" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "As_k for this password every time" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "missing EAP username" -#: ../panels/network/wireless-security/eap-method-tls.c:260 -msgid "Unencrypted private keys are insecure" +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "missing EAP password" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "missing EAP-TLS identity" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "invalid EAP-TLS CA certificate: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "invalid EAP-TLS CA certificate: no certificate specified" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "invalid EAP-TLS password: missing" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "invalid EAP-TLS private-key: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "invalid EAP-TLS user-certificate: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 +msgid "Unencrypted private keys are insecure" msgstr "Unencrypted private keys are insecure" -#: ../panels/network/wireless-security/eap-method-tls.c:263 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3494,13 +3424,13 @@ "\n" "(You can password-protect your private key with openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:428 -msgid "Choose your personal certificate..." -msgstr "Choose your personal certificate…" - -#: ../panels/network/wireless-security/eap-method-tls.c:440 -msgid "Choose your private key..." -msgstr "Choose your private key…" +#: ../panels/network/wireless-security/eap-method-tls.c:495 +msgid "Choose your personal certificate" +msgstr "Choose your personal certificate" + +#: ../panels/network/wireless-security/eap-method-tls.c:507 +msgid "Choose your private key" +msgstr "Choose your private key" #: ../panels/network/wireless-security/eap-method-tls.ui.h:1 msgid "I_dentity" @@ -3510,43 +3440,56 @@ msgid "_User certificate" msgstr "_User certificate" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Private _key" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Private key password" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "invalid EAP-TTLS CA certificate: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "invalid EAP-TTLS CA certificate: no certificate specified" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Don’t _warn me again" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Unknown error validating 802.1x security" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunnelled TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Protected EAP (PEAP)" @@ -3556,6 +3499,47 @@ msgid "Au_thentication" msgstr "Au_thentication" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "missing leap-username" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "missing leap-password" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "missing wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "invalid wep-key: key with a length of %zu must contain only hex-digits" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "invalid wep-key: passphrase must be non-empty" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "invalid wep-key: passphrase must be shorter than 64 characters" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Default)" @@ -3592,155 +3576,171 @@ msgid "WEP inde_x" msgstr "WEP inde_x" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "invalid wpa-psk: cannot interpret key with 64 bytes as hex" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Type" -#. TRANSLATORS: this is the per application switch for message tray usage. -#: ../panels/notifications/cc-edit-dialog.c:39 -msgctxt "notifications" -msgid "Notifications" -msgstr "Notifications" +#: ../panels/notifications/cc-notifications-panel.c:257 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 +#: ../panels/universal-access/cc-ua-panel.c:269 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 +msgid "On" +msgstr "On" -#. TRANSLATORS: this is the setting to configure sounds associated with notifications -#: ../panels/notifications/cc-edit-dialog.c:41 +#. This is the per application switch for message tray usage. +#: ../panels/notifications/edit-dialog.ui.h:2 msgctxt "notifications" -msgid "Sound Alerts" -msgstr "Sound Alerts" +msgid "_Notifications" +msgstr "_Notifications" -#: ../panels/notifications/cc-edit-dialog.c:42 +#. This is the setting to configure sounds associated with notifications. +#: ../panels/notifications/edit-dialog.ui.h:4 msgctxt "notifications" -msgid "Show Popup Banners" -msgstr "Show Popup Banners" +msgid "Sound _Alerts" +msgstr "Sound _Alerts" -#. TRANSLATORS: banners here refers to message tray notifications in the middle of the screen -#: ../panels/notifications/cc-edit-dialog.c:44 +#: ../panels/notifications/edit-dialog.ui.h:5 msgctxt "notifications" -msgid "Show Details in Banners" -msgstr "Show Details in Banners" +msgid "Notification _Banners" +msgstr "Notification _Banners" -#: ../panels/notifications/cc-edit-dialog.c:45 +#. Banners here refers to message tray notifications in the middle of the screen. +#: ../panels/notifications/edit-dialog.ui.h:7 msgctxt "notifications" -msgid "View in Lock Screen" -msgstr "View in Lock Screen" +msgid "Show Message _Content in Banners" +msgstr "Show Message _Content in Banners" -#: ../panels/notifications/cc-edit-dialog.c:46 +#: ../panels/notifications/edit-dialog.ui.h:8 msgctxt "notifications" -msgid "Show Details in Lock Screen" -msgstr "Show Details in Lock Screen" - -#: ../panels/notifications/cc-notifications-panel.c:205 -#: ../panels/power/cc-power-panel.c:1751 ../panels/power/cc-power-panel.c:1758 -#: ../panels/privacy/cc-privacy-panel.c:77 -#: ../panels/privacy/cc-privacy-panel.c:117 -#: ../panels/universal-access/cc-ua-panel.c:253 -#: ../panels/universal-access/cc-ua-panel.c:573 -#: ../panels/universal-access/cc-ua-panel.c:699 -msgid "On" -msgstr "On" +msgid "_Lock Screen Notifications" +msgstr "_Lock Screen Notifications" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Notifications" +#: ../panels/notifications/edit-dialog.ui.h:9 +msgctxt "notifications" +msgid "Show Message C_ontent on Lock Screen" +msgstr "Show Message C_ontent on Lock Screen" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "No­ti­fi­ca­tions" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Control which notifications are displayed and what they show" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifications;Banner;Message;Tray;Popup;" #: ../panels/notifications/notifications.ui.h:1 -msgid "Show Pop Up Banners" -msgstr "Show Pop Up Banners" +msgid "Notification _Banners" +msgstr "Notification _Banners" #: ../panels/notifications/notifications.ui.h:2 -msgid "Show in Lock Screen" -msgstr "Show in Lock Screen" +msgid "_Lock Screen Notifications" +msgstr "_Lock Screen Notifications" + +#. List of applications. +#: ../panels/notifications/notifications.ui.h:4 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 +msgid "Applications" +msgstr "Applications" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:200 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Other" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:318 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Add Account" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:357 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Mail" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:363 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendar" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contacts" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:369 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:375 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Resources" -#: ../panels/online-accounts/cc-online-accounts-panel.c:425 -msgid "Error logging into the account" -msgstr "Error logging into the account" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:495 -msgid "Credentials have expired." -msgstr "Credentials have expired." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:499 -msgid "Sign in to enable this account." -msgstr "Sign in to enable this account." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:504 -msgid "_Sign In" -msgstr "_Sign In" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:745 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Error creating account" -#: ../panels/online-accounts/cc-online-accounts-panel.c:805 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Error removing account" -#: ../panels/online-accounts/cc-online-accounts-panel.c:841 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Are you sure you want to remove the account?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:843 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "This will not remove the account on the server." -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Online Accounts" +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 +msgid "_Remove" +msgstr "_Remove" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "On­line Accounts" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Connect to your online accounts and decide what to use them for" -#. Translators: those are keywords for the online-accounts control-center panel -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" -"Kerberos;IMAP;SMTP;" +"Kerberos;IMAP;SMTP;Pocket;ReadItLater;" msgstr "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" -"Kerberos;IMAP;SMTP;" +"Kerberos;IMAP;SMTP;Pocket;ReadItLater;" #: ../panels/online-accounts/online-accounts.ui.h:1 msgid "No online accounts configured" msgstr "No online accounts configured" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Remove Account" @@ -3756,18 +3756,18 @@ "Adding an account allows your applications to access it for documents, mail, " "contacts, calendar, chat and more." -#: ../panels/power/cc-power-panel.c:188 +#: ../panels/power/cc-power-panel.c:253 msgid "Unknown time" msgstr "Unknown time" -#: ../panels/power/cc-power-panel.c:194 +#: ../panels/power/cc-power-panel.c:259 #, c-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "%i minute" msgstr[1] "%i minutes" -#: ../panels/power/cc-power-panel.c:206 +#: ../panels/power/cc-power-panel.c:271 #, c-format msgid "%i hour" msgid_plural "%i hours" @@ -3776,326 +3776,331 @@ #. TRANSLATOR: "%i %s %i %s" are "%i hours %i minutes" #. * Swap order with "%2$s %2$i %1$s %1$i if needed -#: ../panels/power/cc-power-panel.c:214 +#: ../panels/power/cc-power-panel.c:279 #, c-format msgid "%i %s %i %s" msgstr "%i %s %i %s" -#: ../panels/power/cc-power-panel.c:215 +#: ../panels/power/cc-power-panel.c:280 msgid "hour" msgid_plural "hours" msgstr[0] "hour" msgstr[1] "hours" -#: ../panels/power/cc-power-panel.c:216 +#: ../panels/power/cc-power-panel.c:281 msgid "minute" msgid_plural "minutes" msgstr[0] "minute" msgstr[1] "minutes" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: ../panels/power/cc-power-panel.c:235 +#: ../panels/power/cc-power-panel.c:300 #, c-format msgid "%s until fully charged" msgstr "%s until fully charged" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: ../panels/power/cc-power-panel.c:242 +#: ../panels/power/cc-power-panel.c:307 #, c-format msgid "Caution: %s remaining" msgstr "Caution: %s remaining" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" -#: ../panels/power/cc-power-panel.c:247 +#: ../panels/power/cc-power-panel.c:312 #, c-format msgid "%s remaining" msgstr "%s remaining" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:252 ../panels/power/cc-power-panel.c:280 +#: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345 msgid "Fully charged" msgstr "Fully charged" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:256 ../panels/power/cc-power-panel.c:284 +#: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349 msgid "Empty" msgstr "Empty" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:271 +#: ../panels/power/cc-power-panel.c:336 msgid "Charging" msgstr "Charging" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:276 +#: ../panels/power/cc-power-panel.c:341 msgid "Discharging" msgstr "Discharging" -#: ../panels/power/cc-power-panel.c:328 -#, c-format -msgid "Estimated battery capacity: %s" -msgstr "Estimated battery capacity: %s" - -#: ../panels/power/cc-power-panel.c:411 +#: ../panels/power/cc-power-panel.c:464 msgctxt "Battery name" msgid "Main" msgstr "Main" -#: ../panels/power/cc-power-panel.c:413 +#: ../panels/power/cc-power-panel.c:466 msgctxt "Battery name" msgid "Extra" msgstr "Extra" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:504 +#: ../panels/power/cc-power-panel.c:537 msgid "Wireless mouse" msgstr "Wireless mouse" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:508 +#: ../panels/power/cc-power-panel.c:540 msgid "Wireless keyboard" msgstr "Wireless keyboard" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:512 +#: ../panels/power/cc-power-panel.c:543 msgid "Uninterruptible power supply" msgstr "Uninterruptible power supply" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:517 +#: ../panels/power/cc-power-panel.c:546 msgid "Personal digital assistant" msgstr "Personal digital assistant" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:521 +#: ../panels/power/cc-power-panel.c:549 msgid "Cellphone" msgstr "Mobile phone" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:525 +#: ../panels/power/cc-power-panel.c:552 msgid "Media player" msgstr "Media player" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:529 +#: ../panels/power/cc-power-panel.c:555 msgid "Tablet" msgstr "Tablet" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:533 +#: ../panels/power/cc-power-panel.c:558 msgid "Computer" msgstr "Computer" #. TRANSLATORS: secondary battery, misc -#: ../panels/power/cc-power-panel.c:537 ../panels/power/cc-power-panel.c:747 -#: ../panels/power/cc-power-panel.c:2082 +#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Battery" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:546 +#: ../panels/power/cc-power-panel.c:615 msgctxt "Battery power" msgid "Charging" msgstr "Charging" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:553 +#: ../panels/power/cc-power-panel.c:622 msgctxt "Battery power" msgid "Caution" msgstr "Caution" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:558 +#: ../panels/power/cc-power-panel.c:627 msgctxt "Battery power" msgid "Low" msgstr "Low" #. TRANSLATORS: secondary battery -#: ../panels/power/cc-power-panel.c:563 +#: ../panels/power/cc-power-panel.c:632 msgctxt "Battery power" msgid "Good" msgstr "Good" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:568 +#: ../panels/power/cc-power-panel.c:637 msgctxt "Battery power" msgid "Fully charged" msgstr "Fully charged" #. TRANSLATORS: primary battery -#: ../panels/power/cc-power-panel.c:572 +#: ../panels/power/cc-power-panel.c:641 msgctxt "Battery power" msgid "Empty" msgstr "Empty" -#: ../panels/power/cc-power-panel.c:745 +#: ../panels/power/cc-power-panel.c:799 msgid "Batteries" msgstr "Batteries" -#: ../panels/power/cc-power-panel.c:1151 +#: ../panels/power/cc-power-panel.c:1227 msgid "When _idle" msgstr "When _idle" -#: ../panels/power/cc-power-panel.c:1520 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Power Saving" -#: ../panels/power/cc-power-panel.c:1548 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Screen brightness" -#: ../panels/power/cc-power-panel.c:1554 +#: ../panels/power/cc-power-panel.c:1734 +msgid "Automatic brightness" +msgstr "Automatic brightness" + +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Keyboard brightness" -#: ../panels/power/cc-power-panel.c:1564 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Dim screen when inactive" -#: ../panels/power/cc-power-panel.c:1589 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Blank screen" -#: ../panels/power/cc-power-panel.c:1626 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1631 -msgid "Turns off wireless devices" -msgstr "Turns off wireless devices" +#: ../panels/power/cc-power-panel.c:1831 +msgid "Turn off Wi-Fi to save power." +msgstr "Turn off Wi-Fi to save power." -#: ../panels/power/cc-power-panel.c:1656 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobile broadband" -#: ../panels/power/cc-power-panel.c:1661 -msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices" -msgstr "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices" +#: ../panels/power/cc-power-panel.c:1861 +msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." +msgstr "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." -#: ../panels/power/cc-power-panel.c:1696 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1747 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "When on battery power" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "When plugged in" -#: ../panels/power/cc-power-panel.c:1878 -msgid "Suspend & Power Off" -msgstr "Suspend & Power Off" +#: ../panels/power/cc-power-panel.c:2059 +msgid "Suspend" +msgstr "Suspend" + +#: ../panels/power/cc-power-panel.c:2060 +msgid "Hibernate" +msgstr "Hibernate" + +#: ../panels/power/cc-power-panel.c:2061 +msgid "Nothing" +msgstr "Nothing" + +#. Frame header +#: ../panels/power/cc-power-panel.c:2175 +msgid "Suspend & Power Button" +msgstr "Suspend & Power Button" -#: ../panels/power/cc-power-panel.c:1911 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatic suspend" -#: ../panels/power/cc-power-panel.c:1935 -msgid "When battery power is _critical" -msgstr "When battery power is _critical" - -#: ../panels/power/cc-power-panel.c:1992 -msgid "Power Off" -msgstr "Power Off" +#: ../panels/power/cc-power-panel.c:2219 +msgid "Automatic suspend" +msgstr "Automatic suspend" + +#: ../panels/power/cc-power-panel.c:2286 +msgid "_When the Power Button is pressed" +msgstr "_When the Power Button is pressed" -#: ../panels/power/cc-power-panel.c:2134 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Devices" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Power" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Po­wer" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "View your battery status and change power saving settings" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" -#: ../panels/power/power.ui.h:1 -msgid "Hibernate" -msgstr "Hibernate" - -#: ../panels/power/power.ui.h:2 -msgid "Power off" -msgstr "Power off" - -#: ../panels/power/power.ui.h:5 +#: ../panels/power/power.ui.h:3 msgid "45 minutes" msgstr "45 minutes" -#: ../panels/power/power.ui.h:6 ../panels/privacy/privacy.ui.h:8 +#: ../panels/power/power.ui.h:4 ../panels/privacy/privacy.ui.h:8 msgid "1 hour" msgstr "1 hour" -#: ../panels/power/power.ui.h:7 +#: ../panels/power/power.ui.h:5 msgid "80 minutes" msgstr "80 minutes" -#: ../panels/power/power.ui.h:8 +#: ../panels/power/power.ui.h:6 msgid "90 minutes" msgstr "90 minutes" -#: ../panels/power/power.ui.h:9 +#: ../panels/power/power.ui.h:7 msgid "100 minutes" msgstr "100 minutes" -#: ../panels/power/power.ui.h:10 +#: ../panels/power/power.ui.h:8 msgid "2 hours" msgstr "2 hours" -#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:3 +#: ../panels/power/power.ui.h:9 ../panels/privacy/privacy.ui.h:3 msgid "1 minute" msgstr "1 minute" -#: ../panels/power/power.ui.h:12 ../panels/privacy/privacy.ui.h:4 +#: ../panels/power/power.ui.h:10 ../panels/privacy/privacy.ui.h:4 msgid "2 minutes" msgstr "2 minutes" -#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:5 +#: ../panels/power/power.ui.h:11 ../panels/privacy/privacy.ui.h:5 msgid "3 minutes" msgstr "3 minutes" -#: ../panels/power/power.ui.h:14 +#: ../panels/power/power.ui.h:12 msgid "4 minutes" msgstr "4 minutes" -#: ../panels/power/power.ui.h:15 ../panels/privacy/privacy.ui.h:6 +#: ../panels/power/power.ui.h:13 ../panels/privacy/privacy.ui.h:6 msgid "5 minutes" msgstr "5 minutes" -#: ../panels/power/power.ui.h:16 +#: ../panels/power/power.ui.h:14 msgid "8 minutes" msgstr "8 minutes" -#: ../panels/power/power.ui.h:17 +#: ../panels/power/power.ui.h:15 msgid "10 minutes" msgstr "10 minutes" -#: ../panels/power/power.ui.h:18 +#: ../panels/power/power.ui.h:16 msgid "12 minutes" msgstr "12 minutes" -#: ../panels/power/power.ui.h:20 +#: ../panels/power/power.ui.h:18 msgid "Automatic Suspend" msgstr "Automatic Suspend" -#: ../panels/power/power.ui.h:22 +#: ../panels/power/power.ui.h:19 msgid "_Plugged In" msgstr "_Plugged In" -#: ../panels/power/power.ui.h:23 +#: ../panels/power/power.ui.h:20 msgid "On _Battery Power" msgstr "On _Battery Power" -#: ../panels/power/power.ui.h:24 +#: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33 msgid "Delay" msgstr "Delay" @@ -4103,154 +4108,143 @@ msgid "Authenticate" msgstr "Authenticate" -#: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/sharing/sharing.ui.h:23 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 -msgid "Password" -msgstr "Password" - #: ../panels/printers/authentication-dialog.ui.h:6 msgid "Authentication Required" msgstr "Authentication Required" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:591 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Low on toner" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:593 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Out of toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:596 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Low on developer" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:599 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Out of developer" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:601 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Low on a marker supply" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:603 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Out of a marker supply" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:605 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Open cover" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:607 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Open door" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:609 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Low on paper" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:611 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Out of paper" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:613 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Offline" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:615 -#: ../panels/printers/cc-printers-panel.c:806 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Stopped" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:617 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Waste receptacle almost full" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:619 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Waste receptacle full" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:621 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "The optical photo conductor is near end of life" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:623 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "The optical photo conductor is no longer functioning" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:733 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Configuring" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:792 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Ready" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:797 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Does not accept jobs" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:802 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Processing" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:923 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Toner Level" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:926 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Ink Level" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:929 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Supply Level" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:947 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Installing" -#. Translators: There are no printers available (none is configured or CUPS is not running) -#: ../panels/printers/cc-printers-panel.c:1124 -msgid "No printers available" -msgstr "No printers available" - #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1432 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4258,15 +4252,15 @@ msgstr[1] "%u active" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1776 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Failed to add new printer." -#: ../panels/printers/cc-printers-panel.c:1943 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Select PPD File" -#: ../panels/printers/cc-printers-panel.c:1952 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4274,82 +4268,76 @@ "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2257 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "No suitable driver found" -#: ../panels/printers/cc-printers-panel.c:2326 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Searching for preferred drivers…" -#: ../panels/printers/cc-printers-panel.c:2341 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Select from database…" -#: ../panels/printers/cc-printers-panel.c:2350 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Provide PPD File…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2501 -#: ../panels/printers/cc-printers-panel.c:2524 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Test page" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:2932 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Could not load ui: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Printers" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Prin­ters" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Add printers, view printer jobs and decide how you want to print" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Queue;Print;Paper;Ink;Toner;" -#. Translators: This dialog contains list of active print jobs of the selected printer +#. Translators: this action removes (purges) all the listed jobs from the list. #: ../panels/printers/jobs-dialog.ui.h:2 -msgid "Active Jobs" -msgstr "Active Jobs" - -#: ../panels/printers/jobs-dialog.ui.h:3 -#: ../panels/printers/options-dialog.ui.h:2 -#: ../panels/user-accounts/data/history-dialog.ui.h:2 -msgid "Close" -msgstr "Close" +msgid "Clear All" +msgstr "Clear All" +#. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -msgid "Resume Printing" -msgstr "Resume Printing" - -#: ../panels/printers/jobs-dialog.ui.h:5 -msgid "Pause Printing" -msgstr "Pause Printing" - -#: ../panels/printers/jobs-dialog.ui.h:6 -msgid "Cancel Print Job" -msgstr "Cancel Print Job" +msgid "No Active Printer Jobs" +msgstr "No Active Printer Jobs" #: ../panels/printers/new-printer-dialog.ui.h:1 msgid "Add a New Printer" msgstr "Add a New Printer" -#: ../panels/printers/new-printer-dialog.ui.h:4 -msgid "Search for network printers or filter result" -msgstr "Search for network printers or filter result" +#. Translators: This button opens authentication dialog for selected server. +#: ../panels/printers/new-printer-dialog.ui.h:5 +msgid "A_uthenticate" +msgstr "A_uthenticate" + +#. Translators: No printers were found +#: ../panels/printers/new-printer-dialog.ui.h:7 +msgid "No printers detected." +msgstr "No printers detected." #. Translators: The entered text should contain network address of a printer or a text which will filter found devices (their names and locations) -#: ../panels/printers/new-printer-dialog.ui.h:6 -msgid "Enter address of a printer or a text to filter results" -msgstr "Enter address of a printer or a text to filter results" +#: ../panels/printers/new-printer-dialog.ui.h:9 +msgid "Enter a network address or search for a printer" +msgstr "Enter a network address or search for a printer" #: ../panels/printers/options-dialog.ui.h:1 msgid "Loading options…" @@ -4359,231 +4347,265 @@ msgid "Select Printer Driver" msgstr "Select Printer Driver" +#: ../panels/printers/ppd-selection-dialog.ui.h:3 +#: ../panels/user-accounts/um-photo-dialog.c:96 +msgid "Select" +msgstr "Select" + #: ../panels/printers/ppd-selection-dialog.ui.h:4 msgid "Loading drivers database..." msgstr "Loading drivers database…" +#. Translators: The found device is a JetDirect printer +#: ../panels/printers/pp-host.c:526 +msgid "JetDirect Printer" +msgstr "JetDirect Printer" + +#. Translators: The found device is a Line Printer Daemon printer +#: ../panels/printers/pp-host.c:782 +msgid "LPD Printer" +msgstr "LPD Printer" + #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:67 -#: ../panels/printers/pp-ppd-option-widget.c:71 +#: ../panels/printers/pp-ipp-option-widget.c:66 +#: ../panels/printers/pp-ppd-option-widget.c:70 msgid "One Sided" msgstr "One Sided" #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:69 -#: ../panels/printers/pp-ppd-option-widget.c:73 +#: ../panels/printers/pp-ipp-option-widget.c:68 +#: ../panels/printers/pp-ppd-option-widget.c:72 msgid "Long Edge (Standard)" msgstr "Long Edge (Standard)" #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:71 -#: ../panels/printers/pp-ppd-option-widget.c:75 +#: ../panels/printers/pp-ipp-option-widget.c:70 +#: ../panels/printers/pp-ppd-option-widget.c:74 msgid "Short Edge (Flip)" msgstr "Short Edge (Flip)" #. Translators: this is an option of "Orientation" -#: ../panels/printers/pp-ipp-option-widget.c:73 +#: ../panels/printers/pp-ipp-option-widget.c:72 msgid "Portrait" msgstr "Portrait" #. Translators: this is an option of "Orientation" -#: ../panels/printers/pp-ipp-option-widget.c:75 +#: ../panels/printers/pp-ipp-option-widget.c:74 msgid "Landscape" msgstr "Landscape" #. Translators: this is an option of "Orientation" -#: ../panels/printers/pp-ipp-option-widget.c:77 +#: ../panels/printers/pp-ipp-option-widget.c:76 msgid "Reverse landscape" msgstr "Reverse landscape" #. Translators: this is an option of "Orientation" -#: ../panels/printers/pp-ipp-option-widget.c:79 +#: ../panels/printers/pp-ipp-option-widget.c:78 msgid "Reverse portrait" msgstr "Reverse portrait" #. Translators: Job's state (job is waiting to be printed) -#: ../panels/printers/pp-jobs-dialog.c:143 +#: ../panels/printers/pp-jobs-dialog.c:103 msgctxt "print job" msgid "Pending" msgstr "Pending" #. Translators: Job's state (job is held for printing) -#: ../panels/printers/pp-jobs-dialog.c:147 +#: ../panels/printers/pp-jobs-dialog.c:107 msgctxt "print job" -msgid "Held" -msgstr "Held" +msgid "Paused" +msgstr "Paused" #. Translators: Job's state (job is currently printing) -#: ../panels/printers/pp-jobs-dialog.c:151 +#: ../panels/printers/pp-jobs-dialog.c:111 msgctxt "print job" msgid "Processing" msgstr "Processing" #. Translators: Job's state (job has been stopped) -#: ../panels/printers/pp-jobs-dialog.c:155 +#: ../panels/printers/pp-jobs-dialog.c:115 msgctxt "print job" msgid "Stopped" msgstr "Stopped" #. Translators: Job's state (job has been canceled) -#: ../panels/printers/pp-jobs-dialog.c:159 +#: ../panels/printers/pp-jobs-dialog.c:119 msgctxt "print job" msgid "Canceled" msgstr "Cancelled" #. Translators: Job's state (job has aborted due to error) -#: ../panels/printers/pp-jobs-dialog.c:163 +#: ../panels/printers/pp-jobs-dialog.c:123 msgctxt "print job" msgid "Aborted" msgstr "Aborted" #. Translators: Job's state (job has completed successfully) -#: ../panels/printers/pp-jobs-dialog.c:167 +#: ../panels/printers/pp-jobs-dialog.c:127 msgctxt "print job" msgid "Completed" msgstr "Completed" -#. Translators: Name of column showing titles of print jobs +#. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 -msgid "Job Title" -msgstr "Job Title" +#, c-format +msgctxt "Printer jobs dialog title" +msgid "%s - Active Jobs" +msgstr "%s - Active Jobs" + +#. Translators: The found device is a printer connected via USB +#: ../panels/printers/pp-new-printer-dialog.c:1659 +msgid "USB" +msgstr "USB" + +#. Translators: The found device is a printer connected via serial port +#: ../panels/printers/pp-new-printer-dialog.c:1664 +msgid "Serial Port" +msgstr "Serial Port" + +#. Translators: The found device is a printer connected via parallel port +#: ../panels/printers/pp-new-printer-dialog.c:1671 +msgid "Parallel Port" +msgstr "Parallel Port" -#. Translators: Name of column showing statuses of print jobs -#: ../panels/printers/pp-jobs-dialog.c:298 -msgid "Job State" -msgstr "Job State" - -#. Translators: Name of column showing times of creation of print jobs -#: ../panels/printers/pp-jobs-dialog.c:304 -msgid "Time" -msgstr "Time" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" -#: ../panels/printers/pp-jobs-dialog.c:496 +#. Translators: Location of found network printer (e.g. Kitchen, Reception) +#: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format -msgid "%s Active Jobs" -msgstr "%s Active Jobs" +msgid "Location: %s" +msgstr "Location: %s" -#. Translators: No printers were found -#: ../panels/printers/pp-new-printer-dialog.c:1468 -msgid "No printers detected." -msgstr "No printers detected." +#. Translators: Network address of found printer +#: ../panels/printers/pp-new-printer-dialog.c:1718 +#, c-format +msgid "Address: %s" +msgstr "Address: %s" -#: ../panels/printers/pp-options-dialog.c:82 +#. Translators: This item is a server which needs authentication to show its printers +#: ../panels/printers/pp-new-printer-dialog.c:1747 +msgid "Server requires authentication" +msgstr "Server requires authentication" + +#: ../panels/printers/pp-options-dialog.c:81 msgid "Two Sided" msgstr "Two Sided" -#: ../panels/printers/pp-options-dialog.c:83 +#: ../panels/printers/pp-options-dialog.c:82 msgid "Paper Type" msgstr "Paper Type" -#: ../panels/printers/pp-options-dialog.c:84 +#: ../panels/printers/pp-options-dialog.c:83 msgid "Paper Source" msgstr "Paper Source" -#: ../panels/printers/pp-options-dialog.c:85 +#: ../panels/printers/pp-options-dialog.c:84 msgid "Output Tray" msgstr "Output Tray" -#: ../panels/printers/pp-options-dialog.c:87 +#: ../panels/printers/pp-options-dialog.c:86 msgid "GhostScript pre-filtering" msgstr "GhostScript pre-filtering" #. Translators: This option sets number of pages printed on one sheet -#: ../panels/printers/pp-options-dialog.c:532 +#: ../panels/printers/pp-options-dialog.c:533 msgid "Pages per side" msgstr "Pages per side" #. Translators: This option sets whether to print on both sides of paper -#: ../panels/printers/pp-options-dialog.c:544 +#: ../panels/printers/pp-options-dialog.c:545 msgid "Two-sided" msgstr "Two-sided" #. Translators: This option sets orientation of print (portrait, landscape...) -#: ../panels/printers/pp-options-dialog.c:556 +#: ../panels/printers/pp-options-dialog.c:557 msgid "Orientation" msgstr "Orientation" #. Translators: "General" tab contains general printer options -#: ../panels/printers/pp-options-dialog.c:653 +#: ../panels/printers/pp-options-dialog.c:654 msgctxt "Printer Option Group" msgid "General" msgstr "General" #. Translators: "Page Setup" tab contains settings related to pages (page size, paper source, etc.) -#: ../panels/printers/pp-options-dialog.c:656 +#: ../panels/printers/pp-options-dialog.c:657 msgctxt "Printer Option Group" msgid "Page Setup" msgstr "Page Setup" #. Translators: "Installable Options" tab contains settings of presence of installed options (amount of RAM, duplex unit, etc.) -#: ../panels/printers/pp-options-dialog.c:659 +#: ../panels/printers/pp-options-dialog.c:660 msgctxt "Printer Option Group" msgid "Installable Options" msgstr "Installable Options" #. Translators: "Job" tab contains settings for jobs -#: ../panels/printers/pp-options-dialog.c:662 +#: ../panels/printers/pp-options-dialog.c:663 msgctxt "Printer Option Group" msgid "Job" msgstr "Job" #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution) -#: ../panels/printers/pp-options-dialog.c:665 +#: ../panels/printers/pp-options-dialog.c:666 msgctxt "Printer Option Group" msgid "Image Quality" msgstr "Image Quality" #. Translators: "Color" tab contains color settings (e.g. color printing) -#: ../panels/printers/pp-options-dialog.c:668 +#: ../panels/printers/pp-options-dialog.c:669 msgctxt "Printer Option Group" msgid "Color" msgstr "Colour" #. Translators: "Finishing" tab contains finishing settings (e.g. booklet printing) -#: ../panels/printers/pp-options-dialog.c:671 +#: ../panels/printers/pp-options-dialog.c:672 msgctxt "Printer Option Group" msgid "Finishing" msgstr "Finishing" #. Translators: "Advanced" tab contains all others settings -#: ../panels/printers/pp-options-dialog.c:674 +#: ../panels/printers/pp-options-dialog.c:675 msgctxt "Printer Option Group" msgid "Advanced" msgstr "Advanced" #. Translators: this is an option of "Paper Source" -#: ../panels/printers/pp-ppd-option-widget.c:77 -#: ../panels/printers/pp-ppd-option-widget.c:79 -#: ../panels/printers/pp-ppd-option-widget.c:87 +#: ../panels/printers/pp-ppd-option-widget.c:76 +#: ../panels/printers/pp-ppd-option-widget.c:78 +#: ../panels/printers/pp-ppd-option-widget.c:86 msgid "Auto Select" msgstr "Auto Select" #. Translators: this is an option of "Paper Source" #. Translators: this is an option of "Resolution" -#: ../panels/printers/pp-ppd-option-widget.c:81 -#: ../panels/printers/pp-ppd-option-widget.c:83 -#: ../panels/printers/pp-ppd-option-widget.c:85 -#: ../panels/printers/pp-ppd-option-widget.c:89 +#: ../panels/printers/pp-ppd-option-widget.c:80 +#: ../panels/printers/pp-ppd-option-widget.c:82 +#: ../panels/printers/pp-ppd-option-widget.c:84 +#: ../panels/printers/pp-ppd-option-widget.c:88 msgid "Printer Default" msgstr "Printer Default" #. Translators: this is an option of "GhostScript" -#: ../panels/printers/pp-ppd-option-widget.c:91 +#: ../panels/printers/pp-ppd-option-widget.c:90 msgid "Embed GhostScript fonts only" msgstr "Embed GhostScript fonts only" #. Translators: this is an option of "GhostScript" -#: ../panels/printers/pp-ppd-option-widget.c:93 +#: ../panels/printers/pp-ppd-option-widget.c:92 msgid "Convert to PS level 1" msgstr "Convert to PS level 1" #. Translators: this is an option of "GhostScript" -#: ../panels/printers/pp-ppd-option-widget.c:95 +#: ../panels/printers/pp-ppd-option-widget.c:94 msgid "Convert to PS level 2" msgstr "Convert to PS level 2" #. Translators: this is an option of "GhostScript" -#: ../panels/printers/pp-ppd-option-widget.c:97 +#: ../panels/printers/pp-ppd-option-widget.c:96 msgid "No pre-filtering" msgstr "No pre-filtering" @@ -4598,7 +4620,7 @@ msgstr "Driver" #. Translators: Samba server needs authentication of the user to show list of its printers. -#: ../panels/printers/pp-samba.c:247 +#: ../panels/printers/pp-samba.c:248 #, c-format msgid "Enter your username and password to view printers available on %s." msgstr "Enter your username and password to view printers available on %s." @@ -4623,18 +4645,22 @@ #. Translators: This checkbox is checked when the default printer is selected. #: ../panels/printers/printers.ui.h:8 -msgid "_Default" -msgstr "_Default" +msgid "_Default printer" +msgstr "_Default printer" #: ../panels/printers/printers.ui.h:9 msgid "Jobs" msgstr "Jobs" -#. Translators: Opens a dialog containing printer's jobs +#. Translators: Opens a dialog containing printer #: ../panels/printers/printers.ui.h:11 msgid "Show _Jobs" msgstr "Show _Jobs" +#: ../panels/printers/printers.ui.h:12 +msgid "Model" +msgstr "Model" + #: ../panels/printers/printers.ui.h:15 msgid "label" msgstr "label" @@ -4652,18 +4678,22 @@ msgid "Print _Test Page" msgstr "Print _Test Page" -#. Translators: This button opens printer's options tab -#: ../panels/printers/printers.ui.h:22 +#. Translators: This button opens printer +#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6 msgid "_Options" msgstr "_Options" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "No printers" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 -msgid "Add New Printer" -msgstr "Add New Printer" +#: ../panels/printers/printers.ui.h:25 +msgid "Add a Printer" +msgstr "Add a Printer" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4671,52 +4701,93 @@ "Sorry! The system printing service\n" "doesn’t seem to be available." -#: ../panels/privacy/cc-privacy-panel.c:245 ../panels/privacy/privacy.ui.h:26 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Screen Lock" -#: ../panels/privacy/cc-privacy-panel.c:358 ../panels/privacy/privacy.ui.h:20 +#: ../panels/privacy/cc-privacy-panel.c:438 +msgid "In use" +msgstr "In use" + +#: ../panels/privacy/cc-privacy-panel.c:443 +msgctxt "Location services status" +msgid "On" +msgstr "On" + +#: ../panels/privacy/cc-privacy-panel.c:444 +msgctxt "Location services status" +msgid "Off" +msgstr "Off" + +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 +msgid "Location Services" +msgstr "Location Services" + +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Usage & History" -#: ../panels/privacy/cc-privacy-panel.c:486 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Empty all items from Wastebasket?" -#: ../panels/privacy/cc-privacy-panel.c:487 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "All items in the Wastebasket will be permanently deleted." -#: ../panels/privacy/cc-privacy-panel.c:488 ../panels/privacy/privacy.ui.h:32 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Empty Wastebasket" -#: ../panels/privacy/cc-privacy-panel.c:511 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Delete all the temporary files?" -#: ../panels/privacy/cc-privacy-panel.c:512 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "All the temporary files will be permanently deleted." -#: ../panels/privacy/cc-privacy-panel.c:513 ../panels/privacy/privacy.ui.h:33 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Purge Temporary Files" -#: ../panels/privacy/cc-privacy-panel.c:535 ../panels/privacy/privacy.ui.h:31 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Purge Wastebasket & Temporary Files" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privacy" +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 +msgid "Software Usage" +msgstr "Software Usage" + +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 +msgid "Problem Reporting" +msgstr "Problem Reporting" + +#. translators: '%s' is the distributor's name, such as 'Fedora' +#: ../panels/privacy/cc-privacy-panel.c:1211 +#, c-format +msgid "" +"Sending reports of technical problems helps us improve %s. Reports are sent " +"anonymously and are scrubbed of personal data." +msgstr "" +"Sending reports of technical problems helps us improve %s. Reports are sent " +"anonymously and are scrubbed of personal data." + +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 +msgid "Privacy Policy" +msgstr "Privacy Policy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Pri­va­cy" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Protect your personal information and control what others might see" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4733,50 +4804,46 @@ msgstr "30 seconds" #: ../panels/privacy/privacy.ui.h:9 -msgid "Immediately" -msgstr "Immediately" - -#: ../panels/privacy/privacy.ui.h:10 msgid "1 day" msgstr "1 day" -#: ../panels/privacy/privacy.ui.h:11 +#: ../panels/privacy/privacy.ui.h:10 msgid "2 days" msgstr "2 days" -#: ../panels/privacy/privacy.ui.h:12 +#: ../panels/privacy/privacy.ui.h:11 msgid "3 days" msgstr "3 days" -#: ../panels/privacy/privacy.ui.h:13 +#: ../panels/privacy/privacy.ui.h:12 msgid "4 days" msgstr "4 days" -#: ../panels/privacy/privacy.ui.h:14 +#: ../panels/privacy/privacy.ui.h:13 msgid "5 days" msgstr "5 days" -#: ../panels/privacy/privacy.ui.h:15 +#: ../panels/privacy/privacy.ui.h:14 msgid "6 days" msgstr "6 days" -#: ../panels/privacy/privacy.ui.h:16 +#: ../panels/privacy/privacy.ui.h:15 msgid "7 days" msgstr "7 days" -#: ../panels/privacy/privacy.ui.h:17 +#: ../panels/privacy/privacy.ui.h:16 msgid "14 days" msgstr "14 days" -#: ../panels/privacy/privacy.ui.h:18 +#: ../panels/privacy/privacy.ui.h:17 msgid "30 days" msgstr "30 days" -#: ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/privacy.ui.h:18 msgid "Forever" msgstr "Forever" -#: ../panels/privacy/privacy.ui.h:21 +#: ../panels/privacy/privacy.ui.h:20 msgid "" "Remembering your history makes things easier to find again. These items are " "never shared over the network." @@ -4784,35 +4851,35 @@ "Remembering your history makes things easier to find again. These items are " "never shared over the network." -#: ../panels/privacy/privacy.ui.h:22 -msgid "Cl_ear Recent History" -msgstr "Cl_ear Recent History" - -#: ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/privacy.ui.h:21 msgid "_Recently Used" msgstr "_Recently Used" -#: ../panels/privacy/privacy.ui.h:25 +#: ../panels/privacy/privacy.ui.h:22 msgid "Retain _History" msgstr "Retain _History" -#: ../panels/privacy/privacy.ui.h:27 +#: ../panels/privacy/privacy.ui.h:23 +msgid "Cl_ear Recent History" +msgstr "Cl_ear Recent History" + +#: ../panels/privacy/privacy.ui.h:25 msgid "The Screen Lock protects your privacy when you are away." msgstr "The Screen Lock protects your privacy when you are away." -#: ../panels/privacy/privacy.ui.h:28 +#: ../panels/privacy/privacy.ui.h:26 msgid "Automatic Screen _Lock" msgstr "Automatic Screen _Lock" -#: ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/privacy.ui.h:27 msgid "Lock screen _after blank for" msgstr "Lock screen _after blank for" -#: ../panels/privacy/privacy.ui.h:30 +#: ../panels/privacy/privacy.ui.h:28 msgid "Show _Notifications" msgstr "Show _Notifications" -#: ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/privacy.ui.h:30 msgid "" "Automatically purge the Trash and temporary files to help keep your computer " "free of unnecessary sensitive information." @@ -4820,18 +4887,54 @@ "Automatically purge the Wastebasket and temporary files to help keep your " "computer free of unnecessary sensitive information." -#: ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/privacy.ui.h:31 msgid "Automatically empty _Trash" msgstr "Automatically empty _Wastebasket" -#: ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/privacy.ui.h:32 msgid "Automatically purge Temporary _Files" msgstr "Automatically purge Temporary _Files" -#: ../panels/privacy/privacy.ui.h:37 +#: ../panels/privacy/privacy.ui.h:33 msgid "Purge _After" msgstr "Purge _After" +#: ../panels/privacy/privacy.ui.h:37 +msgid "" +"Sending us information about which software you use helps us provide you " +"with more accurate recommendations. It also helps us to improve our " +"software.\n" +"\n" +"All the information we collect is made anonymous, and we will never share " +"your data with third parties." +msgstr "" +"Sending us information about which software you use helps us provide you " +"with more accurate recommendations. It also helps us to improve our " +"software.\n" +"\n" +"All the information we collect is made anonymous, and we will never share " +"your data with third parties." + +#: ../panels/privacy/privacy.ui.h:40 +msgid "_Send software usage statistics" +msgstr "_Send software usage statistics" + +#: ../panels/privacy/privacy.ui.h:43 +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." + +#: ../panels/privacy/privacy.ui.h:44 +msgid "_Location Services" +msgstr "_Location Services" + +#: ../panels/privacy/privacy.ui.h:47 +msgid "_Automatic Problem Reporting" +msgstr "_Automatic Problem Reporting" + #: ../panels/region/cc-format-chooser.c:120 msgctxt "measurement format" msgid "Imperial" @@ -4842,88 +4945,78 @@ msgid "Metric" msgstr "Metric" -#: ../panels/region/cc-format-chooser.c:285 +#: ../panels/region/cc-format-chooser.c:287 msgid "No regions found" msgstr "No regions found" -#: ../panels/region/cc-input-chooser.c:186 +#: ../panels/region/cc-input-chooser.c:182 msgid "No input sources found" msgstr "No input sources found" -#: ../panels/region/cc-input-chooser.c:1070 +#: ../panels/region/cc-input-chooser.c:992 msgctxt "Input Source" msgid "Other" msgstr "Other" -#: ../panels/region/cc-region-panel.c:239 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Your session needs to be restarted for changes to take effect" -#: ../panels/region/cc-region-panel.c:240 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Restart Now" -#: ../panels/region/cc-region-panel.c:569 -msgctxt "Language" -msgid "None" -msgstr "None" - -#: ../panels/region/cc-region-panel.c:853 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "No input source selected" -#: ../panels/region/cc-region-panel.c:1084 -msgid "Sorry" -msgstr "Sorry" - -#: ../panels/region/cc-region-panel.c:1086 -msgid "Input methods can't be used on the login screen" -msgstr "Input methods can’t be used on the login screen" - -#: ../panels/region/cc-region-panel.c:1716 -msgid "Login Screen" -msgstr "Login Screen" +#: ../panels/region/cc-region-panel.c:1779 +msgid "Login _Screen" +msgstr "Login _Screen" -#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3 +#: ../panels/region/format-chooser.ui.h:1 msgid "Formats" msgstr "Formats" -#: ../panels/region/format-chooser.ui.h:3 +#: ../panels/region/format-chooser.ui.h:4 msgid "Preview" msgstr "Preview" -#: ../panels/region/format-chooser.ui.h:4 +#: ../panels/region/format-chooser.ui.h:5 msgid "Dates" msgstr "Dates" -#: ../panels/region/format-chooser.ui.h:5 +#: ../panels/region/format-chooser.ui.h:6 msgid "Times" msgstr "Times" -#: ../panels/region/format-chooser.ui.h:6 +#: ../panels/region/format-chooser.ui.h:7 msgid "Numbers" msgstr "Numbers" -#: ../panels/region/format-chooser.ui.h:7 +#: ../panels/region/format-chooser.ui.h:8 msgid "Measurement" msgstr "Measurement" -#: ../panels/region/format-chooser.ui.h:8 +#: ../panels/region/format-chooser.ui.h:9 msgid "Paper" msgstr "Paper" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Region & Language" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Re­gion & Lan­guage" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Select your display language, formats, keyboard layouts and input sources" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Language;Layout;Keyboard;Input;" @@ -4931,6 +5024,10 @@ msgid "Add an Input Source" msgstr "Add an Input Source" +#: ../panels/region/input-chooser.ui.h:4 +msgid "Input methods can't be used on the login screen" +msgstr "Input methods can’t be used on the login screen" + #: ../panels/region/input-options.ui.h:1 msgid "Input Source Options" msgstr "Input Source Options" @@ -4943,7 +5040,7 @@ msgid "Allow _different sources for each window" msgstr "Allow _different sources for each window" -#: ../panels/region/input-options.ui.h:4 +#: ../panels/region/input-options.ui.h:4 ../shell/cc-application.c:251 msgid "Keyboard Shortcuts" msgstr "Keyboard Shortcuts" @@ -4975,46 +5072,60 @@ msgid "Left+Right Alt" msgstr "Left+Right Alt" +#: ../panels/region/region.ui.h:1 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +msgid "_Language" +msgstr "_Language" + #: ../panels/region/region.ui.h:2 msgid "English (United Kingdom)" msgstr "English (United Kingdom)" +#: ../panels/region/region.ui.h:3 +msgid "_Formats" +msgstr "_Formats" + #: ../panels/region/region.ui.h:4 msgid "United Kingdom" msgstr "United Kingdom" -#: ../panels/region/region.ui.h:6 -msgid "Options" -msgstr "Options" +#: ../panels/region/region.ui.h:5 +msgid "Input Sources" +msgstr "Input Sources" #: ../panels/region/region.ui.h:7 -msgid "Login settings are used by all users when logging into the system" -msgstr "Login settings are used by all users when logging into the system" - -#: ../panels/search/cc-search-locations-dialog.c:275 -msgid "Home" -msgstr "Home" - -#: ../panels/search/cc-search-locations-dialog.c:477 -msgctxt "Search Location" -msgid "Places" -msgstr "Places" +msgid "Add input source" +msgstr "Add input source" -#: ../panels/search/cc-search-locations-dialog.c:479 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Bookmarks" +#: ../panels/region/region.ui.h:8 +msgid "Remove input source" +msgstr "Remove input source" + +#: ../panels/region/region.ui.h:9 +msgid "Move input source up" +msgstr "Move input source up" + +#: ../panels/region/region.ui.h:10 +msgid "Move input source down" +msgstr "Move input source down" + +#: ../panels/region/region.ui.h:11 +msgid "Configure input source" +msgstr "Configure input source" + +#: ../panels/region/region.ui.h:12 +msgid "Show input source keyboard layout" +msgstr "Show input source keyboard layout" -#: ../panels/search/cc-search-locations-dialog.c:481 -msgctxt "Search Location" -msgid "Other" -msgstr "Other" +#: ../panels/region/region.ui.h:13 +msgid "Login settings are used by all users when logging into the system" +msgstr "Login settings are used by all users when logging into the system" -#: ../panels/search/cc-search-locations-dialog.c:679 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Select Location" -#: ../panels/search/cc-search-locations-dialog.c:683 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5022,18 +5133,19 @@ msgid "No applications found" msgstr "No applications found" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Search" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Control which applications show search results in the Activities Overview" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Search;Find;Index;Hide;Privacy;Results;" @@ -5041,6 +5153,18 @@ msgid "Search Locations" msgstr "Search Locations" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Places" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Bookmarks" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Other" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Move Up" @@ -5053,40 +5177,94 @@ msgid "Preferences" msgstr "Preferences" -#: ../panels/sharing/cc-sharing-panel.c:274 +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "No networks selected for sharing" + +#: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" msgstr "On" -#: ../panels/sharing/cc-sharing-panel.c:276 +#: ../panels/sharing/cc-sharing-panel.c:265 +#: ../panels/sharing/cc-sharing-panel.c:292 msgctxt "service is disabled" msgid "Off" msgstr "Off" -#: ../panels/sharing/cc-sharing-panel.c:418 -msgid "Choose a Folder" +#: ../panels/sharing/cc-sharing-panel.c:295 +msgctxt "service is enabled" +msgid "Enabled" +msgstr "Enabled" + +#: ../panels/sharing/cc-sharing-panel.c:298 +msgctxt "service is active" +msgid "Active" +msgstr "Active" + +#: ../panels/sharing/cc-sharing-panel.c:369 +msgid "Choose a Folder" msgstr "Choose a Folder" -#: ../panels/sharing/cc-sharing-panel.c:702 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copy" -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Sharing" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Sha­ring" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Control what you want to share with others" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" -"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;" -"pictures;photos;movies;server;renderer;" +"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" +"movies;server;renderer;" msgstr "" -"share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;video;" -"pictures;photos;movies;server;renderer;" +"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" +"movies;server;renderer;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Networks" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5097,131 +5275,80 @@ msgstr "Authentication is required to enable or disable remote login" #: ../panels/sharing/sharing.ui.h:1 -msgid "Bluetooth Sharing" -msgstr "Bluetooth Sharing" +msgid "_Computer Name" +msgstr "_Computer Name" #: ../panels/sharing/sharing.ui.h:2 -msgid "" -"Bluetooth Sharing allows you to share files with other Bluetooth enabled " -"devices" -msgstr "" -"Bluetooth Sharing allows you to share files with other Bluetooth enabled " -"devices" +msgid "_File Sharing" +msgstr "_File Sharing" #: ../panels/sharing/sharing.ui.h:3 -msgid "Share Public Folder" -msgstr "Share Public Folder" +msgid "_Screen Sharing" +msgstr "_Screen Sharing" #: ../panels/sharing/sharing.ui.h:4 -msgid "Only Receive From Trusted Devices" -msgstr "Only Receive From Trusted Devices" +msgid "_Media Sharing" +msgstr "_Media Sharing" #: ../panels/sharing/sharing.ui.h:5 -msgid "Save Received Files to Downloads Folder" -msgstr "Save Received Files to Downloads Folder" +msgid "_Remote Login" +msgstr "_Remote Login" #: ../panels/sharing/sharing.ui.h:6 -msgid "Only share with Trusted Devices" -msgstr "Only share with Trusted Devices" +msgid "Some services are disabled because of no network access." +msgstr "Some services are disabled because of no network access." #: ../panels/sharing/sharing.ui.h:7 -msgid "Computer Name" -msgstr "Computer Name" +msgid "File Sharing" +msgstr "File Sharing" #: ../panels/sharing/sharing.ui.h:8 -msgid "Personal File Sharing" -msgstr "Personal File Sharing" - -#: ../panels/sharing/sharing.ui.h:9 -msgid "Screen Sharing" -msgstr "Screen Sharing" +msgid "_Require Password" +msgstr "_Require Password" #: ../panels/sharing/sharing.ui.h:10 -msgid "Media Sharing" -msgstr "Media Sharing" - -#: ../panels/sharing/sharing.ui.h:11 msgid "Remote Login" msgstr "Remote Login" +#: ../panels/sharing/sharing.ui.h:11 +msgid "Screen Sharing" +msgstr "Screen Sharing" + #: ../panels/sharing/sharing.ui.h:12 -msgid "Some services are disabled because of no network access." -msgstr "Some services are disabled because of no network access." +msgid "_Allow connections to control the screen" +msgstr "_Allow connections to control the screen" #: ../panels/sharing/sharing.ui.h:13 -msgid "Share Music, Photos and Videos with others on the current network." -msgstr "Share Music, Photos and Videos with others on the current network." +msgid "_Password:" +msgstr "_Password:" #: ../panels/sharing/sharing.ui.h:14 -msgid "Share Media On This Network" -msgstr "Share Media On This Network" +msgid "_Show Password" +msgstr "_Show Password" #: ../panels/sharing/sharing.ui.h:15 -msgid "Shared Folders" -msgstr "Shared Folders" +msgid "Access Options" +msgstr "Access Options" #: ../panels/sharing/sharing.ui.h:16 -msgid "column" -msgstr "column" +msgid "_New connections must ask for access" +msgstr "_New connections must ask for access" #: ../panels/sharing/sharing.ui.h:17 -msgid "Add Folder" -msgstr "Add Folder" +msgid "_Require a password" +msgstr "_Require a password" #: ../panels/sharing/sharing.ui.h:18 -msgid "Remove Folder" -msgstr "Remove Folder" - -#: ../panels/sharing/sharing.ui.h:20 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" - -#: ../panels/sharing/sharing.ui.h:21 -msgid "Share Public Folder On This Network" -msgstr "Share Public Folder On This Network" - -#: ../panels/sharing/sharing.ui.h:22 -msgid "Require Password" -msgstr "Require Password" - -#: ../panels/sharing/sharing.ui.h:25 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" +msgid "Media Sharing" +msgstr "Media Sharing" -#: ../panels/sharing/sharing.ui.h:28 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Share music, photos and videos over the network." -#: ../panels/sharing/sharing.ui.h:29 -msgid "Remote View" -msgstr "Remote View" - -#: ../panels/sharing/sharing.ui.h:30 -msgid "Remote Control" -msgstr "Remote Control" - -#: ../panels/sharing/sharing.ui.h:31 -msgid "Approve All Connections" -msgstr "Approve All Connections" - -#: ../panels/sharing/sharing.ui.h:32 -msgid "Show Password" -msgstr "Show Password" +#: ../panels/sharing/sharing.ui.h:20 +msgid "Folders" +msgstr "Folders" #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:1 msgid "Sound" @@ -5260,60 +5387,60 @@ msgid "Sonar" msgstr "Sonar" -#: ../panels/sound/gvc-balance-bar.c:106 +#: ../panels/sound/gvc-balance-bar.c:105 msgctxt "balance" msgid "Left" msgstr "Left" -#: ../panels/sound/gvc-balance-bar.c:107 +#: ../panels/sound/gvc-balance-bar.c:106 msgctxt "balance" msgid "Right" msgstr "Right" -#: ../panels/sound/gvc-balance-bar.c:110 +#: ../panels/sound/gvc-balance-bar.c:109 msgctxt "balance" msgid "Rear" msgstr "Rear" -#: ../panels/sound/gvc-balance-bar.c:111 +#: ../panels/sound/gvc-balance-bar.c:110 msgctxt "balance" msgid "Front" msgstr "Front" -#: ../panels/sound/gvc-balance-bar.c:114 +#: ../panels/sound/gvc-balance-bar.c:113 msgctxt "balance" msgid "Minimum" msgstr "Minimum" -#: ../panels/sound/gvc-balance-bar.c:115 +#: ../panels/sound/gvc-balance-bar.c:114 msgctxt "balance" msgid "Maximum" msgstr "Maximum" -#: ../panels/sound/gvc-balance-bar.c:290 +#: ../panels/sound/gvc-balance-bar.c:289 msgid "_Balance:" msgstr "_Balance:" -#: ../panels/sound/gvc-balance-bar.c:293 +#: ../panels/sound/gvc-balance-bar.c:292 msgid "_Fade:" msgstr "_Fade:" -#: ../panels/sound/gvc-balance-bar.c:296 +#: ../panels/sound/gvc-balance-bar.c:295 msgid "_Subwoofer:" msgstr "_Subwoofer:" -#: ../panels/sound/gvc-channel-bar.c:613 ../panels/sound/gvc-channel-bar.c:622 +#: ../panels/sound/gvc-channel-bar.c:611 ../panels/sound/gvc-channel-bar.c:620 msgctxt "volume" msgid "100%" msgstr "100%" -#: ../panels/sound/gvc-channel-bar.c:617 +#: ../panels/sound/gvc-channel-bar.c:615 msgctxt "volume" msgid "Unamplified" msgstr "Unamplified" -#: ../panels/sound/gvc-combo-box.c:167 ../panels/sound/gvc-mixer-dialog.c:261 -#: ../panels/sound/gvc-mixer-dialog.c:527 +#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249 +#: ../panels/sound/gvc-mixer-dialog.c:515 msgid "_Profile:" msgstr "_Profile:" @@ -5339,133 +5466,129 @@ msgid "System Sounds" msgstr "System Sounds" -#: ../panels/sound/gvc-mixer-dialog.c:263 +#: ../panels/sound/gvc-mixer-dialog.c:251 msgid "_Test Speakers" msgstr "_Test Speakers" -#: ../panels/sound/gvc-mixer-dialog.c:432 +#: ../panels/sound/gvc-mixer-dialog.c:420 msgid "Peak detect" msgstr "Peak detect" -#: ../panels/sound/gvc-mixer-dialog.c:1510 -#: ../panels/sound/gvc-sound-theme-chooser.c:595 -msgid "Name" -msgstr "Name" - -#: ../panels/sound/gvc-mixer-dialog.c:1529 +#: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Device" -#: ../panels/sound/gvc-mixer-dialog.c:1592 +#: ../panels/sound/gvc-mixer-dialog.c:1575 #, c-format msgid "Speaker Testing for %s" msgstr "Speaker Testing for %s" -#: ../panels/sound/gvc-mixer-dialog.c:1649 +#: ../panels/sound/gvc-mixer-dialog.c:1631 msgid "_Output volume:" msgstr "_Output volume:" -#: ../panels/sound/gvc-mixer-dialog.c:1663 +#: ../panels/sound/gvc-mixer-dialog.c:1645 msgid "Output" msgstr "Output" -#: ../panels/sound/gvc-mixer-dialog.c:1668 +#: ../panels/sound/gvc-mixer-dialog.c:1650 msgid "C_hoose a device for sound output:" msgstr "C_hoose a device for sound output:" -#: ../panels/sound/gvc-mixer-dialog.c:1693 +#: ../panels/sound/gvc-mixer-dialog.c:1672 msgid "Settings for the selected device:" msgstr "Settings for the selected device:" -#: ../panels/sound/gvc-mixer-dialog.c:1704 +#: ../panels/sound/gvc-mixer-dialog.c:1683 msgid "Input" msgstr "Input" -#: ../panels/sound/gvc-mixer-dialog.c:1711 +#: ../panels/sound/gvc-mixer-dialog.c:1690 msgid "_Input volume:" msgstr "_Input volume:" -#: ../panels/sound/gvc-mixer-dialog.c:1734 +#: ../panels/sound/gvc-mixer-dialog.c:1711 msgid "Input level:" msgstr "Input level:" -#: ../panels/sound/gvc-mixer-dialog.c:1762 +#: ../panels/sound/gvc-mixer-dialog.c:1737 msgid "C_hoose a device for sound input:" msgstr "C_hoose a device for sound input:" -#: ../panels/sound/gvc-mixer-dialog.c:1789 +#: ../panels/sound/gvc-mixer-dialog.c:1761 msgid "Sound Effects" msgstr "Sound Effects" -#: ../panels/sound/gvc-mixer-dialog.c:1796 +#: ../panels/sound/gvc-mixer-dialog.c:1768 msgid "_Alert volume:" msgstr "_Alert volume:" -#: ../panels/sound/gvc-mixer-dialog.c:1809 -msgid "Applications" -msgstr "Applications" - -#: ../panels/sound/gvc-mixer-dialog.c:1813 +#: ../panels/sound/gvc-mixer-dialog.c:1785 msgid "No application is currently playing or recording audio." msgstr "No application is currently playing or recording audio." -#: ../panels/sound/gvc-sound-theme-chooser.c:189 +#: ../panels/sound/gvc-sound-theme-chooser.c:188 msgid "Built-in" msgstr "Built-in" -#: ../panels/sound/gvc-sound-theme-chooser.c:455 -#: ../panels/sound/gvc-sound-theme-chooser.c:467 -#: ../panels/sound/gvc-sound-theme-chooser.c:479 +#: ../panels/sound/gvc-sound-theme-chooser.c:454 +#: ../panels/sound/gvc-sound-theme-chooser.c:466 +#: ../panels/sound/gvc-sound-theme-chooser.c:478 msgid "Sound Preferences" msgstr "Sound Preferences" -#: ../panels/sound/gvc-sound-theme-chooser.c:458 -#: ../panels/sound/gvc-sound-theme-chooser.c:469 -#: ../panels/sound/gvc-sound-theme-chooser.c:481 +#: ../panels/sound/gvc-sound-theme-chooser.c:457 +#: ../panels/sound/gvc-sound-theme-chooser.c:468 +#: ../panels/sound/gvc-sound-theme-chooser.c:480 msgid "Testing event sound" msgstr "Testing event sound" -#: ../panels/sound/gvc-sound-theme-chooser.c:585 +#: ../panels/sound/gvc-sound-theme-chooser.c:554 msgid "Default" msgstr "Default" -#: ../panels/sound/gvc-sound-theme-chooser.c:586 +#: ../panels/sound/gvc-sound-theme-chooser.c:555 msgid "From theme" msgstr "From theme" -#: ../panels/sound/gvc-sound-theme-chooser.c:770 +#: ../panels/sound/gvc-sound-theme-chooser.c:740 msgid "C_hoose an alert sound:" msgstr "C_hoose an alert sound:" -#: ../panels/sound/gvc-speaker-test.c:220 +#: ../panels/sound/gvc-speaker-test.c:231 msgid "Stop" msgstr "Stop" -#: ../panels/sound/gvc-speaker-test.c:220 -#: ../panels/sound/gvc-speaker-test.c:332 +#: ../panels/sound/gvc-speaker-test.c:231 +#: ../panels/sound/gvc-speaker-test.c:343 msgid "Test" msgstr "Test" -#: ../panels/sound/gvc-speaker-test.c:228 +#: ../panels/sound/gvc-speaker-test.c:239 msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:292 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Custom" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Uni­ver­sal Access" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Make it easier to see, hear, type, point and click" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" -"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;" -"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;" +"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" +"AccessX;Sticky;Keys;Slow;Bounce;Mouse;" msgstr "" -"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;" -"AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys;" +"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" +"AccessX;Sticky;Keys;Slow;Bounce;Mouse;" #: ../panels/universal-access/uap.ui.h:1 msgid "_Always Show Universal Access Menu" @@ -5484,6 +5607,7 @@ msgstr "_Large Text" #: ../panels/universal-access/uap.ui.h:5 +#: ../panels/universal-access/zoom-options.ui.h:7 msgid "_Zoom" msgstr "_Zoom" @@ -5508,232 +5632,280 @@ msgstr "Screen _Keyboard" #: ../panels/universal-access/uap.ui.h:13 -msgid "_Typing Assist (AccessX)" -msgstr "_Typing Assist (AccessX)" +msgid "R_epeat Keys" +msgstr "R_epeat Keys" #: ../panels/universal-access/uap.ui.h:14 -msgid "Pointing and Clicking" -msgstr "Pointing and Clicking" +msgid "Cursor _Blinking" +msgstr "Cursor _Blinking" #: ../panels/universal-access/uap.ui.h:15 +msgid "_Typing Assist (AccessX)" +msgstr "_Typing Assist (AccessX)" + +#: ../panels/universal-access/uap.ui.h:16 +msgid "Pointing & Clicking" +msgstr "Pointing & Clicking" + +#: ../panels/universal-access/uap.ui.h:17 msgid "_Mouse Keys" msgstr "_Mouse Keys" -#: ../panels/universal-access/uap.ui.h:16 +#: ../panels/universal-access/uap.ui.h:18 msgid "_Click Assist" msgstr "_Click Assist" -#: ../panels/universal-access/uap.ui.h:17 +#: ../panels/universal-access/uap.ui.h:19 +msgid "_Double-Click Delay" +msgstr "_Double-Click Delay" + +#: ../panels/universal-access/uap.ui.h:20 +msgid "Double-Click Delay" +msgstr "Double-Click Delay" + +#: ../panels/universal-access/uap.ui.h:21 msgid "Screen Reader" msgstr "Screen Reader" -#: ../panels/universal-access/uap.ui.h:18 +#: ../panels/universal-access/uap.ui.h:22 msgid "The screen reader reads displayed text as you move the focus." msgstr "The screen reader reads displayed text as you move the focus." -#: ../panels/universal-access/uap.ui.h:19 +#: ../panels/universal-access/uap.ui.h:23 msgid "_Screen Reader" msgstr "_Screen Reader" -#: ../panels/universal-access/uap.ui.h:20 +#: ../panels/universal-access/uap.ui.h:24 msgid "Sound Keys" msgstr "Sound Keys" -#: ../panels/universal-access/uap.ui.h:21 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Beep when Num Lock or Caps Lock are turned on." +#: ../panels/universal-access/uap.ui.h:25 +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Beep when Num Lock or Caps Lock are turned on or off." -#: ../panels/universal-access/uap.ui.h:22 +#: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" msgstr "Visual Alerts" -#: ../panels/universal-access/uap.ui.h:23 -msgid "Use a visual indication when an alert sound occurs." -msgstr "Use a visual indication when an alert sound occurs." - -#: ../panels/universal-access/uap.ui.h:24 +#: ../panels/universal-access/uap.ui.h:27 msgid "_Test flash" msgstr "_Test flash" -#: ../panels/universal-access/uap.ui.h:25 +#: ../panels/universal-access/uap.ui.h:28 +msgid "Use a visual indication when an alert sound occurs." +msgstr "Use a visual indication when an alert sound occurs." + +#: ../panels/universal-access/uap.ui.h:29 msgid "Flash the _window title" msgstr "Flash the _window title" -#: ../panels/universal-access/uap.ui.h:26 +#: ../panels/universal-access/uap.ui.h:30 msgid "Flash the entire _screen" msgstr "Flash the entire _screen" -#: ../panels/universal-access/uap.ui.h:27 +#: ../panels/universal-access/uap.ui.h:31 +msgid "Repeat Keys" +msgstr "Repeat Keys" + +#: ../panels/universal-access/uap.ui.h:32 +msgid "Key presses repeat when key is held down." +msgstr "Key presses repeat when key is held down." + +#: ../panels/universal-access/uap.ui.h:34 +msgid "Repeat keys delay" +msgstr "Repeat keys delay" + +#: ../panels/universal-access/uap.ui.h:35 +msgid "Speed" +msgstr "Speed" + +#: ../panels/universal-access/uap.ui.h:36 +msgid "Repeat keys speed" +msgstr "Repeat keys speed" + +#: ../panels/universal-access/uap.ui.h:37 +msgid "Cursor Blinking" +msgstr "Cursor Blinking" + +#: ../panels/universal-access/uap.ui.h:38 +msgid "Cursor blinks in text fields." +msgstr "Cursor blinks in text fields." + +#: ../panels/universal-access/uap.ui.h:39 +msgid "Cursor blinking speed" +msgstr "Cursor blinking speed" + +#: ../panels/universal-access/uap.ui.h:40 msgid "Typing Assist" msgstr "Typing Assist" -#: ../panels/universal-access/uap.ui.h:28 +#: ../panels/universal-access/uap.ui.h:41 msgid "_Sticky Keys" msgstr "_Sticky Keys" -#: ../panels/universal-access/uap.ui.h:29 +#: ../panels/universal-access/uap.ui.h:42 msgid "Treats a sequence of modifier keys as a key combination" msgstr "Treats a sequence of modifier keys as a key combination" -#: ../panels/universal-access/uap.ui.h:30 +#: ../panels/universal-access/uap.ui.h:43 msgid "_Disable if two keys are pressed together" msgstr "_Disable if two keys are pressed together" -#: ../panels/universal-access/uap.ui.h:31 -msgid "Beep when a _modifer key is pressed" -msgstr "Beep when a _modifer key is pressed" +#: ../panels/universal-access/uap.ui.h:44 +msgid "Beep when a _modifier key is pressed" +msgstr "Beep when a _modifier key is pressed" -#: ../panels/universal-access/uap.ui.h:32 +#: ../panels/universal-access/uap.ui.h:45 msgid "S_low Keys" msgstr "S_low Keys" -#: ../panels/universal-access/uap.ui.h:33 +#: ../panels/universal-access/uap.ui.h:46 msgid "Puts a delay between when a key is pressed and when it is accepted" msgstr "Puts a delay between when a key is pressed and when it is accepted" -#: ../panels/universal-access/uap.ui.h:34 +#: ../panels/universal-access/uap.ui.h:47 msgid "A_cceptance delay:" msgstr "A_cceptance delay:" -#: ../panels/universal-access/uap.ui.h:35 +#: ../panels/universal-access/uap.ui.h:48 msgctxt "slow keys delay" msgid "Short" msgstr "Short" -#: ../panels/universal-access/uap.ui.h:36 +#: ../panels/universal-access/uap.ui.h:49 msgid "Slow keys typing delay" msgstr "Slow keys typing delay" -#: ../panels/universal-access/uap.ui.h:37 +#: ../panels/universal-access/uap.ui.h:50 msgctxt "slow keys delay" msgid "Long" msgstr "Long" -#: ../panels/universal-access/uap.ui.h:38 +#: ../panels/universal-access/uap.ui.h:51 msgid "Beep when a key is pr_essed" msgstr "Beep when a key is pr_essed" -#: ../panels/universal-access/uap.ui.h:39 +#: ../panels/universal-access/uap.ui.h:52 msgid "Beep when a key is _accepted" msgstr "Beep when a key is _accepted" -#: ../panels/universal-access/uap.ui.h:40 +#: ../panels/universal-access/uap.ui.h:53 msgid "Beep when a key is _rejected" msgstr "Beep when a key is _rejected" -#: ../panels/universal-access/uap.ui.h:41 +#: ../panels/universal-access/uap.ui.h:54 msgid "_Bounce Keys" msgstr "_Bounce Keys" -#: ../panels/universal-access/uap.ui.h:42 +#: ../panels/universal-access/uap.ui.h:55 msgid "Ignores fast duplicate keypresses" msgstr "Ignores fast duplicate keypresses" -#: ../panels/universal-access/uap.ui.h:43 +#: ../panels/universal-access/uap.ui.h:56 msgctxt "bounce keys delay" msgid "Short" msgstr "Short" -#: ../panels/universal-access/uap.ui.h:44 +#: ../panels/universal-access/uap.ui.h:57 msgid "Bounce keys typing delay" msgstr "Bounce keys typing delay" -#: ../panels/universal-access/uap.ui.h:45 +#: ../panels/universal-access/uap.ui.h:58 msgctxt "bounce keys delay" msgid "Long" msgstr "Long" -#: ../panels/universal-access/uap.ui.h:46 +#: ../panels/universal-access/uap.ui.h:59 msgid "_Enable by Keyboard" msgstr "_Enable by Keyboard" -#: ../panels/universal-access/uap.ui.h:47 +#: ../panels/universal-access/uap.ui.h:60 msgid "Turn accessibility features on and off using the keyboard" msgstr "Turn accessibility features on and off using the keyboard" -#: ../panels/universal-access/uap.ui.h:48 +#: ../panels/universal-access/uap.ui.h:61 msgid "Click Assist" msgstr "Click Assist" -#: ../panels/universal-access/uap.ui.h:49 +#: ../panels/universal-access/uap.ui.h:62 msgid "_Simulated Secondary Click" msgstr "_Simulated Secondary Click" -#: ../panels/universal-access/uap.ui.h:50 +#: ../panels/universal-access/uap.ui.h:63 msgid "Trigger a secondary click by holding down the primary button" msgstr "Trigger a secondary click by holding down the primary button" -#: ../panels/universal-access/uap.ui.h:51 +#: ../panels/universal-access/uap.ui.h:64 msgctxt "secondary click" msgid "Short" msgstr "Short" -#: ../panels/universal-access/uap.ui.h:52 +#: ../panels/universal-access/uap.ui.h:65 msgid "Secondary click delay" msgstr "Secondary click delay" -#: ../panels/universal-access/uap.ui.h:53 +#: ../panels/universal-access/uap.ui.h:66 msgctxt "secondary click delay" msgid "Long" msgstr "Long" -#: ../panels/universal-access/uap.ui.h:54 +#: ../panels/universal-access/uap.ui.h:67 msgid "_Hover Click" msgstr "_Hover Click" -#: ../panels/universal-access/uap.ui.h:55 +#: ../panels/universal-access/uap.ui.h:68 msgid "Trigger a click when the pointer hovers" msgstr "Trigger a click when the pointer hovers" -#: ../panels/universal-access/uap.ui.h:56 +#: ../panels/universal-access/uap.ui.h:69 msgid "D_elay:" msgstr "D_elay:" -#: ../panels/universal-access/uap.ui.h:57 +#: ../panels/universal-access/uap.ui.h:70 msgctxt "dwell click delay" msgid "Short" msgstr "Short" -#: ../panels/universal-access/uap.ui.h:58 +#: ../panels/universal-access/uap.ui.h:71 msgctxt "dwell click delay" msgid "Long" msgstr "Long" -#: ../panels/universal-access/uap.ui.h:59 +#: ../panels/universal-access/uap.ui.h:72 msgid "Motion _threshold:" msgstr "Motion _threshold:" -#: ../panels/universal-access/uap.ui.h:60 +#: ../panels/universal-access/uap.ui.h:73 msgctxt "dwell click threshold" msgid "Small" msgstr "Small" -#: ../panels/universal-access/uap.ui.h:61 +#: ../panels/universal-access/uap.ui.h:74 msgctxt "dwell click threshold" msgid "Large" msgstr "Large" -#: ../panels/universal-access/zoom-options.c:357 +#: ../panels/universal-access/zoom-options.c:333 msgctxt "Distance" msgid "Short" msgstr "Short" -#: ../panels/universal-access/zoom-options.c:358 +#: ../panels/universal-access/zoom-options.c:334 msgctxt "Distance" msgid "¼ Screen" msgstr "¼ Screen" -#: ../panels/universal-access/zoom-options.c:359 +#: ../panels/universal-access/zoom-options.c:335 msgctxt "Distance" msgid "½ Screen" msgstr "½ Screen" -#: ../panels/universal-access/zoom-options.c:360 +#: ../panels/universal-access/zoom-options.c:336 msgctxt "Distance" msgid "¾ Screen" msgstr "¾ Screen" -#: ../panels/universal-access/zoom-options.c:361 +#: ../panels/universal-access/zoom-options.c:337 msgctxt "Distance" msgid "Long" msgstr "Long" @@ -5762,37 +5934,33 @@ msgid "Zoom Options" msgstr "Zoom Options" -#: ../panels/universal-access/zoom-options.ui.h:7 -msgid "Zoom" -msgstr "Zoom" - #: ../panels/universal-access/zoom-options.ui.h:8 -msgid "Magnification:" -msgstr "Magnification:" +msgid "_Magnification:" +msgstr "_Magnification:" #: ../panels/universal-access/zoom-options.ui.h:9 -msgid "Follow mouse cursor" -msgstr "Follow mouse cursor" +msgid "_Follow mouse cursor" +msgstr "_Follow mouse cursor" #: ../panels/universal-access/zoom-options.ui.h:10 -msgid "Screen part:" -msgstr "Screen part:" +msgid "_Screen part:" +msgstr "_Screen part:" #: ../panels/universal-access/zoom-options.ui.h:11 -msgid "Magnifier extends outside of screen" -msgstr "Magnifier extends outside of screen" +msgid "Magnifier _extends outside of screen" +msgstr "Magnifier _extends outside of screen" #: ../panels/universal-access/zoom-options.ui.h:12 -msgid "Keep magnifier cursor centered" -msgstr "Keep magnifier cursor centred" +msgid "_Keep magnifier cursor centered" +msgstr "_Keep magnifier cursor centered" #: ../panels/universal-access/zoom-options.ui.h:13 -msgid "Magnifier cursor pushes contents around" -msgstr "Magnifier cursor pushes contents around" +msgid "Magnifier cursor _pushes contents around" +msgstr "Magnifier cursor _pushes contents around" #: ../panels/universal-access/zoom-options.ui.h:14 -msgid "Magnifier cursor moves with contents" -msgstr "Magnifier cursor moves with contents" +msgid "Magnifier cursor moves with _contents" +msgstr "Magnifier cursor moves with _contents" #: ../panels/universal-access/zoom-options.ui.h:15 msgid "Magnifier Position:" @@ -5803,8 +5971,8 @@ msgstr "Magnifier" #: ../panels/universal-access/zoom-options.ui.h:17 -msgid "Thickness:" -msgstr "Thickness:" +msgid "_Thickness:" +msgstr "_Thickness:" #: ../panels/universal-access/zoom-options.ui.h:18 msgctxt "universal access, thickness" @@ -5817,43 +5985,43 @@ msgstr "Thick" #: ../panels/universal-access/zoom-options.ui.h:20 -msgid "Length:" -msgstr "Length:" +msgid "_Length:" +msgstr "_Length:" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -msgid "Color:" -msgstr "Colour:" +msgid "Co_lor:" +msgstr "Co_lour:" #: ../panels/universal-access/zoom-options.ui.h:23 -msgid "Crosshairs:" -msgstr "Crosshairs:" +msgid "_Crosshairs:" +msgstr "_Crosshairs:" #: ../panels/universal-access/zoom-options.ui.h:24 -msgid "Overlaps mouse cursor" -msgstr "Overlaps mouse cursor" +msgid "_Overlaps mouse cursor" +msgstr "_Overlaps mouse cursor" #: ../panels/universal-access/zoom-options.ui.h:25 msgid "Crosshairs" msgstr "Crosshairs" #: ../panels/universal-access/zoom-options.ui.h:26 -msgid "White on black:" -msgstr "White on black:" +msgid "_White on black:" +msgstr "_White on black:" #: ../panels/universal-access/zoom-options.ui.h:27 -msgid "Brightness:" -msgstr "Brightness:" +msgid "_Brightness:" +msgstr "_Brightness:" #: ../panels/universal-access/zoom-options.ui.h:28 -msgid "Contrast:" -msgstr "Contrast:" +msgid "_Contrast:" +msgstr "_Contrast:" #. The contrast scale goes from Color to None (grayscale) #: ../panels/universal-access/zoom-options.ui.h:30 msgctxt "universal access, contrast" -msgid "Color" -msgstr "Colour" +msgid "Co_lor" +msgstr "Co_lour" #: ../panels/universal-access/zoom-options.ui.h:31 msgctxt "universal access, color" @@ -5894,88 +6062,67 @@ msgstr "Colour Effects" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:35 -msgctxt "Account type" -msgid "Standard" -msgstr "Standard" - -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:37 -msgctxt "Account type" -msgid "Administrator" -msgstr "Administrator" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Add User" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 +#: ../panels/user-accounts/data/account-dialog.ui.h:5 msgid "_Full Name" msgstr "_Full Name" -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Account _Type" -msgstr "Account _Type" +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +msgid "Standard" +msgstr "Standard" #: ../panels/user-accounts/data/account-dialog.ui.h:7 -#: ../panels/user-accounts/data/password-dialog.ui.h:4 -msgid "Allow user to set a password when they next login" -msgstr "Allow user to set a password when they next log in" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +msgid "Administrator" +msgstr "Administrator" #: ../panels/user-accounts/data/account-dialog.ui.h:8 -#: ../panels/user-accounts/data/password-dialog.ui.h:5 -msgid "Set a password now" -msgstr "Set a password now" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 +msgid "Account _Type" +msgstr "Account _Type" #: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verify" +msgid "Allow user to set a password when they next _login" +msgstr "Allow user to set a password when they next _login" #: ../panels/user-accounts/data/account-dialog.ui.h:11 +msgid "Set a password _now" +msgstr "Set a password _now" + +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirm" + +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domain" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Go online to add\n" -"enterprise login accounts." - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. #: ../panels/user-accounts/data/account-dialog.ui.h:16 -msgid "_Enroll" -msgstr "_Enroll" +msgid "You are Offline" +msgstr "You are Offline" #: ../panels/user-accounts/data/account-dialog.ui.h:17 -msgid "Domain Administrator Login" -msgstr "Domain Administrator Login" +msgid "You must be online in order to add enterprise users." +msgstr "You must be online in order to add enterprise users." #: ../panels/user-accounts/data/account-dialog.ui.h:18 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "Administrator _Name" -msgstr "Administrator _Name" - -#: ../panels/user-accounts/data/account-dialog.ui.h:22 -msgid "Administrator Password" -msgstr "Administrator Password" +msgid "_Enterprise Login" +msgstr "_Enterprise Login" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6010,7 +6157,7 @@ msgstr "Right little finger" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:699 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Enable Fingerprint Login" @@ -6047,90 +6194,78 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Login History" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Enroll" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Domain Administrator Login" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Administrator _Name" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Administrator Password" #: ../panels/user-accounts/data/password-dialog.ui.h:1 +msgid "Change Password" +msgstr "Change Password" + +#: ../panels/user-accounts/data/password-dialog.ui.h:3 +msgid "Ch_ange" +msgstr "Ch_ange" + +#: ../panels/user-accounts/data/password-dialog.ui.h:4 msgid "_Verify New Password" msgstr "_Verify New Password" -#: ../panels/user-accounts/data/password-dialog.ui.h:2 +#: ../panels/user-accounts/data/password-dialog.ui.h:5 msgid "_New Password" msgstr "_New Password" -#: ../panels/user-accounts/data/password-dialog.ui.h:3 +#: ../panels/user-accounts/data/password-dialog.ui.h:6 msgid "Current _Password" msgstr "Current _Password" -#: ../panels/user-accounts/data/password-dialog.ui.h:6 -msgid "Ch_ange" -msgstr "Ch_ange" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:1 -msgid "Changing photo for:" -msgstr "Changing photo for:" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:2 -msgid "" -"Choose a picture that will be shown at the login screen for this account." -msgstr "" -"Choose a picture that will be shown at the login screen for this account." - -#: ../panels/user-accounts/data/photo-dialog.ui.h:3 -msgid "Gallery" -msgstr "Gallery" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:4 -#: ../panels/user-accounts/um-photo-dialog.c:218 -msgid "Browse for more pictures" -msgstr "Browse for more pictures" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:5 -msgid "Take a photograph" -msgstr "Take a photograph" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:6 -msgid "Browse" -msgstr "Browse" - -#: ../panels/user-accounts/data/photo-dialog.ui.h:7 -msgid "Photograph" -msgstr "Photograph" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Account Information" -msgstr "Account Information" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Add User Account" -msgstr "Add User Account" +#: ../panels/user-accounts/data/password-dialog.ui.h:7 +msgid "Allow user to change their password on next login" +msgstr "Allow user to change their password on next login" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 -msgid "Remove User Account" -msgstr "Remove User Account" +#: ../panels/user-accounts/data/password-dialog.ui.h:8 +msgid "Set a password now" +msgstr "Set a password now" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 -msgid "Login Options" -msgstr "Login Options" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Add User…" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 msgid "A_utomatic Login" msgstr "A_utomatic Login" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Fingerprint Login" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "User Icon" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 -msgid "_Language" -msgstr "_Language" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Last Login" @@ -6142,77 +6277,77 @@ msgid "Authentication is required to change user data" msgstr "Authentication is required to change user data" -#: ../panels/user-accounts/pw-utils.c:82 +#: ../panels/user-accounts/pw-utils.c:81 msgctxt "Password hint" msgid "The new password needs to be different from the old one." msgstr "The new password needs to be different from the old one." -#: ../panels/user-accounts/pw-utils.c:84 +#: ../panels/user-accounts/pw-utils.c:83 msgctxt "Password hint" msgid "Try changing some letters and numbers." msgstr "Try changing some letters and numbers." -#: ../panels/user-accounts/pw-utils.c:86 ../panels/user-accounts/pw-utils.c:94 +#: ../panels/user-accounts/pw-utils.c:85 ../panels/user-accounts/pw-utils.c:93 msgctxt "Password hint" msgid "Try changing the password a bit more." msgstr "Try changing the password a bit more." -#: ../panels/user-accounts/pw-utils.c:88 +#: ../panels/user-accounts/pw-utils.c:87 msgctxt "Password hint" msgid "A password without your user name would be stronger." msgstr "A password without your username would be stronger." -#: ../panels/user-accounts/pw-utils.c:90 +#: ../panels/user-accounts/pw-utils.c:89 msgctxt "Password hint" msgid "Try to avoid using your name in the password." msgstr "Try to avoid using your name in the password." -#: ../panels/user-accounts/pw-utils.c:92 +#: ../panels/user-accounts/pw-utils.c:91 msgctxt "Password hint" msgid "Try to avoid some of the words included in the password." msgstr "Try to avoid some of the words included in the password." -#: ../panels/user-accounts/pw-utils.c:96 +#: ../panels/user-accounts/pw-utils.c:95 msgctxt "Password hint" msgid "Try to avoid common words." msgstr "Try to avoid common words." -#: ../panels/user-accounts/pw-utils.c:98 +#: ../panels/user-accounts/pw-utils.c:97 msgctxt "Password hint" msgid "Try to avoid reordering existing words." msgstr "Try to avoid reordering existing words." -#: ../panels/user-accounts/pw-utils.c:100 +#: ../panels/user-accounts/pw-utils.c:99 msgctxt "Password hint" msgid "Try to use more numbers." msgstr "Try to use more numbers." -#: ../panels/user-accounts/pw-utils.c:102 +#: ../panels/user-accounts/pw-utils.c:101 msgctxt "Password hint" msgid "Try to use more uppercase letters." msgstr "Try to use more uppercase letters." -#: ../panels/user-accounts/pw-utils.c:104 +#: ../panels/user-accounts/pw-utils.c:103 msgctxt "Password hint" msgid "Try to use more lowercase letters." msgstr "Try to use more lowercase letters." -#: ../panels/user-accounts/pw-utils.c:106 +#: ../panels/user-accounts/pw-utils.c:105 msgctxt "Password hint" msgid "Try to use more special characters, like punctuation." msgstr "Try to use more special characters, like punctuation." -#: ../panels/user-accounts/pw-utils.c:108 +#: ../panels/user-accounts/pw-utils.c:107 msgctxt "Password hint" msgid "Try to use a mixture of letters, numbers and punctuation." msgstr "Try to use a mixture of letters, numbers and punctuation." -#: ../panels/user-accounts/pw-utils.c:110 +#: ../panels/user-accounts/pw-utils.c:109 msgctxt "Password hint" msgid "Try to avoid repeating the same character." msgstr "Try to avoid repeating the same character." -#: ../panels/user-accounts/pw-utils.c:112 +#: ../panels/user-accounts/pw-utils.c:111 msgctxt "Password hint" msgid "" "Try to avoid repeating the same type of character: you need to mix up " @@ -6221,22 +6356,22 @@ "Try to avoid repeating the same type of character: you need to mix up " "letters, numbers and punctuation." -#: ../panels/user-accounts/pw-utils.c:114 +#: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" msgid "Try to avoid sequences like 1234 or abcd." msgstr "Try to avoid sequences like 1234 or abcd." -#: ../panels/user-accounts/pw-utils.c:116 +#: ../panels/user-accounts/pw-utils.c:115 msgctxt "Password hint" msgid "Try to add more letters, numbers and symbols." msgstr "Try to add more letters, numbers and symbols." -#: ../panels/user-accounts/pw-utils.c:118 +#: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Mix uppercase and lowercase and try to use a number or two." -#: ../panels/user-accounts/pw-utils.c:120 +#: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" msgid "" "Good password! Adding more letters, numbers and punctuation will make it " @@ -6245,115 +6380,112 @@ "Good password! Adding more letters, numbers and punctuation will make it " "stronger." -#: ../panels/user-accounts/pw-utils.c:142 -#: ../panels/user-accounts/pw-utils.c:172 +#: ../panels/user-accounts/pw-utils.c:141 +#: ../panels/user-accounts/pw-utils.c:171 msgctxt "Password strength" msgid "Strength: Weak" msgstr "Strength: Weak" -#: ../panels/user-accounts/pw-utils.c:146 -#: ../panels/user-accounts/pw-utils.c:173 +#: ../panels/user-accounts/pw-utils.c:145 +#: ../panels/user-accounts/pw-utils.c:172 msgctxt "Password strength" msgid "Strength: Low" msgstr "Strength: Low" -#: ../panels/user-accounts/pw-utils.c:149 -#: ../panels/user-accounts/pw-utils.c:174 +#: ../panels/user-accounts/pw-utils.c:148 +#: ../panels/user-accounts/pw-utils.c:173 msgctxt "Password strength" msgid "Strength: Medium" msgstr "Strength: Medium" -#: ../panels/user-accounts/pw-utils.c:152 -#: ../panels/user-accounts/pw-utils.c:175 +#: ../panels/user-accounts/pw-utils.c:151 +#: ../panels/user-accounts/pw-utils.c:174 msgctxt "Password strength" msgid "Strength: Good" msgstr "Strength: Good" -#: ../panels/user-accounts/pw-utils.c:155 -#: ../panels/user-accounts/pw-utils.c:176 +#: ../panels/user-accounts/pw-utils.c:154 +#: ../panels/user-accounts/pw-utils.c:175 msgctxt "Password strength" msgid "Strength: High" msgstr "Strength: High" -#: ../panels/user-accounts/run-passwd.c:424 +#: ../panels/user-accounts/run-passwd.c:422 msgid "Authentication failed" msgstr "Authentication failed" -#: ../panels/user-accounts/run-passwd.c:504 +#: ../panels/user-accounts/run-passwd.c:502 #, c-format msgid "The new password is too short" msgstr "The new password is too short" -#: ../panels/user-accounts/run-passwd.c:510 +#: ../panels/user-accounts/run-passwd.c:508 #, c-format msgid "The new password is too simple" msgstr "The new password is too simple" -#: ../panels/user-accounts/run-passwd.c:516 +#: ../panels/user-accounts/run-passwd.c:514 #, c-format msgid "The old and new passwords are too similar" msgstr "The old and new passwords are too similar" -#: ../panels/user-accounts/run-passwd.c:519 +#: ../panels/user-accounts/run-passwd.c:517 #, c-format msgid "The new password has already been used recently." msgstr "The new password has already been used recently." -#: ../panels/user-accounts/run-passwd.c:522 +#: ../panels/user-accounts/run-passwd.c:520 #, c-format msgid "The new password must contain numeric or special characters" msgstr "The new password must contain numeric or special characters" -#: ../panels/user-accounts/run-passwd.c:526 +#: ../panels/user-accounts/run-passwd.c:524 #, c-format msgid "The old and new passwords are the same" msgstr "The old and new passwords are the same" -#: ../panels/user-accounts/run-passwd.c:530 +#: ../panels/user-accounts/run-passwd.c:528 #, c-format msgid "Your password has been changed since you initially authenticated!" msgstr "Your password has been changed since you initially authenticated!" -#: ../panels/user-accounts/run-passwd.c:534 +#: ../panels/user-accounts/run-passwd.c:532 #, c-format msgid "The new password does not contain enough different characters" msgstr "The new password does not contain enough different characters" -#: ../panels/user-accounts/run-passwd.c:538 +#: ../panels/user-accounts/run-passwd.c:536 #, c-format msgid "Unknown error" msgstr "Unknown error" -#: ../panels/user-accounts/um-account-dialog.c:35 -msgid "Should match the web address of your account provider." -msgstr "Should match the web address of your account provider." +#: ../panels/user-accounts/um-account-dialog.c:34 +msgid "Should match the web address of your login provider." +msgstr "Should match the web address of your login provider." -#: ../panels/user-accounts/um-account-dialog.c:222 +#: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Failed to add account" -#: ../panels/user-accounts/um-account-dialog.c:316 -msgid "This will be used to name your home folder and can't be changed." -msgstr "This will be used to name your home folder and can’t be changed." - -#: ../panels/user-accounts/um-account-dialog.c:449 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Passwords do not match." -#: ../panels/user-accounts/um-account-dialog.c:719 -#: ../panels/user-accounts/um-account-dialog.c:765 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Failed to register account" -#: ../panels/user-accounts/um-account-dialog.c:903 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "No supported way to authenticate with this domain" -#: ../panels/user-accounts/um-account-dialog.c:962 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Failed to join domain" -#: ../panels/user-accounts/um-account-dialog.c:1023 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6361,7 +6493,7 @@ "That login name didn’t work.\n" "Please try again." -#: ../panels/user-accounts/um-account-dialog.c:1030 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6369,51 +6501,51 @@ "That login password didn’t work.\n" "Please try again." -#: ../panels/user-accounts/um-account-dialog.c:1038 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Failed to log into domain" -#: ../panels/user-accounts/um-account-dialog.c:1096 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Unable find the domain. Maybe you misspelled it?" -#: ../panels/user-accounts/um-account-dialog.c:1446 -msgid "Add User" -msgstr "Add User" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standard" -#. Create enterprise toggle button. -#: ../panels/user-accounts/um-account-dialog.c:1459 -msgid "_Enterprise Login" -msgstr "_Enterprise Login" +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrator" -#: ../panels/user-accounts/um-fingerprint-dialog.c:139 +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "You are not allowed to access the device. Contact your system administrator." -#: ../panels/user-accounts/um-fingerprint-dialog.c:141 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "The device is already in use." -#: ../panels/user-accounts/um-fingerprint-dialog.c:143 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "An internal error occurred." -#: ../panels/user-accounts/um-fingerprint-dialog.c:219 -#: ../panels/user-accounts/um-fingerprint-dialog.c:220 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Enabled" -#: ../panels/user-accounts/um-fingerprint-dialog.c:268 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Delete registered fingerprints?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:272 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Delete Fingerprints" -#: ../panels/user-accounts/um-fingerprint-dialog.c:278 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6421,15 +6553,15 @@ "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:454 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Done!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:515 -#: ../panels/user-accounts/um-fingerprint-dialog.c:557 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Could not access ‘%s’ device" @@ -6437,16 +6569,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:598 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Could not start finger capture on ‘%s’ device" -#: ../panels/user-accounts/um-fingerprint-dialog.c:649 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Could not access any fingerprint readers" -#: ../panels/user-accounts/um-fingerprint-dialog.c:650 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Please contact your system administrator for help." @@ -6455,7 +6587,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:733 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6464,19 +6596,19 @@ "To enable fingerprint login, you need to save one of your fingerprints, " "using the ‘%s’ device." -#: ../panels/user-accounts/um-fingerprint-dialog.c:740 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Selecting finger" -#: ../panels/user-accounts/um-fingerprint-dialog.c:741 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Enrolling fingerprints" -#: ../panels/user-accounts/um-history-dialog.c:88 +#: ../panels/user-accounts/um-history-dialog.c:70 msgid "This Week" msgstr "This Week" -#: ../panels/user-accounts/um-history-dialog.c:91 +#: ../panels/user-accounts/um-history-dialog.c:73 msgid "Last Week" msgstr "Last Week" @@ -6484,22 +6616,22 @@ #. shown as the first day of a week on login history dialog. #. Translators: This is a date format string in the style of "Feb 24", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:97 -#: ../panels/user-accounts/um-history-dialog.c:101 +#: ../panels/user-accounts/um-history-dialog.c:79 +#: ../panels/user-accounts/um-history-dialog.c:83 msgctxt "login history week label" msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:106 +#: ../panels/user-accounts/um-history-dialog.c:88 msgctxt "login history week label" msgid "%b %e, %Y" msgstr "%e %b, %Y" #. Translators: This indicates a week label on a login history. #. The first %s is the first day of a week, and the second %s the last day. -#: ../panels/user-accounts/um-history-dialog.c:111 +#: ../panels/user-accounts/um-history-dialog.c:93 #, c-format msgctxt "login history week label" msgid "%s - %s" @@ -6507,104 +6639,121 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. -#: ../panels/user-accounts/um-history-dialog.c:195 -#: ../panels/user-accounts/um-user-panel.c:626 +#: ../panels/user-accounts/um-history-dialog.c:177 +#: ../panels/user-accounts/um-user-panel.c:841 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. -#: ../panels/user-accounts/um-history-dialog.c:198 -#: ../panels/user-accounts/um-user-panel.c:630 +#: ../panels/user-accounts/um-history-dialog.c:180 +#: ../panels/user-accounts/um-user-panel.c:845 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:260 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Session Ended" -#: ../panels/user-accounts/um-history-dialog.c:266 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Session Started" -#: ../panels/user-accounts/um-password-dialog.c:146 +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Account Activity" + +#: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Please choose another password." -#: ../panels/user-accounts/um-password-dialog.c:155 +#: ../panels/user-accounts/um-password-dialog.c:154 msgid "Please type your current password again." msgstr "Please type your current password again." -#: ../panels/user-accounts/um-password-dialog.c:161 +#: ../panels/user-accounts/um-password-dialog.c:160 msgid "Password could not be changed" msgstr "Password could not be changed" -#: ../panels/user-accounts/um-password-dialog.c:287 +#: ../panels/user-accounts/um-password-dialog.c:286 msgid "The passwords do not match." msgstr "The passwords do not match." -#: ../panels/user-accounts/um-photo-dialog.c:443 +#: ../panels/user-accounts/um-photo-dialog.c:214 +msgid "Browse for more pictures" +msgstr "Browse for more pictures" + +#: ../panels/user-accounts/um-photo-dialog.c:448 msgid "Disable image" msgstr "Disable image" -#: ../panels/user-accounts/um-photo-dialog.c:461 +#: ../panels/user-accounts/um-photo-dialog.c:466 msgid "Take a photo…" msgstr "Take a photo…" -#: ../panels/user-accounts/um-photo-dialog.c:479 +#: ../panels/user-accounts/um-photo-dialog.c:484 msgid "Browse for more pictures…" msgstr "Browse for more pictures…" -#: ../panels/user-accounts/um-photo-dialog.c:703 +#: ../panels/user-accounts/um-photo-dialog.c:708 #, c-format msgid "Used by %s" msgstr "Used by %s" -#: ../panels/user-accounts/um-realm-manager.c:351 +#: ../panels/user-accounts/um-realm-manager.c:350 msgid "Cannot automatically join this type of domain" msgstr "Cannot automatically join this type of domain" -#: ../panels/user-accounts/um-realm-manager.c:414 +#: ../panels/user-accounts/um-realm-manager.c:413 #, c-format msgid "No such domain or realm found" msgstr "No such domain or realm found" -#: ../panels/user-accounts/um-realm-manager.c:814 -#: ../panels/user-accounts/um-realm-manager.c:828 +#: ../panels/user-accounts/um-realm-manager.c:815 +#: ../panels/user-accounts/um-realm-manager.c:829 #, c-format msgid "Cannot log in as %s at the %s domain" msgstr "Cannot log in as %s at the %s domain" -#: ../panels/user-accounts/um-realm-manager.c:820 +#: ../panels/user-accounts/um-realm-manager.c:821 msgid "Invalid password, please try again" msgstr "Invalid password, please try again" -#: ../panels/user-accounts/um-realm-manager.c:833 +#: ../panels/user-accounts/um-realm-manager.c:834 #, c-format msgid "Couldn't connect to the %s domain: %s" msgstr "Couldn’t connect to the %s domain: %s" -#: ../panels/user-accounts/um-user-panel.c:193 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Other Accounts" -#: ../panels/user-accounts/um-user-panel.c:412 +#: ../panels/user-accounts/um-user-panel.c:447 msgid "Failed to delete user" msgstr "Failed to delete user" -#: ../panels/user-accounts/um-user-panel.c:477 +#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:566 +#: ../panels/user-accounts/um-user-panel.c:618 +msgid "Failed to revoke remotely managed user" +msgstr "Failed to revoke remotely managed user" + +#: ../panels/user-accounts/um-user-panel.c:674 msgid "You cannot delete your own account." msgstr "You cannot delete your own account." -#: ../panels/user-accounts/um-user-panel.c:486 +#: ../panels/user-accounts/um-user-panel.c:683 #, c-format msgid "%s is still logged in" msgstr "%s is still logged in" -#: ../panels/user-accounts/um-user-panel.c:490 +#: ../panels/user-accounts/um-user-panel.c:687 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -6612,12 +6761,12 @@ "Deleting a user while they are logged in can leave the system in an " "inconsistent state." -#: ../panels/user-accounts/um-user-panel.c:499 +#: ../panels/user-accounts/um-user-panel.c:696 #, c-format msgid "Do you want to keep %s's files?" msgstr "Do you want to keep %s’s files?" -#: ../panels/user-accounts/um-user-panel.c:503 +#: ../panels/user-accounts/um-user-panel.c:700 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -6625,42 +6774,51 @@ "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." -#: ../panels/user-accounts/um-user-panel.c:506 +#: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" msgstr "_Delete Files" -#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:704 msgid "_Keep Files" msgstr "_Keep Files" -#: ../panels/user-accounts/um-user-panel.c:559 +#: ../panels/user-accounts/um-user-panel.c:718 +#, c-format +msgid "Are you sure you want to revoke remotely managed %s's account?" +msgstr "Are you sure you want to revoke remotely managed %s's account?" + +#: ../panels/user-accounts/um-user-panel.c:722 +msgid "_Delete" +msgstr "_Delete" + +#: ../panels/user-accounts/um-user-panel.c:774 msgctxt "Password mode" msgid "Account disabled" msgstr "Account disabled" -#: ../panels/user-accounts/um-user-panel.c:567 +#: ../panels/user-accounts/um-user-panel.c:782 msgctxt "Password mode" msgid "To be set at next login" msgstr "To be set at next login" -#: ../panels/user-accounts/um-user-panel.c:570 +#: ../panels/user-accounts/um-user-panel.c:785 msgctxt "Password mode" msgid "None" msgstr "None" -#: ../panels/user-accounts/um-user-panel.c:619 +#: ../panels/user-accounts/um-user-panel.c:834 msgid "Logged in" msgstr "Logged in" -#: ../panels/user-accounts/um-user-panel.c:999 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Failed to contact the accounts service" -#: ../panels/user-accounts/um-user-panel.c:1001 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Please make sure that the AccountService is installed and enabled." -#: ../panels/user-accounts/um-user-panel.c:1042 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6668,12 +6826,12 @@ "To make changes,\n" "click the * icon first" -#: ../panels/user-accounts/um-user-panel.c:1080 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Create a user account" -#: ../panels/user-accounts/um-user-panel.c:1091 -#: ../panels/user-accounts/um-user-panel.c:1380 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6681,12 +6839,12 @@ "To create a user account,\n" "click the * icon first" -#: ../panels/user-accounts/um-user-panel.c:1101 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Delete the selected user account" -#: ../panels/user-accounts/um-user-panel.c:1113 -#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6694,51 +6852,44 @@ "To delete the selected user account,\n" "click the * icon first" -#: ../panels/user-accounts/um-user-panel.c:1295 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "My Account" -#: ../panels/user-accounts/um-utils.c:551 -#, c-format -msgid "A user with the username '%s' already exists" -msgstr "A user with the username ‘%s’ already exists" +#: ../panels/user-accounts/um-utils.c:563 +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Sorry, that user name isn't available. Please try another." -#: ../panels/user-accounts/um-utils.c:555 +#: ../panels/user-accounts/um-utils.c:566 #, c-format -msgid "The username is too long" -msgstr "The username is too long" +msgid "The username is too long." +msgstr "The username is too long." -#: ../panels/user-accounts/um-utils.c:558 -msgid "The username cannot start with a '-'" -msgstr "The username cannot start with a ‘-’" +#: ../panels/user-accounts/um-utils.c:569 +msgid "The username cannot start with a '-'." +msgstr "The username cannot start with a '-'." -#: ../panels/user-accounts/um-utils.c:561 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'" +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"The username should only consist of lower- and uppercase letters from a–z, " -"digits and any of the characters ‘.’, ‘-’ and ‘_’." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" -#. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/user-accounts/um-utils.c:811 -msgid "%b %e" -msgstr "%e %b" - -#. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/user-accounts/um-utils.c:815 -msgid "%b %e, %Y" -msgstr "%e %b, %Y" +#: ../panels/user-accounts/um-utils.c:576 +msgid "This will be used to name your home folder and can't be changed." +msgstr "This will be used to name your home folder and can’t be changed." #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" msgstr "Map Buttons" -#: ../panels/wacom/button-mapping.ui.h:2 +#: ../panels/wacom/button-mapping.ui.h:3 msgid "Map buttons to functions" msgstr "Map buttons to functions" -#: ../panels/wacom/button-mapping.ui.h:3 +#: ../panels/wacom/button-mapping.ui.h:4 msgid "" "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." @@ -6746,7 +6897,7 @@ "To edit a shortcut, choose the ‘Send Keystroke’ action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." -#: ../panels/wacom/calibrator/calibrator-gui.c:82 +#: ../panels/wacom/calibrator/calibrator-gui.c:83 msgid "" "Please tap the target markers as they appear on screen to calibrate the " "tablet." @@ -6754,367 +6905,918 @@ "Please tap the target markers as they appear on screen to calibrate the " "tablet." -#: ../panels/wacom/calibrator/calibrator-gui.c:86 +#: ../panels/wacom/calibrator/calibrator-gui.c:87 msgid "Mis-click detected, restarting..." msgstr "Mis-click detected, restarting…" -#: ../panels/wacom/cc-wacom-button-row.c:443 +#: ../panels/wacom/cc-wacom-button-row.c:442 msgctxt "Wacom tablet button" msgid "Up" msgstr "Up" -#: ../panels/wacom/cc-wacom-button-row.c:444 +#: ../panels/wacom/cc-wacom-button-row.c:443 msgctxt "Wacom tablet button" msgid "Down" msgstr "Down" -#: ../panels/wacom/cc-wacom-button-row.h:55 +#: ../panels/wacom/cc-wacom-button-row.h:54 msgctxt "Wacom action-type" msgid "None" msgstr "None" -#: ../panels/wacom/cc-wacom-button-row.h:56 +#: ../panels/wacom/cc-wacom-button-row.h:55 msgctxt "Wacom action-type" msgid "Send Keystroke" msgstr "Send Keystroke" -#: ../panels/wacom/cc-wacom-button-row.h:57 +#: ../panels/wacom/cc-wacom-button-row.h:56 msgctxt "Wacom action-type" msgid "Switch Monitor" msgstr "Switch Monitor" -#: ../panels/wacom/cc-wacom-button-row.h:58 -msgctxt "Wacom action-type" -msgid "Show On-Screen Help" -msgstr "Show On-Screen Help" +#: ../panels/wacom/cc-wacom-button-row.h:57 +msgctxt "Wacom action-type" +msgid "Show On-Screen Help" +msgstr "Show On-Screen Help" + +#: ../panels/wacom/cc-wacom-mapping-panel.c:263 +msgid "Output:" +msgstr "Output:" + +#. Keep ratio switch +#: ../panels/wacom/cc-wacom-mapping-panel.c:275 +msgid "Keep aspect ratio (letterbox):" +msgstr "Keep aspect ratio (letterbox):" + +#. Whole-desktop checkbox +#: ../panels/wacom/cc-wacom-mapping-panel.c:286 +msgid "Map to single monitor" +msgstr "Map to single monitor" + +#: ../panels/wacom/cc-wacom-nav-button.c:88 +#, c-format +msgid "%d of %d" +msgstr "%d of %d" + +#: ../panels/wacom/cc-wacom-page.c:522 +msgid "Display Mapping" +msgstr "Display Mapping" + +#: ../panels/wacom/cc-wacom-stylus-page.c:377 +msgid "Button" +msgstr "Button" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa­com Tab­let" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 +msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" +msgstr "Set button mappings and adjust stylus sensitivity for graphics tablets" + +#. Translators: those are keywords for the wacom tablet control-center panel +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 +msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" +msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:1 +msgid "Tablet (absolute)" +msgstr "Tablet (absolute)" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:2 +msgid "Touchpad (relative)" +msgstr "Touchpad (relative)" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:3 +msgid "Tablet Preferences" +msgstr "Tablet Preferences" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:4 +msgid "_Help" +msgstr "_Help" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:6 +msgid "No tablet detected" +msgstr "No tablet detected" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:7 +msgid "Please plug in or turn on your Wacom tablet" +msgstr "Please plug in or turn on your Wacom tablet" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:8 +msgid "Bluetooth Settings" +msgstr "Bluetooth Settings" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom Tablet" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:10 +msgid "Map to Monitor…" +msgstr "Map to Monitor…" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:11 +msgid "Map Buttons…" +msgstr "Map Buttons…" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:12 +msgid "Calibrate…" +msgstr "Calibrate…" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:13 +msgid "Adjust display resolution" +msgstr "Adjust display resolution" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:14 +msgid "Adjust mouse settings" +msgstr "Adjust mouse settings" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:15 +msgid "Tracking Mode" +msgstr "Tracking Mode" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:16 +msgid "Left-Handed Orientation" +msgstr "Left-Handed Orientation" + +#. If no mode is available, we use "left-ring-mode-1" for backward compat +#: ../panels/wacom/gsd-wacom-device.c:1028 +msgid "Left Ring" +msgstr "Left Ring" + +#: ../panels/wacom/gsd-wacom-device.c:1039 +#, c-format +msgid "Left Ring Mode #%d" +msgstr "Left Ring Mode #%d" + +#. If no mode is available, we use "right-ring-mode-1" for backward compat +#: ../panels/wacom/gsd-wacom-device.c:1059 +msgid "Right Ring" +msgstr "Right Ring" + +#: ../panels/wacom/gsd-wacom-device.c:1070 +#, c-format +msgid "Right Ring Mode #%d" +msgstr "Right Ring Mode #%d" + +#. If no mode is available, we use "left-strip-mode-1" for backward compat +#: ../panels/wacom/gsd-wacom-device.c:1112 +msgid "Left Touchstrip" +msgstr "Left Touchstrip" + +#: ../panels/wacom/gsd-wacom-device.c:1123 +#, c-format +msgid "Left Touchstrip Mode #%d" +msgstr "Left Touchstrip Mode #%d" + +#. If no mode is available, we use "right-strip-mode-1" for backward compat +#: ../panels/wacom/gsd-wacom-device.c:1143 +msgid "Right Touchstrip" +msgstr "Right Touchstrip" + +#: ../panels/wacom/gsd-wacom-device.c:1154 +#, c-format +msgid "Right Touchstrip Mode #%d" +msgstr "Right Touchstrip Mode #%d" + +#: ../panels/wacom/gsd-wacom-device.c:1180 +#, c-format +msgid "Left Touchring Mode Switch" +msgstr "Left Touchring Mode Switch" + +#: ../panels/wacom/gsd-wacom-device.c:1182 +#, c-format +msgid "Right Touchring Mode Switch" +msgstr "Right Touchring Mode Switch" + +#: ../panels/wacom/gsd-wacom-device.c:1185 +#, c-format +msgid "Left Touchstrip Mode Switch" +msgstr "Left Touchstrip Mode Switch" + +#: ../panels/wacom/gsd-wacom-device.c:1187 +#, c-format +msgid "Right Touchstrip Mode Switch" +msgstr "Right Touchstrip Mode Switch" + +#: ../panels/wacom/gsd-wacom-device.c:1192 +#, c-format +msgid "Mode Switch #%d" +msgstr "Mode Switch #%d" + +#: ../panels/wacom/gsd-wacom-device.c:1238 +#, c-format +msgid "Left Button #%d" +msgstr "Left Button #%d" + +#: ../panels/wacom/gsd-wacom-device.c:1241 +#, c-format +msgid "Right Button #%d" +msgstr "Right Button #%d" + +#: ../panels/wacom/gsd-wacom-device.c:1244 +#, c-format +msgid "Top Button #%d" +msgstr "Top Button #%d" + +#: ../panels/wacom/gsd-wacom-device.c:1247 +#, c-format +msgid "Bottom Button #%d" +msgstr "Bottom Button #%d" + +#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263 +msgid "New shortcut…" +msgstr "New shortcut…" + +#: ../panels/wacom/wacom-stylus-page.ui.h:1 +msgid "No Action" +msgstr "No Action" + +#: ../panels/wacom/wacom-stylus-page.ui.h:2 +msgid "Left Mouse Button Click" +msgstr "Left Mouse Button Click" + +#: ../panels/wacom/wacom-stylus-page.ui.h:3 +msgid "Middle Mouse Button Click" +msgstr "Middle Mouse Button Click" + +#: ../panels/wacom/wacom-stylus-page.ui.h:4 +msgid "Right Mouse Button Click" +msgstr "Right Mouse Button Click" + +#: ../panels/wacom/wacom-stylus-page.ui.h:5 +msgid "Scroll Up" +msgstr "Scroll Up" + +#: ../panels/wacom/wacom-stylus-page.ui.h:6 +msgid "Scroll Down" +msgstr "Scroll Down" + +#: ../panels/wacom/wacom-stylus-page.ui.h:7 +msgid "Scroll Left" +msgstr "Scroll Left" + +#: ../panels/wacom/wacom-stylus-page.ui.h:8 +msgid "Scroll Right" +msgstr "Scroll Right" + +#: ../panels/wacom/wacom-stylus-page.ui.h:9 +msgid "Back" +msgstr "Back" + +#: ../panels/wacom/wacom-stylus-page.ui.h:10 +msgid "Forward" +msgstr "Forward" + +#: ../panels/wacom/wacom-stylus-page.ui.h:11 +msgid "Stylus" +msgstr "Stylus" + +#: ../panels/wacom/wacom-stylus-page.ui.h:12 +msgid "Eraser Pressure Feel" +msgstr "Eraser Pressure Feel" + +#: ../panels/wacom/wacom-stylus-page.ui.h:13 +msgid "Soft" +msgstr "Soft" + +#: ../panels/wacom/wacom-stylus-page.ui.h:14 +msgid "Firm" +msgstr "Firm" + +#: ../panels/wacom/wacom-stylus-page.ui.h:15 +msgid "Top Button" +msgstr "Top Button" + +#: ../panels/wacom/wacom-stylus-page.ui.h:16 +msgid "Lower Button" +msgstr "Lower Button" + +#: ../panels/wacom/wacom-stylus-page.ui.h:17 +msgid "Tip Pressure Feel" +msgstr "Tip Pressure Feel" + +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "All Settings" + +#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 +msgid "GNOME Control Center" +msgstr "GNOME Control Center" + +#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:2 +msgid "Utilities to configure the GNOME desktop" +msgstr "Utilities to configure the GNOME desktop" + +#: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3 +msgid "" +"The control center is GNOME's main interface for configuration of various " +"aspects of your desktop." +msgstr "" +"The control centre is GNOME's main interface for configuration of various " +"aspects of your desktop." + +#: ../shell/cc-application.c:45 +msgid "Display version number" +msgstr "Display version number" + +#: ../shell/cc-application.c:46 +msgid "Enable verbose mode" +msgstr "Enable verbose mode" + +#: ../shell/cc-application.c:47 +msgid "Show the overview" +msgstr "Show the overview" + +#: ../shell/cc-application.c:48 +msgid "Search for the string" +msgstr "Search for the string" + +#: ../shell/cc-application.c:49 +msgid "List possible panel names and exit" +msgstr "List possible panel names and exit" + +#: ../shell/cc-application.c:50 +msgid "Panel to display" +msgstr "Panel to display" + +#: ../shell/cc-application.c:50 +msgid "[PANEL] [ARGUMENT…]" +msgstr "[PANEL] [ARGUMENT…]" + +#: ../shell/cc-application.c:113 +msgid "Available panels:" +msgstr "Available panels:" + +#: ../shell/cc-application.c:252 +msgid "Help" +msgstr "Help" + +#: ../shell/cc-application.c:253 +msgid "Quit" +msgstr "Quit" + +#. Add categories +#: ../shell/cc-window.c:871 +msgctxt "category" +msgid "Personal" +msgstr "Personal" + +#: ../shell/cc-window.c:872 +msgctxt "category" +msgid "Hardware" +msgstr "Hardware" + +#: ../shell/cc-window.c:873 +msgctxt "category" +msgid "System" +msgstr "System" + +#: ../shell/gnome-control-center.desktop.in.in.h:2 +msgid "Preferences;Settings;" +msgstr "Preferences;Settings;" + +#: ../shell/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "General" + +#: ../shell/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "Quit" +msgstr "Quit" + +#: ../shell/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Search" +msgstr "Search" + +#: ../shell/help-overlay.ui.h:4 +msgctxt "shortcut window" +msgid "Panels" +msgstr "Panels" + +#: ../shell/help-overlay.ui.h:5 +msgctxt "shortcut window" +msgid "Go back to the overview" +msgstr "Go back to the overview" + +#: ../shell/help-overlay.ui.h:6 +msgctxt "shortcut window" +msgid "Cancel search" +msgstr "Cancel search" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Keyboard shortcut for %s. Enter new shortcut to change." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." + +#~ msgid "Flickr" +#~ msgstr "Flickr" + +#~ msgid "Set Up New Device" +#~ msgstr "Set Up New Device" + +#~ msgid "Connection" +#~ msgstr "Connection" + +#~ msgid "Paired" +#~ msgstr "Paired" + +#~ msgid "Type" +#~ msgstr "Type" + +#~ msgid "Mouse & Touchpad Settings" +#~ msgstr "Mouse & Touchpad Settings" + +#~ msgid "Sound Settings" +#~ msgstr "Sound Settings" + +#~ msgid "Keyboard Settings" +#~ msgstr "Keyboard Settings" + +#~ msgid "Send Files…" +#~ msgstr "Send Files…" + +#~ msgid "Yes" +#~ msgstr "Yes" + +#~ msgid "No" +#~ msgstr "No" + +#~ msgid "Bluetooth is disabled" +#~ msgstr "Bluetooth is disabled" + +#~ msgid "Visibility" +#~ msgstr "Visibility" + +#~ msgid "Visibility of “%s”" +#~ msgstr "Visibility of “%s”" + +#~ msgid "Remove '%s' from the list of devices?" +#~ msgstr "Remove ‘%s’ from the list of devices?" + +#~ msgid "" +#~ "If you remove the device, you will have to set it up again before next " +#~ "use." +#~ msgstr "" +#~ "If you remove the device, you will have to set it up again before next " +#~ "use." + +#~ msgid "Done" +#~ msgstr "Done" + +#~ msgid "Device type:" +#~ msgstr "Device type:" + +#~ msgid "Manufacturer:" +#~ msgstr "Manufacturer:" + +#~ msgid "Model:" +#~ msgstr "Model:" + +#~ msgid "" +#~ "Image files can be dragged on this window to auto-complete the above " +#~ "fields." +#~ msgstr "" +#~ "Image files can be dragged on this window to auto-complete the above " +#~ "fields." + +#~ msgid "Color" +#~ msgstr "Colour" + +#~ msgid "United States" +#~ msgstr "United States" + +#~ msgid "Germany" +#~ msgstr "Germany" + +#~ msgid "France" +#~ msgstr "France" + +#~ msgid "Spain" +#~ msgstr "Spain" + +#~ msgid "China" +#~ msgstr "China" + +#~ msgid "Switch between AM and PM." +#~ msgstr "Switch between AM and PM." + +#~ msgid "Time _Zone" +#~ msgstr "Time _Zone" + +#~ msgid "Show your primary display on this screen also" +#~ msgstr "Show your primary display on this screen also" + +#~ msgid "Combine" +#~ msgstr "Combine" + +#~ msgid "Join with the primary display to create an extra space" +#~ msgstr "Join with the primary display to create an extra space" + +#~ msgid "Install Updates" +#~ msgstr "Install Updates" + +#~ msgid "System Up-To-Date" +#~ msgstr "System Up-To-Date" + +#~ msgid "_Name:" +#~ msgstr "_Name:" + +#~ msgid "C_ommand:" +#~ msgstr "C_ommand:" + +#~ msgid "_Delay:" +#~ msgstr "_Delay:" + +#~ msgid "_Speed:" +#~ msgstr "_Speed:" + +#~ msgctxt "keyboard, delay" +#~ msgid "Short" +#~ msgstr "Short" + +#~ msgctxt "keyboard, speed" +#~ msgid "Slow" +#~ msgstr "Slow" + +#~ msgctxt "keyboard, delay" +#~ msgid "Long" +#~ msgstr "Long" + +#~ msgctxt "keyboard, speed" +#~ msgid "Fast" +#~ msgstr "Fast" + +#~ msgid "S_peed:" +#~ msgstr "S_peed:" + +#~ msgid "Add Shortcut" +#~ msgstr "Add Shortcut" + +#~ msgid "Remove Shortcut" +#~ msgstr "Remove Shortcut" + +#~ msgid "Shortcuts" +#~ msgstr "Shortcuts" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." + +#~ msgid "_Reassign" +#~ msgstr "_Reassign" + +#~ msgid "Test Your Settings" +#~ msgstr "Test Your Settings" + +#~ msgid "Mouse Preferences" +#~ msgstr "Mouse Preferences" + +#~ msgctxt "double click, speed" +#~ msgid "Slow" +#~ msgstr "Slow" + +#~ msgctxt "double click, speed" +#~ msgid "Fast" +#~ msgstr "Fast" + +#~ msgctxt "mouse, left button as primary" +#~ msgid "_Left" +#~ msgstr "_Left" + +#~ msgctxt "mouse, right button as primary" +#~ msgid "_Right" +#~ msgstr "_Right" + +#~ msgid "_Pointer speed" +#~ msgstr "_Pointer speed" + +#~ msgctxt "mouse pointer, speed" +#~ msgid "Slow" +#~ msgstr "Slow" + +#~ msgctxt "mouse pointer, speed" +#~ msgid "Fast" +#~ msgstr "Fast" + +#~ msgctxt "touchpad pointer, speed" +#~ msgid "Slow" +#~ msgstr "Slow" + +#~ msgctxt "touchpad pointer, speed" +#~ msgid "Fast" +#~ msgstr "Fast" + +#~ msgid "Disable while _typing" +#~ msgstr "Disable while _typing" + +#~ msgid "The system network services are not compatible with this version." +#~ msgstr "The system network services are not compatible with this version." + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Could not load VPN plugins" + +#~ msgid "Add Network Connection" +#~ msgstr "Add Network Connection" + +#~ msgid "Bond slaves" +#~ msgstr "Bond slaves" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge slaves" -#: ../panels/wacom/cc-wacom-mapping-panel.c:264 -msgid "Output:" -msgstr "Output:" +#~ msgid "Select the interface to use for the new service" +#~ msgstr "Select the interface to use for the new service" -#. Keep ratio switch -#: ../panels/wacom/cc-wacom-mapping-panel.c:276 -msgid "Keep aspect ratio (letterbox):" -msgstr "Keep aspect ratio (letterbox):" +#~ msgid "C_reate…" +#~ msgstr "C_reate…" -#. Whole-desktop checkbox -#: ../panels/wacom/cc-wacom-mapping-panel.c:287 -msgid "Map to single monitor" -msgstr "Map to single monitor" +#~ msgid "_Interface" +#~ msgstr "_Interface" -#: ../panels/wacom/cc-wacom-nav-button.c:89 -#, c-format -msgid "%d of %d" -msgstr "%d of %d" +#~ msgid "Security key" +#~ msgstr "Security key" -#: ../panels/wacom/cc-wacom-page.c:522 -msgid "Display Mapping" -msgstr "Display Mapping" +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand device does not support connected mode" -#: ../panels/wacom/cc-wacom-stylus-page.c:373 -msgid "Button" -msgstr "Button" +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "No Certificate Authority certificate chosen" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:7 -msgid "Wacom Tablet" -msgstr "Wacom Tablet" +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 -msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" -msgstr "Set button mappings and adjust stylus sensitivity for graphics tablets" +#~ msgid "Ignore" +#~ msgstr "Ignore" -#. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 -msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" -msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;" +#~ msgid "Choose CA Certificate" +#~ msgstr "Choose CA Certificate" -#: ../panels/wacom/gnome-wacom-properties.ui.h:1 -msgid "Tablet (absolute)" -msgstr "Tablet (absolute)" +#~ msgid "As_k for this password every time" +#~ msgstr "As_k for this password every time" -#: ../panels/wacom/gnome-wacom-properties.ui.h:2 -msgid "Touchpad (relative)" -msgstr "Touchpad (relative)" +#~ msgid "Don't _warn me again" +#~ msgstr "Don’t _warn me again" -#: ../panels/wacom/gnome-wacom-properties.ui.h:3 -msgid "Tablet Preferences" -msgstr "Tablet Preferences" +#~ msgctxt "notifications" +#~ msgid "Show Popup Banners" +#~ msgstr "Show Popup Banners" -#: ../panels/wacom/gnome-wacom-properties.ui.h:4 -msgid "No tablet detected" -msgstr "No tablet detected" +#~ msgctxt "notifications" +#~ msgid "View in Lock Screen" +#~ msgstr "View in Lock Screen" -#: ../panels/wacom/gnome-wacom-properties.ui.h:5 -msgid "Please plug in or turn on your Wacom tablet" -msgstr "Please plug in or turn on your Wacom tablet" +#~ msgid "Show Pop Up Banners" +#~ msgstr "Show Pop Up Banners" -#: ../panels/wacom/gnome-wacom-properties.ui.h:6 -msgid "Bluetooth Settings" -msgstr "Bluetooth Settings" +#~ msgid "Show in Lock Screen" +#~ msgstr "Show in Lock Screen" -#: ../panels/wacom/gnome-wacom-properties.ui.h:8 -msgid "Map to Monitor…" -msgstr "Map to Monitor…" +#~ msgid "Error logging into the account" +#~ msgstr "Error logging into the account" -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Map Buttons…" -msgstr "Map Buttons…" +#~ msgid "Credentials have expired." +#~ msgstr "Credentials have expired." -#: ../panels/wacom/gnome-wacom-properties.ui.h:11 -msgid "Adjust display resolution" -msgstr "Adjust display resolution" +#~ msgid "Sign in to enable this account." +#~ msgstr "Sign in to enable this account." -#: ../panels/wacom/gnome-wacom-properties.ui.h:12 -msgid "Adjust mouse settings" -msgstr "Adjust mouse settings" +#~ msgid "_Sign In" +#~ msgstr "_Sign In" -#: ../panels/wacom/gnome-wacom-properties.ui.h:13 -msgid "Tracking Mode" -msgstr "Tracking Mode" +#~ msgid "Estimated battery capacity: %s" +#~ msgstr "Estimated battery capacity: %s" -#: ../panels/wacom/gnome-wacom-properties.ui.h:14 -msgid "Left-Handed Orientation" -msgstr "Left-Handed Orientation" +#~ msgid "Turns off wireless devices" +#~ msgstr "Turns off wireless devices" -#. If no mode is available, we use "left-ring-mode-1" for backward compat -#: ../panels/wacom/gsd-wacom-device.c:1063 -msgid "Left Ring" -msgstr "Left Ring" +#~ msgid "When battery power is _critical" +#~ msgstr "When battery power is _critical" -#: ../panels/wacom/gsd-wacom-device.c:1074 -#, c-format -msgid "Left Ring Mode #%d" -msgstr "Left Ring Mode #%d" +#~ msgid "Power Off" +#~ msgstr "Power Off" -#. If no mode is available, we use "right-ring-mode-1" for backward compat -#: ../panels/wacom/gsd-wacom-device.c:1094 -msgid "Right Ring" -msgstr "Right Ring" +#~ msgid "Power" +#~ msgstr "Power" -#: ../panels/wacom/gsd-wacom-device.c:1105 -#, c-format -msgid "Right Ring Mode #%d" -msgstr "Right Ring Mode #%d" +#~ msgid "Power off" +#~ msgstr "Power off" -#. If no mode is available, we use "left-strip-mode-1" for backward compat -#: ../panels/wacom/gsd-wacom-device.c:1147 -msgid "Left Touchstrip" -msgstr "Left Touchstrip" +#~ msgid "No printers available" +#~ msgstr "No printers available" -#: ../panels/wacom/gsd-wacom-device.c:1158 -#, c-format -msgid "Left Touchstrip Mode #%d" -msgstr "Left Touchstrip Mode #%d" +#~ msgid "Active Jobs" +#~ msgstr "Active Jobs" -#. If no mode is available, we use "right-strip-mode-1" for backward compat -#: ../panels/wacom/gsd-wacom-device.c:1178 -msgid "Right Touchstrip" -msgstr "Right Touchstrip" +#~ msgid "Close" +#~ msgstr "Close" -#: ../panels/wacom/gsd-wacom-device.c:1189 -#, c-format -msgid "Right Touchstrip Mode #%d" -msgstr "Right Touchstrip Mode #%d" +#~ msgid "Resume Printing" +#~ msgstr "Resume Printing" -#: ../panels/wacom/gsd-wacom-device.c:1215 -#, c-format -msgid "Left Touchring Mode Switch" -msgstr "Left Touchring Mode Switch" +#~ msgid "Pause Printing" +#~ msgstr "Pause Printing" -#: ../panels/wacom/gsd-wacom-device.c:1217 -#, c-format -msgid "Right Touchring Mode Switch" -msgstr "Right Touchring Mode Switch" +#~ msgid "Cancel Print Job" +#~ msgstr "Cancel Print Job" -#: ../panels/wacom/gsd-wacom-device.c:1220 -#, c-format -msgid "Left Touchstrip Mode Switch" -msgstr "Left Touchstrip Mode Switch" +#~ msgid "Search for network printers or filter result" +#~ msgstr "Search for network printers or filter result" -#: ../panels/wacom/gsd-wacom-device.c:1222 -#, c-format -msgid "Right Touchstrip Mode Switch" -msgstr "Right Touchstrip Mode Switch" +#~ msgid "Enter address of a printer or a text to filter results" +#~ msgstr "Enter address of a printer or a text to filter results" -#: ../panels/wacom/gsd-wacom-device.c:1227 -#, c-format -msgid "Mode Switch #%d" -msgstr "Mode Switch #%d" +#~ msgctxt "print job" +#~ msgid "Held" +#~ msgstr "Held" -#: ../panels/wacom/gsd-wacom-device.c:1336 -#, c-format -msgid "Left Button #%d" -msgstr "Left Button #%d" +#~ msgid "Job Title" +#~ msgstr "Job Title" -#: ../panels/wacom/gsd-wacom-device.c:1339 -#, c-format -msgid "Right Button #%d" -msgstr "Right Button #%d" +#~ msgid "Job State" +#~ msgstr "Job State" -#: ../panels/wacom/gsd-wacom-device.c:1342 -#, c-format -msgid "Top Button #%d" -msgstr "Top Button #%d" +#~ msgid "Time" +#~ msgstr "Time" -#: ../panels/wacom/gsd-wacom-device.c:1345 -#, c-format -msgid "Bottom Button #%d" -msgstr "Bottom Button #%d" +#~ msgid "_Default" +#~ msgstr "_Default" -#: ../panels/wacom/gsd-wacom-key-shortcut-button.c:264 -msgid "New shortcut…" -msgstr "New shortcut…" +#~ msgid "Add New Printer" +#~ msgstr "Add New Printer" -#: ../panels/wacom/wacom-stylus-page.ui.h:1 -msgid "No Action" -msgstr "No Action" +#~ msgid "Immediately" +#~ msgstr "Immediately" -#: ../panels/wacom/wacom-stylus-page.ui.h:2 -msgid "Left Mouse Button Click" -msgstr "Left Mouse Button Click" +#~ msgctxt "Language" +#~ msgid "None" +#~ msgstr "None" -#: ../panels/wacom/wacom-stylus-page.ui.h:3 -msgid "Middle Mouse Button Click" -msgstr "Middle Mouse Button Click" +#~ msgid "Sorry" +#~ msgstr "Sorry" -#: ../panels/wacom/wacom-stylus-page.ui.h:4 -msgid "Right Mouse Button Click" -msgstr "Right Mouse Button Click" +#~ msgid "Options" +#~ msgstr "Options" -#: ../panels/wacom/wacom-stylus-page.ui.h:5 -msgid "Scroll Up" -msgstr "Scroll Up" +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Other" -#: ../panels/wacom/wacom-stylus-page.ui.h:6 -msgid "Scroll Down" -msgstr "Scroll Down" +#~ msgid "" +#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled " +#~ "devices" +#~ msgstr "" +#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled " +#~ "devices" -#: ../panels/wacom/wacom-stylus-page.ui.h:7 -msgid "Scroll Left" -msgstr "Scroll Left" +#~ msgid "Share Public Folder" +#~ msgstr "Share Public Folder" -#: ../panels/wacom/wacom-stylus-page.ui.h:8 -msgid "Scroll Right" -msgstr "Scroll Right" +#~ msgid "Only Receive From Trusted Devices" +#~ msgstr "Only Receive From Trusted Devices" -#: ../panels/wacom/wacom-stylus-page.ui.h:9 -msgid "Back" -msgstr "Back" +#~ msgid "Save Received Files to Downloads Folder" +#~ msgstr "Save Received Files to Downloads Folder" -#: ../panels/wacom/wacom-stylus-page.ui.h:10 -msgid "Forward" -msgstr "Forward" +#~ msgid "Only share with Trusted Devices" +#~ msgstr "Only share with Trusted Devices" -#: ../panels/wacom/wacom-stylus-page.ui.h:11 -msgid "Stylus" -msgstr "Stylus" +#~ msgid "Share Media On This Network" +#~ msgstr "Share Media On This Network" -#: ../panels/wacom/wacom-stylus-page.ui.h:12 -msgid "Eraser Pressure Feel" -msgstr "Eraser Pressure Feel" +#~ msgid "Shared Folders" +#~ msgstr "Shared Folders" -#: ../panels/wacom/wacom-stylus-page.ui.h:13 -msgid "Soft" -msgstr "Soft" +#~ msgid "column" +#~ msgstr "column" -#: ../panels/wacom/wacom-stylus-page.ui.h:14 -msgid "Firm" -msgstr "Firm" +#~ msgid "Remove Folder" +#~ msgstr "Remove Folder" -#: ../panels/wacom/wacom-stylus-page.ui.h:15 -msgid "Top Button" -msgstr "Top Button" +#~ msgid "Share Public Folder On This Network" +#~ msgstr "Share Public Folder On This Network" -#: ../panels/wacom/wacom-stylus-page.ui.h:16 -msgid "Lower Button" -msgstr "Lower Button" +#~ msgid "Remote View" +#~ msgstr "Remote View" -#: ../panels/wacom/wacom-stylus-page.ui.h:17 -msgid "Tip Pressure Feel" -msgstr "Tip Pressure Feel" +#~ msgid "Remote Control" +#~ msgstr "Remote Control" -#: ../shell/cc-application.c:69 -msgid "Enable verbose mode" -msgstr "Enable verbose mode" +#~ msgid "Approve All Connections" +#~ msgstr "Approve All Connections" -#: ../shell/cc-application.c:70 -msgid "Show the overview" -msgstr "Show the overview" +#~ msgid "Zoom" +#~ msgstr "Zoom" -#: ../shell/cc-application.c:71 -msgid "Search for the string" -msgstr "Search for the string" +#~ msgctxt "universal access, contrast" +#~ msgid "Color" +#~ msgstr "Colour" -#: ../shell/cc-application.c:72 -msgid "List possible panel names and exit" -msgstr "List possible panel names and exit" +#~ msgid "_Verify" +#~ msgstr "_Verify" -#: ../shell/cc-application.c:73 ../shell/cc-application.c:74 -#: ../shell/cc-application.c:75 -msgid "Show help options" -msgstr "Show help options" +#~ msgid "Login History" +#~ msgstr "Login History" -#: ../shell/cc-application.c:76 -msgid "Panel to display" -msgstr "Panel to display" +#~ msgid "Changing photo for:" +#~ msgstr "Changing photo for:" -#: ../shell/cc-application.c:76 -msgid "[PANEL] [ARGUMENT…]" -msgstr "[PANEL] [ARGUMENT…]" +#~ msgid "" +#~ "Choose a picture that will be shown at the login screen for this account." +#~ msgstr "" +#~ "Choose a picture that will be shown at the login screen for this account." -#: ../shell/cc-application.c:142 -msgid "- Settings" -msgstr "- Settings" +#~ msgid "Gallery" +#~ msgstr "Gallery" -#: ../shell/cc-application.c:160 -#, c-format -msgid "" -"%s\n" -"Run '%s --help' to see a full list of available command line options.\n" -msgstr "" -"%s\n" -"Run ‘%s --help’ to see a full list of available command line options.\n" +#~ msgid "Take a photograph" +#~ msgstr "Take a photograph" -#: ../shell/cc-application.c:190 -msgid "Available panels:" -msgstr "Available panels:" +#~ msgid "Browse" +#~ msgstr "Browse" -#: ../shell/cc-application.c:325 -msgid "Help" -msgstr "Help" +#~ msgid "Photograph" +#~ msgstr "Photograph" -#: ../shell/cc-application.c:326 -msgid "Quit" -msgstr "Quit" +#~ msgid "Account Information" +#~ msgstr "Account Information" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1467 -msgid "All Settings" -msgstr "All Settings" +#~ msgid "Add User Account" +#~ msgstr "Add User Account" -#. Add categories -#: ../shell/cc-window.c:866 -msgctxt "category" -msgid "Personal" -msgstr "Personal" +#~ msgid "Remove User Account" +#~ msgstr "Remove User Account" -#: ../shell/cc-window.c:867 -msgctxt "category" -msgid "Hardware" -msgstr "Hardware" +#~ msgid "Login Options" +#~ msgstr "Login Options" -#: ../shell/cc-window.c:868 -msgctxt "category" -msgid "System" -msgstr "System" +#~ msgid "A user with the username '%s' already exists" +#~ msgstr "A user with the username ‘%s’ already exists" -#: ../shell/cc-window.c:1576 ../shell/gnome-control-center.desktop.in.in.h:1 -msgid "Settings" -msgstr "Settings" +#~ msgid "Show help options" +#~ msgstr "Show help options" -#: ../shell/gnome-control-center.desktop.in.in.h:2 -msgid "Preferences;Settings;" -msgstr "Preferences;Settings;" +#~ msgid "- Settings" +#~ msgstr "- Settings" + +#~ msgid "" +#~ "%s\n" +#~ "Run '%s --help' to see a full list of available command line options.\n" +#~ msgstr "" +#~ "%s\n" +#~ "Run ‘%s --help’ to see a full list of available command line options.\n" #~ msgid "Export" #~ msgstr "Export" @@ -7208,10 +7910,6 @@ #~ msgstr "Normal" #~ msgctxt "display panel, rotation" -#~ msgid "Counterclockwise" -#~ msgstr "Anticlockwise" - -#~ msgctxt "display panel, rotation" #~ msgid "Clockwise" #~ msgstr "Clockwise" @@ -7526,9 +8224,6 @@ #~ msgid "The current password is not correct" #~ msgstr "The current password is not correct" -#~ msgid "Wrong password" -#~ msgstr "Wrong password" - #~ msgid "Switch Modes" #~ msgstr "Switch Modes" @@ -7651,15 +8346,9 @@ #~ msgid "Select a language" #~ msgstr "Select a language" -#~ msgid "_Select" -#~ msgstr "_Select" - #~ msgid "Date and Time preferences panel" #~ msgstr "Date and Time preferences panel" -#~ msgid "%d x %d (%s)" -#~ msgstr "%d x %d (%s)" - #~ msgid "%d x %d" #~ msgstr "%d x %d" @@ -7722,9 +8411,6 @@ #~ msgid "C_reate..." #~ msgstr "C_reate…" -#~ msgid "_Configure..." -#~ msgstr "_Configure…" - #~ msgid "Wireless Hotspot" #~ msgstr "Wireless Hotspot" @@ -7802,16 +8488,9 @@ #~ msgid "Suspend when inactive for" #~ msgstr "Suspend when inactive for" -#~ msgctxt "printer state" -#~ msgid "Paused" -#~ msgstr "Paused" - #~ msgid "Change printer settings" #~ msgstr "Change printer settings" -#~ msgid "%s Options" -#~ msgstr "%s Options" - #~ msgid "Manufacturers" #~ msgstr "Manufacturers" @@ -7824,9 +8503,6 @@ #~ msgid "Change your region and language settings" #~ msgstr "Change your region and language settings" -#~ msgid "Choose an input source" -#~ msgstr "Choose an input source" - #~ msgid "Select an input source to add" #~ msgstr "Select an input source to add" @@ -7884,15 +8560,6 @@ #~ msgid "Select keyboards or other input sources" #~ msgstr "Select keyboards or other input sources" -#~ msgid "Remove Input Source" -#~ msgstr "Remove Input Source" - -#~ msgid "Move Input Source Up" -#~ msgstr "Move Input Source Up" - -#~ msgid "Show Keyboard Layout" -#~ msgstr "Show Keyboard Layout" - #~ msgid "Ctrl+Alt+Space" #~ msgstr "Ctrl+Alt+Space" @@ -8016,9 +8683,6 @@ #~ msgid "- System Settings" #~ msgstr "- System Settings" -#~ msgid "Control Center" -#~ msgstr "Control Centre" - #~ msgid "System Settings" #~ msgstr "System Settings" @@ -8028,9 +8692,6 @@ #~ msgid "Subnet Mask" #~ msgstr "Subnet Mask" -#~ msgid "A_ddress:" -#~ msgstr "A_ddress:" - #~ msgid "_Search by Address" #~ msgstr "_Search by Address" @@ -8094,9 +8755,6 @@ #~ msgid "Take a screenshot" #~ msgstr "Take a screenshot" -#~ msgid "Shortcut" -#~ msgstr "Shortcut" - #~ msgid "_Right-handed" #~ msgstr "_Right-handed" @@ -8121,9 +8779,6 @@ #~ msgid "Drag Threshold" #~ msgstr "Drag Threshold" -#~ msgid "Double-Click Timeout" -#~ msgstr "Double-Click Timeout" - #~ msgid "_Timeout:" #~ msgstr "_Timeout:" @@ -8133,9 +8788,6 @@ #~ msgid "Enable _mouse clicks with touchpad" #~ msgstr "Enable _mouse clicks with touchpad" -#~ msgid "Scrolling" -#~ msgstr "Scrolling" - #~ msgid "_Disabled" #~ msgstr "_Disabled" @@ -8329,9 +8981,6 @@ #~ msgid "The type of accelerator." #~ msgstr "The type of accelerator." -#~ msgid "Error saving the new shortcut" -#~ msgstr "Error saving the new shortcut" - #~ msgid "Too many custom shortcuts" #~ msgstr "Too many custom shortcuts" @@ -8347,9 +8996,6 @@ #~ msgid "cd;dvd;usb;audio;video;disc;" #~ msgstr "cd;dvd;usb;audio;video;disc;" -#~ msgid "Speed" -#~ msgstr "Speed" - #~ msgid "Unlock" #~ msgstr "Unlock" @@ -8371,9 +9017,6 @@ #~ msgid "Shutdown" #~ msgstr "Shutdown" -#~ msgid "Suspend" -#~ msgstr "Suspend" - #~ msgid "" #~ "Only profiles that are compatible with the device will be listed above." #~ msgstr "" @@ -8550,9 +9193,6 @@ #~ msgid "Put the computer to sleep when inactive:" #~ msgstr "Put the computer to sleep when inactive:" -#~ msgid "When the power button is pressed:" -#~ msgstr "When the power button is pressed:" - #~ msgid "When the sleep button is pressed:" #~ msgstr "When the sleep button is pressed:" @@ -8910,9 +9550,6 @@ #~ msgid "Include _panel" #~ msgstr "Include _panel" -#~ msgid "Panel icon" -#~ msgstr "Panel icon" - #~ msgid "Sa_me image in all monitors" #~ msgstr "Sa_me image in all monitors" @@ -8990,9 +9627,6 @@ #~ msgid "Upside Down" #~ msgstr "Upside Down" -#~ msgid "%d Hz" -#~ msgstr "%d Hz" - #~ msgid "Mirror Screens" #~ msgstr "Mirror Screens" @@ -9059,9 +9693,6 @@ #~ msgid "Keyboard _model:" #~ msgstr "Keyboard _model:" -#~ msgid "List of keyboard layouts selected for usage" -#~ msgstr "List of keyboard layouts selected for usage" - #~ msgid "" #~ "Lock screen after a certain duration to help prevent repetitive keyboard " #~ "use injuries" @@ -9203,9 +9834,6 @@ #~ msgid "The location already exists." #~ msgstr "The location already exists." -#~ msgid "_Location name:" -#~ msgstr "_Location name:" - #~ msgid "_Use the same proxy for all protocols" #~ msgstr "_Use the same proxy for all protocols" @@ -9616,9 +10244,6 @@ #~ msgid "The two passwords are not equal." #~ msgstr "The two passwords are not equal." -#~ msgid "Change pa_ssword" -#~ msgstr "Change pa_ssword" - #~ msgid "Change your password" #~ msgstr "Change your password" @@ -10361,9 +10986,6 @@ #~ msgid "Move to Trash" #~ msgstr "Move to the Wastebasket" -#~ msgid "Delete" -#~ msgstr "Delete" - #~ msgid "If you delete an item, it is permanently lost." #~ msgstr "If you delete an item, it is permanently lost." @@ -10409,9 +11031,6 @@ #~ msgid "Change screen resolution" #~ msgstr "Change screen resolution" -#~ msgid "Edit" -#~ msgstr "Edit" - #~ msgid "Menus and Toolbars" #~ msgstr "Menus and Toolbars" @@ -10559,9 +11178,6 @@ #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR" #~ msgstr "Could not get org.gnome.SettingsDaemon.XRANDR" -#~ msgid "_Command:" -#~ msgstr "_Command:" - #~ msgid "Bounce Keys" #~ msgstr "Bounce Keys" @@ -11175,9 +11791,6 @@ #~ msgid "Do you want to deactivate Slow Keys?" #~ msgstr "Do you want to deactivate Slow Keys?" -#~ msgid "_Activate" -#~ msgstr "_Activate" - #~ msgid "Do_n't activate" #~ msgstr "Do_n't activate" diff -Nru gnome-control-center-3.20.2/po/en.po gnome-control-center-3.22.1/po/en.po --- gnome-control-center-3.20.2/po/en.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/en.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: English\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/en@shaw.po gnome-control-center-3.22.1/po/en@shaw.po --- gnome-control-center-3.20.2/po/en@shaw.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/en@shaw.po 2016-08-12 12:43:57.000000000 +0000 @@ -10,6 +10,7 @@ "PO-Revision-Date: 2010-05-18 10:04 -0400\n" "Last-Translator: Thomas Thurman \n" "Language-Team: Shavian \n" +"Language: en@shaw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/es.po gnome-control-center-3.22.1/po/es.po --- gnome-control-center-3.20.2/po/es.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/es.po 2016-09-27 12:37:36.000000000 +0000 @@ -1,32 +1,32 @@ -# translation of gnome-control-center.master.po to Español -# Copyright © 1999-2002, 2006, 2007, 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the gnome-control-center package. -# -# Pablo Saratxaga , 1998-2001. -# Carlos Perelló Marín , 2001. -# Héctor García Álvarez , 2001. -# Germán Poo Caamaño , 2002 (Revisor). -# Lucas Di Pentima , 2002. -# Pablo Gonzalo del Campo , 2002,2003. -# Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. -# Claudio Saavedra , 2007. -# -# -# Jorge González , 2007, 2008, 2009, 2010, 2011. -# -# -# Daniel Mustieles , 2010, 2011. , 2013, 2014, 2015. , 2016. +# translation of gnome-control-center.master.po to Español +# Copyright © 1999-2002, 2006, 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-control-center package. +# +# Pablo Saratxaga , 1998-2001. +# Carlos Perelló Marín , 2001. +# Héctor García Álvarez , 2001. +# Germán Poo Caamaño , 2002 (Revisor). +# Lucas Di Pentima , 2002. +# Pablo Gonzalo del Campo , 2002,2003. +# Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. +# Claudio Saavedra , 2007. +# +# +# Jorge González , 2007, 2008, 2009, 2010, 2011. +# +# +# Daniel Mustieles , 2010, 2011., 2013, 2014, 2015., 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-18 08:41+0000\n" -"PO-Revision-Date: 2016-03-18 13:27+0100\n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-14 17:39+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" -"Language: de\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -103,7 +103,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Domicilio" @@ -118,26 +118,25 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 #: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -168,16 +167,17 @@ msgid "Current background" msgstr "Fondo actual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fondo" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Cambiar la imagen de fondo de escritorio por un tapiz o una foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Fondo de pantalla;Pantalla;Escritorio;" @@ -218,18 +218,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Apague el modo avión para activar el Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Activar y desactivar Bluetooth y conectar sus dispositivos" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "compartir;compartición;bluetooth;obex;" @@ -281,14 +280,14 @@ #. TRANSLATORS: The profile failed for some reason #: ../panels/color/cc-color-calibrate.c:421 msgid "The profile could not be generated." -msgstr "No se puede generar el perfil" +msgstr "No se puede generar el perfil." #. TRANSLATORS: The user specified a whitepoint that was #. * unobtainable with the hardware they've got -- see #. * https://en.wikipedia.org/wiki/White_point for details #: ../panels/color/cc-color-calibrate.c:427 msgid "The target whitepoint was not obtainable." -msgstr "No se pudo obtener el punto blanco del objetivo" +msgstr "No se pudo obtener el punto blanco del objetivo." #. TRANSLATORS: the display calibration process is finished #: ../panels/color/cc-color-calibrate.c:467 @@ -403,7 +402,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Todos los archivos" @@ -426,7 +425,7 @@ #: ../panels/color/cc-color-panel.c:924 msgid "Write down this URL." -msgstr "Anote este URL" +msgstr "Anote este URL." #: ../panels/color/cc-color-panel.c:925 msgid "Restart this computer and boot your normal operating system." @@ -442,7 +441,7 @@ msgstr "Guardar perfil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Guardar" @@ -590,7 +589,7 @@ #: ../panels/color/color.ui.h:3 msgid "" "You will not be able to use your computer while calibration takes place." -msgstr "No podrá usar su equipo mientras se realiza la calibración" +msgstr "No podrá usar su equipo mientras se realiza la calibración." #. This is the approximate time it takes to calibrate the display. #: ../panels/color/color.ui.h:5 @@ -701,7 +700,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Resumen" @@ -714,11 +713,10 @@ msgstr "_Importar archivo…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Añadir" @@ -868,18 +866,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Color" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Co­lor" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibrar el color de sus dispositivos, como pantallas, cámaras o impresoras" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Color;ICC;Perfil;Calibrado;Impresora;Pantalla;" @@ -897,23 +896,23 @@ msgid "No languages found" msgstr "No se han encontrado idiomas" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hoy" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Ayer" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e de %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e de %b, %Y" @@ -1033,8 +1032,9 @@ msgid "December" msgstr "diciembre" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Fecha y hora" @@ -1091,12 +1091,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Cambiar la fecha y la hora, incluyendo la zona horaria" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Reloj;Zona horaria;Ubicación;" @@ -1109,209 +1109,224 @@ msgstr "" "Para cambiar la configuración de la fecha o de la hora, debe autenticarse." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tapa cerrada" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "En espejo" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primaria" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Apagado" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundaria" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Ordenar las pantallas combinadas" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplicar" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arrastrar las pantallas para reordenarlas" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Rotar 90° en sentido antihorario" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Rotar 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Rotar 90° en sentido antihorario" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Tamaño" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporción de aspecto" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolución" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Ajustes para TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Tasa de refresco" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostrar la barra superior y la vista de actividades en esta pantalla" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Pantalla secundaria" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Unir esta pantalla a otra para crear un área de trabajo adicional" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentación" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostrar sólo diapositivas y multimedia" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Espejo" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostrar la vista existente en ambas pantallas" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Apagar" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "No usar esta pantalla" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "No se pudo obtener la información de la pantalla" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Ordenar las pantallas combinadas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Pantallas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Elegir cómo usar las pantallas y los proyectores conectados" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Proyector;xranrd;Pantalla;Resolución;Actualizar;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Desconocido" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID de construcción: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID de construcción: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Preguntar qué hacer" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "No hacer nada" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Abrir carpeta" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Otros soportes" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Seleccionar una aplicación para CD de sonido" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Seleccionar una aplicación para DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Seleccionar una aplicación que ejecutar cuando se conecta un reproductor de " "música" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Seleccionar una aplicación que ejecutar cuando se conecta una cámara" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Seleccionar una aplicación para CD de software" @@ -1320,88 +1335,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD de sonido" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "disco Blu-ray virgen" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "CD virgen" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "DVD virgen" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "disco HD DVD virgen" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disco Blu-ray de vídeo" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "lector de libros electrónicos" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disco HD DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD de imágenes" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software de Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sección" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Visión general" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicaciones predeterminadas" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Soportes extraíbles" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versión %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalles" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Ver información sobre su sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1576,8 +1589,9 @@ msgid "Launch help browser" msgstr "Lanzar el visor de ayuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Configuración" @@ -1650,7 +1664,6 @@ msgstr "Bloquear la pantalla" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Acceso universal" @@ -1686,11 +1699,21 @@ msgid "High contrast on or off" msgstr "Contraste alto activado o desactivado" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Combinación personalizada" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1717,120 +1740,129 @@ msgid "Modifiers-only switch to next source" msgstr "Sólo los modificadores cambian a la fuente siguiente" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Teclado" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Restablecer el valor predeterminado del atajo" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s ya está en uso por %s.. Si lo reemplaza, %s se desactivará" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Establecer atajo personalizado" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Establecer atajo" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Introduzca el nuevo atajo para cambiar %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Añadir un atajo personalizado" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Teclado" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Ver y cambiar los atajos del teclado y establecer sus preferencias de " "escritura" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Atajo;Repetir;Parpadear;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Combinación personalizada" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nombre:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "C_omando:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Añadir atajo" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Quitar atajo" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Para editar un atajo nuevo pulse en la fila y mantenga pulsadas las teclas " -"nuevas, o pulse Retroceso para eliminarla." +msgid "No keyboard shortcut found" +msgstr "No se ha encontrado un atajo del teclado" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Combinación personalizada" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Pruebe una búsqueda diferente" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Pulse Esc para cancelar." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"No se puede usar la combinación de teclas «%s» porque se haría imposible " -"escribir usando esta tecla.\n" -"Por favor, inténtelo con una tecla como Control, Alt o Mayús. al mismo " -"tiempo." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nombre" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"La combinación «%s» ya se está usando para\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Comando" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Combinación" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Editar" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Si reasigna la combinación a «%s» se desactivará la combinación «%s»." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ninguna" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Reasignar" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Quitar" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#| msgid "Error saving the new shortcut" +msgid "Enter the new shortcut" +msgstr "Introduzca el atajo nuevo" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"El atajo «%s» tiene un atajo «%s» asociado. ¿Quiere establecerlo " -"automáticamente a «%s»?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Cancelar" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"«%s» está actualmente asociado con «%s», este atajo se desactivará si " -"continúa." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Añadir" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Asignar" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Reemplazar" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Establecer" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Probar su configuración" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Ratón y «touchpad»" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1838,7 +1870,7 @@ "zurdos o diestros" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "trackpad;puntero;pulsar;pulsación;doble;botón;trackball;desplazamiento;" @@ -1897,6 +1929,10 @@ msgstr "Tocar para pulsar" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Desplazamiento con dos dedos" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Desplazamiento en el borde" @@ -1936,11 +1972,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modo a_vión" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy de la red" @@ -1948,17 +1984,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN «%s»" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Algo ha fallado. Contacte con el fabricante del software." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager debe estar en ejecución." @@ -1974,7 +2010,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1991,59 +2027,64 @@ msgid "page 2" msgstr "página 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Seguridad" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automático" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Perfil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Empresa" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ninguna" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nunca" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2051,179 +2092,179 @@ msgstr[1] "hace %i días" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Ninguna" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Débil" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Aceptar" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Buena" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excelente" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detalles" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identidad" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Dirección" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Máscara de red" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Puerta de enlace" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Eliminar dirección" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Añadir" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Servidor" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Eliminar servidor DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Métrica" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Eliminar ruta" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automático (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Sólo enlace local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefijo" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automático" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automático, DHCP únicamente" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reiniciar" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ninguna" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Clave WEP 40/128-bit (Hexadecimal o ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Frase de paso WEP de 128 bits" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinámica (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA y WPA2 personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA y WPA2 enterprise" @@ -2238,30 +2279,30 @@ msgstr "Velocidad de conexión" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Dirección IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Dirección IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Dirección física" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2271,7 +2312,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2354,13 +2395,13 @@ msgid "Firewall _Zone" msgstr "_Zona del cortafuegos" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Predeterminada" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "La zona define el nivel de confianza de la conexión" @@ -2402,45 +2443,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "No se pudo abrir el editor de conexiones" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Perfil nuevo" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Equipo" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Puente" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "No se pudieron cargar los complementos de VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importar desde un archivo…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Añadir conexión de red" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Añadir VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2448,7 +2469,7 @@ msgstr "_Reiniciar" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Olvidar" @@ -2474,11 +2495,11 @@ msgid "S_ecurity" msgstr "S_eguridad" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "No se puede importar la conexión VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2491,36 +2512,36 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Seleccione el archivo que importar" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Abrir" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Ya existe un archivo llamado «%s»." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Reemplazar" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "¿Quiere reemplazar %s con la conexión VP que está guardando?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "No se puede exportar la conexión VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2531,7 +2552,7 @@ "\n" "Error: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportar conexión VPN" @@ -2558,61 +2579,47 @@ msgid "Make available to _other users" msgstr "Hacer disponible para _otros usuarios" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Red" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controlar cómo se conecta a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Red;Inalámbrica;Wireless;Wi-Fi;Wifi;IP;Proxy;WAN;LAN;Banda;ancha;Módem;" -"Bluetooth;vpn;vlan;puente;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Asociar esclavos" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ninguno)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Asociar esclavos" +"Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nunca" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hoy" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ayer" -#: ../panels/network/net-device-ethernet.c:160 +#: ../panels/network/net-device-ethernet.c:156 #: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 +#: ../panels/network/panel-common.c:647 ../panels/network/panel-common.c:649 #: ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Dirección IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Usada última vez" @@ -2622,14 +2629,14 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Cableada" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 @@ -2637,20 +2644,11 @@ msgid "Options…" msgstr "Opciones…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Perfil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Añadir una conexión nueva" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Esclavos del equipo" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2658,12 +2656,12 @@ "Si tiene otra conexión a Internet aparte de la inalámbrica, puede configurar " "un «hotspot» inalámbrico para compartir su conexión a Internet con otros." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Cambiar al «hotspot» inalámbrico le desconectará de %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2671,23 +2669,23 @@ "No es posible acceder a Internet usando la conexión inalámbrica mientras el " "«hotspot» está activado." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "¿Detener el «hotspot» y desconectar a los usuarios?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Detener «hotspot»" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "La política del sistema prohíbe usarlo como punto de acceso" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "El dispositivo inalámbrico no soporta el modo de punto de acceso" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2695,11 +2693,11 @@ "Se perderán los detalles de las redes seleccionadas, incluyendo la " "contraseña y cualquier configuración personalizada." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Histórico" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2707,7 +2705,7 @@ msgstr "_Cerrar" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Olvidar" @@ -2744,6 +2742,10 @@ msgid "Provider" msgstr "Proveedor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Red" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2849,16 +2851,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Contraseña" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ninguna" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Mostrar contr_aseña" @@ -2952,7 +2950,6 @@ msgstr "Conectar a una red oculta…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Histórico" @@ -2974,360 +2971,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Contraseña" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraestructura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Estado desconocido" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Sin gestionar" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "No disponible" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Conectando" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Se necesita autenticación" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Conectado" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Desconectando" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Falló la conexión" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Estado desconocido (ausente)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "No conectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Falló la configuración" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Falló la configuración IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "La configuración IP ha expirado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Se necesitan secretos, pero no se han proporcionado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Suplicante de 802.1x desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Falló la configuración del suplicante de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Falló el suplicante de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "El suplicante de 802.1x tardó mucho tiempo en autenticarse" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Falló al iniciar el servicio de PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Servicio PPP desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP falló" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Falló al iniciar el cliente de DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Error del cliente de DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Falló el cliente de DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Falló al iniciar el servicio de conexión compartida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Falló el servicio de conexión compartida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Falló al iniciar el servicio de AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Error del servicio de AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Falló el servicio AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Línea ocupada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "No hay tono de llamada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "No se pudo establecer el portador" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Expiró el tiempo de solicitud de llamada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Intento de llamada fallido" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Falló la inicialización del módem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Falló al seleccionar el NPA especificado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "No se están buscando redes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Registro de la red denegado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Expiró el tiempo de registro de la red" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Falló al registrarse con la red solicitada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Falló la comprobación de l PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Es posible que falte el firmware del dispositivo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "La conexión ha desaparecido" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Se asumió una conexión existente" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Módem no encontrado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Falló la conexión Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Tarjeta SIM no insertada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Se necesita el PIN de la SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Se necesita el PUK de la SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM errónea" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "El dispositivo InfiniBand no soporta el modo conectado" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Falló la dependencia de la conexión" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "falta el «firmware»" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cable desconectado" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "No se ha elegido ningún certificado CA" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "error no definido en la seguridad 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "no se ha seleccionado ningún archivo" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"No usar un certificado de Certificate Authority (CA) puede dar lugar a " -"conexiones inseguras a redes inalámbricas promiscuas. ¿Quiere elegir un " -"certificado Certificate Authority?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorar" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Elija un certificado CA" +msgid "unspecified error validating eap-method file" +msgstr "error no especificado al validar el archivo del método eap" -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Claves privadas DER, PEM, o PKCS#12 (*.der, *.pem, *.p12)" +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Claves privadas DER, PEM, o PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificados DER o PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "falta el archivo PAC de EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Elegir un archivo PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Archivos PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "Archivo _PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticación i_nterna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visión PAC " - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3336,41 +3309,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anónimo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticado" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ambos" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "Archivo _PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticación i_nterna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Permitir pro_visión PAC automática" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "falta el nombre de usuario de EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "falta la contraseña de EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nombre de _usuario" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Mostrar la contraseña" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "CA del certificado EAP-PEAP no válida: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"CA del certificado EAP-PEAP no válida: no se ha especificado el certificado" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Elija un certificado CA" @@ -3388,19 +3394,57 @@ msgid "C_A certificate" msgstr "Certificado C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "No se necesita la CA del ce_rtificado" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "Versión _PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Preguntar esta contraseña cada vez" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "falta el nombre de usuario de EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "falta la contraseña EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "falta la identidad EAP-TLS" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "CA del certificado EAP-TLS no válida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" +"CA del certificado EAP-TLS no válida: no se ha especificado el certificado" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "contraseña EAP-TLS no válida: falta la contraseña" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "clave privada EAP-TLS no válida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "usuario del certificado EAP-TLS no válido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Las claves privadas sin cifrar son inseguras" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3414,11 +3458,11 @@ "\n" "(Puede proteger su clave privada con una contraseña con openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Elija su certificado personal" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Elija su clave privada" @@ -3430,51 +3474,57 @@ msgid "_User certificate" msgstr "Certificado del _usuario" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Clave pri_vada" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Contraseña de clave pri_vada" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "CA del certificado EAP-TTLS no válida: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"CA del certificado EAP-TTLS no válida: no se ha especificado el certificado" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "No a_visarme de nuevo" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "No" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sí" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Error desconocido al validar la seguridad 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS a través de túnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP protegido (PEAP)" @@ -3484,6 +3534,51 @@ msgid "Au_thentication" msgstr "_Autenticación" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "falta el nombre de usuario leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "falta la contraseña leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "falta la clave wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"clave wep no válida: una clave de longitud %zu sólo puede contener dígitos " +"hexadecimales" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"clave wep no válida: una clave de longitud %zu sólo debe contener caracteres " +"ASCII" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"clave wep no válida: longitud de clave %zu incorrecta. La clave debe ser de " +"5/13 (ascii) o 10/26 (hexadecimal)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "clave wep no válida: la frase de paso no puede estar vacía" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"clave wep no válida: la frase de paso debe ser inferior a 64 caracteres" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (predeterminado)" @@ -3520,19 +3615,34 @@ msgid "WEP inde_x" msgstr "Ín_dice WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"clave wpa-psk no válida: longitud %zu de la clave no válida. Debe ser de " +"[8,63] bytes o 64 dígitos hexadecimales" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"clave wpa-psk no válida: no se puede interpretar una clave de 64 bytes como " +"hexadecimal" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipo" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Encendido" @@ -3569,16 +3679,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Mostrar el c_ontenido del mensaje en la pantalla de bloqueo" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificaciones" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controlar qué notificaciones se muestran" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "notificaciones;banner;mensaje;bandeja;emergente;" @@ -3596,79 +3707,68 @@ msgid "Applications" msgstr "Aplicaciones" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Otra" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Añadir cuenta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Correo" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendario" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contactos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Recursos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Error al iniciar sesión en la cuenta" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Las credenciales han caducado." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Firme para activar esta cuenta." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "Iniciar _sesión" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Error al crear la cuenta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Error al quitar la cuenta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "¿Está seguro de que quiere quitar la cuenta?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Esto no quitará la cuenta en el servidor." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Quitar" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Cuentas en línea" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Conectarse a sus cuentas en línea y decidir para qué usarlas" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3681,6 +3781,7 @@ msgstr "No hay cuentas en línea configuradas" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Quitar cuenta" @@ -3823,7 +3924,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batería" @@ -3871,102 +3972,103 @@ msgid "When _idle" msgstr "Cuando esté _inactivo" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Ahorro de energía" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Brillo de la pantalla" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Brillo automático" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Brillo del teclado" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Oscurecer la pantalla cuando esté inactiva" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Apagar la pantalla" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Apagar la Wi-Fi para ahorrar energía." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Banda ancha _móvil" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Apagar la banda ancha móvil (3G, 4G, LTE, etc.) para ahorrar energía." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "En modo batería" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Cuando está conectado a la red" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Suspender" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernar" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nada" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Botón de suspender y apagar" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Suspender _automáticamente" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Suspender automáticamente" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Al pulsar el b_otón de encendido" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositivos" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energía" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Ver el estado de la batería y cambiar la configuración de ahorro de energía" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4045,11 +4147,6 @@ msgid "Delay" msgstr "Retardo" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Cancelar" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autenticar" @@ -4059,138 +4156,138 @@ msgstr "Se requiere autenticación" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Tóner bajo" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Sin tóner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Nivel de revelador bajo" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Sin revelador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Marcador bajo" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Sin marcador" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Abrir cubierta" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Abrir puerta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Nivel de papel bajo" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Sin papel" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Desconectada" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Detenida" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Recipiente de residuos casi lleno" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Receptáculo de residuos lleno" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "El conductor óptico está cerca del final de su vida" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "El conductor óptico ya no funciona" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Configurando" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Preparada" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "No aceptar trabajos" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Procesando" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nivel de tóner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nivel de tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nivel del suministro" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instalando" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4198,15 +4295,15 @@ msgstr[1] "%u activos" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Falló al añadir una impresora nueva." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Seleccionar archivo PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4214,50 +4311,47 @@ "Archivos de descripción de impresora PostScript (*.ppd, *.PPD, *.ppd.gz, *." "PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "No se ha encontrado ningún controlador adecuado" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Buscando controladores preferidos…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Seleccionar de la base de datos…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Proporcionar archivo PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Página de prueba" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "No hay impresoras" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "No se pudo cargar la IU: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Impresoras" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Añadir impresoras, ver los trabajos de la impresora y decidir cuál quiere " "imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Impresora;Cola;Imprimir;Papel;Tinta;Tóner;" @@ -4419,6 +4513,11 @@ msgid "Parallel Port" msgstr "Puerto paralelo" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4631,13 +4730,17 @@ msgid "_Options" msgstr "_Opciones" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "No hay impresoras" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Añadir una impresora" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4645,70 +4748,70 @@ "El servicio del sistema de impresión\n" "parece no estar disponible." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Bloqueo de pantalla" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "En uso" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Activado" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Desactivado" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Servicios de ubicación" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Uso e histórico" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "¿Quiere vaciar todos los elementos de la papelera?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Todos los elementos de la papelera se eliminarán de manera permanente." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Vaciar papelera" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "¿Quiere eliminar todos los archivos temporales?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Todos los archivos temporales se eliminarán de manera permanente." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Limpiar archivos temporales" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Vaciar papelera y archivos temporales" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Uso de software" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Informar de un error" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4717,20 +4820,21 @@ "Enviar informes de problemas técnicos ayuda a mejorar %s. Los informes se " "envían anónimamente y no contienen datos personales." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Política de privacidad" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privacidad" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Proteger su información personal y controlar qué pueden ver otros" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4808,7 +4912,7 @@ #: ../panels/privacy/privacy.ui.h:25 msgid "The Screen Lock protects your privacy when you are away." -msgstr "La pantalla de bloqueo protege" +msgstr "La pantalla de bloqueo protege." #: ../panels/privacy/privacy.ui.h:26 msgid "Automatic Screen _Lock" @@ -4901,21 +5005,21 @@ msgid "Other" msgstr "Otra" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Debe reiniciar la sesión para que se apliquen los cambios" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Reiniciar ahora" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "No se ha seleccionado ninguna fuente de entrada" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Pantalla de inicio de _sesión" @@ -4947,11 +5051,12 @@ msgid "Paper" msgstr "Papel" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Región e idioma" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4959,7 +5064,7 @@ "entrada" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Idioma;Distribución;Teclado;Entrada;" @@ -5017,7 +5122,7 @@ msgstr "Izquierda+Alt derecha" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Idioma" @@ -5067,26 +5172,11 @@ "La configuración de inicio de sesión la usan todos los usuarios cuando " "inician sesión en el sistema" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Lugares" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Otra" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Seleccionar ubicación" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Aceptar" @@ -5094,11 +5184,12 @@ msgid "No applications found" msgstr "No se han encontrado aplicaciones" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Buscar" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5106,7 +5197,7 @@ "actividades" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "buscar;búsqueda;índice;ocultar;privacidad;resultados;" @@ -5114,6 +5205,18 @@ msgid "Search Locations" msgstr "Buscar ubicaciones" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Lugares" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Otra" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Subir" @@ -5126,6 +5229,11 @@ msgid "Preferences" msgstr "Preferencias" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "No se han seleccionado redes para compartir" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5151,21 +5259,55 @@ msgid "Choose a Folder" msgstr "Elija una carpeta" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"La compartición de archivos personales le permite compartir su carpeta " +"«Público» con otros en su red actual usando: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Cuando el inicio de sesión remoto está activado, los usuarios remotos pueden " +"conectarse usando el comando de shell segura:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"La compartición de pantalla permite a los usuarios remotos ver o controlar " +"su pantalla conectándose a: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copiar" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Compartir" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Compartición" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controla qué quiere compartir con otros" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5173,6 +5315,10 @@ "compartir;compartición;ssh;equipo;remoto;escritorio:bluetooth;obex;" "multimedia;sonido:vídeo;imágenes;fotos;películas;servidor;renderizador;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Redes" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Activar o desactivar el inicio de sesión remota" @@ -5183,25 +5329,13 @@ "Se requiere autenticación para activar o desactivar el inicio de sesión " "remota" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "No se han seleccionado redes para compartir" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Redes" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nombre del _equipo" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Compartición de archivos _personales" +msgid "_File Sharing" +msgstr "Compartición de _archivos" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5220,85 +5354,54 @@ msgstr "Se han desactivado algunos servicios porque no hay acceso a la red." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Compartición de archivos personales" +msgid "File Sharing" +msgstr "Compartición de archivos" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"La compartición de archivos personales le permite compartir su carpeta " -"«Público» con otros en su red actual usando: dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Solicitar contraseña" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Inicio de sesión remoto" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Permitir a los usuarios remotos conectar usando el comando de shell segura:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Compartición de la pantalla" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Permitir a los usuarios remotos ver o controlar su pantalla conectándose a: " -"vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Permitir control remoto" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Permitir conexiones para controlar la pantalla" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Contraseña:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Mo_strar contraseña" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Opciones de acceso" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Las conexiones _nuevas deben solicitar acceso" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Solicitar una contraseña" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Compartición multimedia" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"La compartición de medios le permite compartir música, fotos y vídeos " -"mediante la red." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Compartir música, fotos y vídeos mediante la red." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Carpetas" @@ -5428,11 +5531,6 @@ msgid "Peak detect" msgstr "Detección de picos" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nombre" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositivo" @@ -5527,16 +5625,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personalizado" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Acceso universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Hacer más sencillo de ver, escuchar, escribir y apuntar y pulsar" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5635,8 +5738,8 @@ msgstr "Teclas sonoras" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pitar cuando se activen las teclas Bloq Num o Bloq Mayús" +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pitar cuando se activen o desactiven las teclas Bloq Num o Bloq Mayús." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6020,97 +6123,69 @@ msgstr "Efectos de color" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Añadir usuario" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Nombre _completo" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Estándar" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrador" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Nombre _completo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipo de cuenta" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Permitir al usuario establecer una contraseña en el siguiente _inicio de " "sesión" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Establecer una contraseña ahora" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verificar" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirmar" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "El inicio de sesión corporativo permite que se use una cuenta de usuario " -"gestionada de manera centralizada en este dispositivo." +"gestionada de manera centralizada en este dispositivo. También puede usar " +"esta cuenta para acceder a recursos de la compañía en Internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Dominio" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Conéctese para añadir\n" -"cuentas de inicio de sesión corporativo." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Inicio de s_esión corporativo" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Añadir usuario" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Unir" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Inicio de sesión del administrador del dominio" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Para usar inicios de sesión corporativos, este equipo necesita\n" -"formar parte de un dominio. Pida al administrador de su\n" -"sistema que escriba aquí la contraseña del dominio." +msgid "You are Offline" +msgstr "Está desconectado" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nombre del administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Debe estar conectado para añadir usuarios corporativos." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Contraseña de administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Inicio de s_esión corporativo" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6145,7 +6220,7 @@ msgstr "Dedo meñique derecho" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Activar el inicio de sesión con huella" @@ -6182,9 +6257,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "inicio;sesión;nombre;huella;avatar;logo;cara;contraseña;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Histórico de inicio de sesión" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Unir" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Inicio de sesión del administrador del dominio" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Para usar inicios de sesión corporativos, este equipo necesita\n" +"formar parte de un dominio. Pida al administrador de su\n" +"sistema que escriba aquí la contraseña del dominio." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nombre del administrador" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Contraseña de administrador" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6207,40 +6305,31 @@ msgstr "Contraseña _actual" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" -"Permitir al usuario establecer una contraseña en el siguiente inicio de " -"sesión" +"Permitir al usuario cambiar su contraseña en el siguiente inicio de sesión" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Establecer una contraseña ahora" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Añadir cuenta de usuario" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Quitar cuenta de usuario" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Añadir usuario…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opciones de inicio de sesión" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "_Inicio de sesión automático" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Inicio de sesión con _huella" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icono de usuario" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Último inicio de sesión" @@ -6275,7 +6364,7 @@ #: ../panels/user-accounts/pw-utils.c:89 msgctxt "Password hint" msgid "Try to avoid using your name in the password." -msgstr "Evite usar su nombre en la contraseña" +msgstr "Evite usar su nombre en la contraseña." #: ../panels/user-accounts/pw-utils.c:91 msgctxt "Password hint" @@ -6343,7 +6432,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Mezcle letras mayúsculas y minúsculas y use uno o dos números." #: ../panels/user-accounts/pw-utils.c:119 @@ -6435,32 +6524,32 @@ msgstr "Error desconocido" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Debe coincidir con la dirección web del proveedor de la cuenta." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Falló al añadir la cuenta" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Las contraseñas no coinciden." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Falló al registrar la cuenta" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "No hay una manera soportada de autenticar con este dominio" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Falló al unirse al dominio" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6468,7 +6557,7 @@ "El nombre de inicio de sesión no ha funcionado.\n" "Inténtelo de nuevo." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6476,14 +6565,24 @@ "La contraseña de inicio de sesión no ha funcionado.\n" "Inténtelo de nuevo." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Falló al iniciar sesión en el dominio" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "No se pudo encontrar el dominio. ¿Está bien escrito?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Estándar" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrador" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6493,7 +6592,7 @@ #: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." -msgstr "El dispositivo ya está en uso" +msgstr "El dispositivo ya está en uso." #: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." @@ -6503,15 +6602,15 @@ msgid "Enabled" msgstr "Activada" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "¿Eliminar las huellas registradas?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Eliminar huellas" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6519,15 +6618,15 @@ "¿Quiere eliminar sus huellas registradas y así desactivar el inicio de " "sesión con huella?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Hecho" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "No se pudo acceder al dispositivo «%s»" @@ -6535,16 +6634,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "No se pudo iniciar la captura de dedo en el dispositivo «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "No se pudo acceder a ninguna lectura de huellas" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contacte con el administrador de su sistema para obtener ayuda." @@ -6553,7 +6652,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6562,11 +6661,11 @@ "Para activar el inicio de sesión con huella debe guardar una de sus huellas " "usando el dispositivo «%s»." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Seleccionando dedo" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Registrando huellas digitales" @@ -6620,14 +6719,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sesión terminada" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sesión iniciada" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Actividad de la cuenta" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Elija otra contraseña." @@ -6689,7 +6795,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "No se pudo conectar al dominio %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Otras cuentas" @@ -6770,15 +6876,15 @@ msgid "Logged in" msgstr "Sesión iniciada" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Falló al contactar con el servicio de cuentas" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Asegúrese de que el servicio de cuentas está instalado y activado." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6786,12 +6892,12 @@ "Para realizar los cambios\n" "pulse primero el icono *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Crear una cuenta de usuario" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6799,12 +6905,12 @@ "Para crear un usuario\n" "pulse primero el icono *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Quitar la cuenta de usuario seleccionada" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6812,33 +6918,32 @@ "Para eliminar la cuenta de usuario seleccionada\n" "pulse primero el icono *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mi cuenta" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Ya existe un nombre de usuario con el nombre «%s»." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "El nombre de usuario no está disponible. Pruebe con otro." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "El nombre de usuario es demasiado largo." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "El nombre de usuario no puede comenzar por «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "El nombre de usuario debe constar de letras mayúsculas y minúsculas de la a-" -"z, dígitos y cualquiera de los caracteres «.», «-» y «_»." +"z, dígitos y cualquiera de los caracteres: «.», «-» o «_»." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Esto se usará para nombrar su carpeta personal y no se puede cambiar." @@ -6928,19 +7033,19 @@ msgid "Button" msgstr "Botón" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tableta Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Establecer el mapeado de botones y ajustar la sensibilidad del lápiz para " "tabletas gráficas" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tableta;Wacom;Stylus;Borrador;Ratón;" @@ -6972,6 +7077,10 @@ msgid "Bluetooth Settings" msgstr "Configuración de Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tableta Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapa que monitorizar" @@ -7065,22 +7174,22 @@ msgid "Mode Switch #%d" msgstr "Modo de cambio nº %d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Botón izquierdo nº %d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Botón derecho nº %d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Botón superior nº %d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Botón inferior nº %d" @@ -7157,6 +7266,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilidad de presión del lápiz" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Todas las configuraciones" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centro de control de GNOME" @@ -7213,22 +7327,18 @@ msgid "Quit" msgstr "Salir" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Todas las configuraciones" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personal" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7267,6 +7377,203 @@ msgid "Cancel search" msgstr "Cancelar búsqueda" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Atajo de teclado para %s. Introduzca el atajo nuevo para cambiarlo." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Para editar un atajo nuevo pulse en la fila y mantenga pulsadas las " +#~ "teclas nuevas, o pulse Retroceso para eliminarla." + +#~ msgid "Error logging into the account" +#~ msgstr "Error al iniciar sesión en la cuenta" + +#~ msgid "Credentials have expired." +#~ msgstr "Las credenciales han caducado." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Firme para activar esta cuenta." + +#~ msgid "_Sign In" +#~ msgstr "Iniciar _sesión" + +#~ msgid "_Name:" +#~ msgstr "_Nombre:" + +#~ msgid "C_ommand:" +#~ msgstr "C_omando:" + +#~ msgid "Add Shortcut" +#~ msgstr "Añadir atajo" + +#~ msgid "Remove Shortcut" +#~ msgstr "Quitar atajo" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "No se puede usar la combinación de teclas «%s» porque se haría imposible " +#~ "escribir usando esta tecla.\n" +#~ "Por favor, inténtelo con una tecla como Control, Alt o Mayús. al mismo " +#~ "tiempo." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "La combinación «%s» ya se está usando para\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Si reasigna la combinación a «%s» se desactivará la combinación «%s»." + +#~ msgid "_Reassign" +#~ msgstr "_Reasignar" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "El atajo «%s» tiene un atajo «%s» asociado. ¿Quiere establecerlo " +#~ "automáticamente a «%s»?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "«%s» está actualmente asociado con «%s», este atajo se desactivará si " +#~ "continúa." + +#~ msgid "_Assign" +#~ msgstr "_Asignar" + +#~ msgid "Add User Account" +#~ msgstr "Añadir cuenta de usuario" + +#~ msgid "Remove User Account" +#~ msgstr "Quitar cuenta de usuario" + +#~ msgid "_Account Activity" +#~ msgstr "_Actividad de la cuenta" + +#~ msgid "Login History" +#~ msgstr "Histórico de inicio de sesión" + +#~ msgid "Add Network Connection" +#~ msgstr "Añadir conexión de red" + +#~ msgid "Personal File Sharing" +#~ msgstr "Compartición de archivos personales" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Permitir control remoto" + +#~ msgid "Welcome to the Control Center" +#~ msgstr "Bienvenido al centro de control" + +#~ msgid "Select a panel in the sidelist to see the available options" +#~ msgstr "" +#~ "Seleccione un panel en la lista lateral para ver las opciones disponibles" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "No se ha elegido ningún certificado CA" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "No usar un certificado de Certificate Authority (CA) puede dar lugar a " +#~ "conexiones inseguras a redes inalámbricas promiscuas. ¿Quiere elegir un " +#~ "certificado Certificate Authority?" + +#~ msgid "Ignore" +#~ msgstr "Ignorar" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Elija un certificado CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Preguntar esta contraseña cada vez" + +#~ msgid "Don't _warn me again" +#~ msgstr "No a_visarme de nuevo" + +#~ msgid "No" +#~ msgstr "No" + +#~ msgid "Yes" +#~ msgstr "Sí" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Equipo" + +#~ msgid "Bridge" +#~ msgstr "Puente" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "No se pudieron cargar los complementos de VPN" + +#~ msgid "Bond slaves" +#~ msgstr "Asociar esclavos" + +#~ msgid "(none)" +#~ msgstr "(ninguno)" + +#~ msgid "Bridge slaves" +#~ msgstr "Asociar esclavos" + +#~ msgid "Team slaves" +#~ msgstr "Esclavos del equipo" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "El dispositivo InfiniBand no soporta el modo conectado" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Otra" + +#~ msgid "_Verify" +#~ msgstr "_Verificar" + +#~ msgid "Login Options" +#~ msgstr "Opciones de inicio de sesión" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Ya existe un nombre de usuario con el nombre «%s»." + +#~ msgid "Color" +#~ msgstr "Color" + +#~ msgid "Power" +#~ msgstr "Energía" + +#~ msgid "Privacy" +#~ msgstr "Privacidad" + #~ msgid "Used to determine your geographical location" #~ msgstr "Usados para determinar su ubicación geográfica" @@ -7301,9 +7608,6 @@ #~ msgid "Time _Zone" #~ msgstr "_Zona horaria" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Desplazamiento con dos dedos" - #~ msgid "Close" #~ msgstr "Cerrar" @@ -7790,9 +8094,6 @@ #~ msgid "Domain not found." #~ msgstr "Dominio no encontrado." -#~ msgid "Wrong password" -#~ msgstr "Contraseña errónea" - #~ msgctxt "Password hint" #~ msgid "Try to add more characters." #~ msgstr "Pruebe añadiendo más caracteres." @@ -8271,9 +8572,6 @@ #~ msgid "Out of range" #~ msgstr "Fuera de rango" -#~ msgid "_Configure…" -#~ msgstr "_Configurar…" - #~ msgid "_Disconnect" #~ msgstr "_Desconectar" @@ -8706,12 +9004,6 @@ #~ msgid "Take a screenshot" #~ msgstr "Capturar la pantalla" -#~ msgid "Shortcut" -#~ msgstr "Combinación" - -#~ msgid "Account _type" -#~ msgstr "_Tipo de cuenta" - #~ msgid "_Back" #~ msgstr "_Atrás" @@ -8929,9 +9221,6 @@ #~ msgid "_Photos:" #~ msgstr "_Fotos:" -#~ msgid "Error saving the new shortcut" -#~ msgstr "Error al guardar la combinación nueva" - #~ msgid "Too many custom shortcuts" #~ msgstr "Demasiadas combinaciones personalizadas" @@ -11051,8 +11340,8 @@ #~ "This theme will not look as intended because the required GTK+ theme '%s' " #~ "is not installed." #~ msgstr "" -#~ "Este tema no se mostrará como se pretende porque el el tema GTK+ " -#~ "necesario «%s» no está instalado." +#~ "Este tema no se mostrará como se pretende porque eltema GTK+ necesario " +#~ "«%s» no está instalado." #~ msgid "" #~ "This theme will not look as intended because the required window manager " @@ -11471,9 +11760,6 @@ #~ msgid "Could not get org.gnome.SettingsDaemon.XRANDR" #~ msgstr "No se pudo obtener org.gnome.SettingsDaemin.XRANDR" -#~ msgid "_Command:" -#~ msgstr "_Comando:" - #~ msgid "Screen Resolution" #~ msgstr "Resolución de la pantalla" diff -Nru gnome-control-center-3.20.2/po/eu.po gnome-control-center-3.22.1/po/eu.po --- gnome-control-center-3.20.2/po/eu.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/eu.po 2016-09-27 12:37:36.000000000 +0000 @@ -2,18 +2,18 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # +# # Hizkuntza Politikarako Sailburuordetza , 2004, 2005. # Asier Sarasua Garmendia , 2013. # Iñaki Larrañaga Murgoitio , 2004, 2005, 2006, 2007, 2008, 2009, 2010. # Iñaki Larrañaga Murgoitio , 2011, 2012, 2013, 2014, 2015, 2016. -# msgid "" msgstr "" "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-co" "ntrol-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-23 08:56+0000\n" -"PO-Revision-Date: 2016-03-23 21:19+0100\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-18 13:15+0100\n" "Last-Translator: dooteo \n" "Language-Team: Basque \n" "Language: eu\n" @@ -24,7 +24,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../panels/background/background.ui.h:1 -#| msgid "Background" msgid "_Background" msgstr "A_tzeko planoa" @@ -35,7 +34,6 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -#| msgid "Lock Screen" msgid "_Lock Screen" msgstr "_Blokeatu pantaila" @@ -95,7 +93,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Karpeta nagusia" @@ -111,25 +109,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -160,16 +157,18 @@ msgid "Current background" msgstr "Uneko atzeko planoa" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#| msgid "Background" +msgid "Back­ground" msgstr "Atzeko planoa" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Aldatu atzeko planoko irudia horma-paper edo argazki batera" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Horma-papera;Pantaila;Mahaigaina;" @@ -209,18 +208,18 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Itzali hegazkin modua Bluetooth-a gaitzeko." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#| msgid "Bluetooth" +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Aktibatu eta desaktibatu Bluetooth eta konektatu gailuak" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "partekatu;partekatzea;bluetooth;obex;" @@ -394,7 +393,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Fitxategi guztiak" @@ -434,7 +433,7 @@ msgstr "Gorde profila" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Gorde" @@ -544,13 +543,11 @@ #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -#| msgid "Start" msgid "_Start" msgstr "_Hasi" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -#| msgid "Resume" msgid "_Resume" msgstr "_Jarraitu" @@ -694,7 +691,7 @@ "informazioa lagungarri gerta dakizuke." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Laburpena" @@ -703,15 +700,14 @@ msgstr "Gehitu profila" #: ../panels/color/color.ui.h:29 -#| msgid "Import File…" msgid "_Import File…" msgstr "_Inportatu fitxategia..." -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Gehitu" @@ -738,7 +734,6 @@ msgstr "Ikasi kolore-kudeaketari buruz gehiago" #: ../panels/color/color.ui.h:36 -#| msgid "Set for all users" msgid "_Set for all users" msgstr "_Ezarri erabiltzaile guztientzako" @@ -747,17 +742,14 @@ msgstr "Ezarri profila hau ordenagailuko erabiltzaile guztientzako" #: ../panels/color/color.ui.h:38 -#| msgid "Enable" msgid "_Enable" msgstr "_Gaitu" #: ../panels/color/color.ui.h:39 -#| msgid "Add profile" msgid "_Add profile" msgstr "_Gehitu profila" #: ../panels/color/color.ui.h:40 -#| msgid "Calibrate…" msgid "_Calibrate…" msgstr "_Kalibratu…" @@ -766,12 +758,10 @@ msgstr "Kalibratu gailua" #: ../panels/color/color.ui.h:42 -#| msgid "Remove profile" msgid "_Remove profile" msgstr "Kendu _profila" #: ../panels/color/color.ui.h:43 -#| msgid "View details" msgid "_View details" msgstr "Ikusi _xehetasunak" @@ -867,17 +857,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Kolorea" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Kalibratu pantaila, kamera edo inprimagailuak bezalako gailuen kolorea" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Kolorea;ICC;Profila;Kalibratu;Inprimagailua;Pantaila;" @@ -895,23 +886,23 @@ msgid "No languages found" msgstr "Ez da hizkuntzarik aurkitu" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Gaur" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Atzo" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b %e" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%b %e, %Y" @@ -1031,8 +1022,9 @@ msgid "December" msgstr "Abendua" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data eta ordua" @@ -1074,7 +1066,6 @@ msgstr "Data eta _ordua" #: ../panels/datetime/datetime.ui.h:24 -#| msgid "Time Zone" msgid "Time Z_one" msgstr "Ordu-_zona" @@ -1090,12 +1081,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Aldatu data eta ordua, ordu-zona barne" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Erlojua;Ordu-zona;Kokalekua;" @@ -1109,209 +1100,225 @@ "Sistemako ordua eta dataren ezarpenak aldatzeko, autentifikatu egin behar " "zara." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tapa itxita" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Ispilatua" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Nagusia" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Desaktibatuta" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Bigarren mailakoa" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Antolatu konbinatutako pantailak" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplikatu" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arrastatu pantailak antolatzeko" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Biratu 90° erlojuaren aurka" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Biratu 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Biratu 90° erlojuaren alde" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Tamaina" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Aspektu-erlazioa" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Bereizmena" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Doitu TBrako" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Freskatu emaria" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Erakutsi gaineko barra eta jardueren ikuspegi orokorra pantaila honetan" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "2. mailako pantaila" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Elkartu pantaila hau beste batekin laneko area handiago bat sortzeko" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Aurkezpena" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Erakutsi diapositibak eta multimedia soilik" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Ispilua" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Erakutsi ikuspegi berdina bi pantailetan" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Itzali" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Ez erabili pantaila hau" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Ezin izan da pantailaren informazioa eskuratu" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Antolatu konbinatutako pantailak" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#| msgid "Displays" +msgid "Dis­plays" msgstr "Pantailak" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Aldatu konektatutako pantaila eta proiektagailuak nola erabiliko diren" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panela;Proiektagailua;xrandr;Pantaila;Bereizmena;Freskatu;Monitorea;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Ezezaguna" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (eraikitze-IDa: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (eraikitze-IDa: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s (%d-bit)" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Galdetu zer egin" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ez egin ezer" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Ireki karpeta" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Bestelako euskarria" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Hautatu aplikazioa audio CDentzako" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Hautatu aplikazioa bideo DVDentzako" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Hautatu aplikazio bat exekutatzeko musika erreproduzigailu bat konektatzean" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Hautatu aplikazio bat exekutatzeko kamera bat konektatzean" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Hautatu aplikazioa softwaredun Audio CDentzako" @@ -1320,88 +1327,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "Audio DVDa" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Blu-Ray disko hutsa" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "CD disko hutsa" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "DVD disko hutsa" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "HD DVD disko hutsa" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-Ray bideo diskoa" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "liburu elektronikoen irakurlea" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD bideo diskoa" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Argazkien CDa" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CDa" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Bideo CDa" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows-eko softwarea" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sekzioa" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Aurkezpen orokorra" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplikazio lehenetsiak" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Euskarri aldagarria" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "%s bertsioa" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#| msgid "Details" +msgid "De­tails" msgstr "Xehetasunak" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Ikusi sistemari buruzko informazioa" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1576,8 +1582,9 @@ msgid "Launch help browser" msgstr "Abiatu laguntza-arakatzailea" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Ezarpenak" @@ -1650,7 +1657,6 @@ msgstr "Blokeatu pantaila" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Sarbide unibertsala" @@ -1686,11 +1692,21 @@ msgid "High contrast on or off" msgstr "Gaitu edo desgaitu kontraste altua" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Laster-tekla pertsonalizatuak" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1717,120 +1733,137 @@ msgid "Modifiers-only switch to next source" msgstr "Aldatzaileak soilik aldatu hurrengo iturburura" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Teklatua" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Leheneratu laster-tekla bere balio lehenetsira" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s jadanik erabiltzen ari da %s(e)rako. Hura ordezten baduzu, " +"'%s' desgaitu egingo da" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcut" +msgid "Set Custom Shortcut" +msgstr "Ezarri laster-tekla pertsonalizatua" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Ezarri laster-tekla" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Sartu laster-tekla berria %s aldatzeko." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +#| msgid "Custom Shortcut" +msgid "Add Custom Shortcut" +msgstr "Gehitu laster-tekla pertsonalizatua" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#| msgid "Keyboard" +msgid "Key­board" +msgstr "Teklatua" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" -"Ikusi eta aldatu teklatuaren laster-bideak eta ezarri idazteko hobespenak" +"Ikusi eta aldatu teklatuaren laster-teklak eta ezarri idazteko hobespenak" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Laster-tekla;Errepikatu;Keinua;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Lasterbide pertsonalizatua" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "I_zena:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Ko_mandoa:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Gehitu lasterbidea" +#| msgid "Keyboard Shortcuts" +msgid "No keyboard shortcut found" +msgstr "Ez da teklatuaren laster-teklarik aurkitu" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Kendu lasterbidea" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Lasterbide bat editatzeko, egin klik dagokion errenkadan eta eduki sakatuta " -"tekla berriak edo sakatu Atzera-tekla garbitzeko." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Lasterbide pertsonalizatuak" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Saiatu bestelako bilaketa bat" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Sakatu Ihes bertan behera uzteko." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"\"%s\" lasterbidea ezin da erabili: erabilkaitza izango delako tekla hau " -"erabiltzean.\n" -"Saiatu Kontrol, Alt edo Maius bezalako tekla batekin aldi berean." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Izena" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"\"%s\" lasterbidea erabilita dago honetarako:\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +#| msgid "C_ommand:" +msgid "Command" +msgstr "Komandoa" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Laster-tekla" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Editatu" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Lasterbidea \"%s\"(r)i berriro esleitzen badiozu, \"%s\" lasterbidea " -"desgaitu egingo da." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Bat ere ez" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Esleitu berriz" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#| msgid "_Remove" +msgid "Remove" +msgstr "Kendu" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#| msgid "Error saving the new shortcut" +msgid "Enter the new shortcut" +msgstr "Sartu laster-tekla berria" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"'%s' lasterbideak esleitutako '%s' laster-tekla du. Nahi duzu automatikoki " -"'%s'(e)ra ezartzea?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Utzi" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Unean '%s' '%s'(r)i esleituta dago, lasterbidea desgaitu egingo da aurrera " -"jarraitzen baduzu." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Gehitu" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Esleitu" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +#| msgid "_Replace" +msgid "Replace" +msgstr "Ordeztu" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Ezarri" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Probatu zure _ezarpenak" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#| msgid "Mouse & Touchpad" +msgid "Mouse & Touch­pad" msgstr "Sagua eta touchpad-a" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1838,7 +1871,7 @@ "ezkerreko eskuarekin erabiltzea" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Trackpad;Erakuslea;Klik;Sakatu;Bikoitza;Botoia;Trackball;Korritu;" @@ -1847,7 +1880,6 @@ msgstr "Orokorra" #: ../panels/mouse/gnome-mouse-properties.ui.h:2 -#| msgid "Primary _button" msgid "Primary Button" msgstr "Botoi nagusia" @@ -1856,14 +1888,10 @@ msgstr "Saguko eta touchpad-eko botoi fisikoen ordena ezartzen du." #: ../panels/mouse/gnome-mouse-properties.ui.h:4 -#| msgctxt "balance" -#| msgid "Left" msgid "Left" msgstr "Ezkerrean" #: ../panels/mouse/gnome-mouse-properties.ui.h:5 -#| msgctxt "balance" -#| msgid "Right" msgid "Right" msgstr "Eskuinean" @@ -1872,7 +1900,6 @@ msgstr "Sagua" #: ../panels/mouse/gnome-mouse-properties.ui.h:7 -#| msgid "_Mouse Keys" msgid "Mouse Speed" msgstr "Saguaren abiadura" @@ -1882,12 +1909,10 @@ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. #: ../panels/mouse/gnome-mouse-properties.ui.h:10 -#| msgid "_Natural scrolling" msgid "Natural Scrolling" msgstr "Korritze naturala" #: ../panels/mouse/gnome-mouse-properties.ui.h:11 -#| msgid "This will not remove the account on the server." msgid "Scrolling moves the content, not the view." msgstr "Korritzeak edukia mugitzen du, ez ikuspegia." @@ -1896,17 +1921,19 @@ msgstr "Touchpad-a" #: ../panels/mouse/gnome-mouse-properties.ui.h:13 -#| msgid "Touchpad" msgid "Touchpad Speed" msgstr "Touchpad-aren abiadura" #: ../panels/mouse/gnome-mouse-properties.ui.h:14 -#| msgid "Tap to _click" msgid "Tap to Click" msgstr "Ukitu klik egiteko" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 -#| msgid "Scrolling" +#| msgid "Two _finger scroll" +msgid "Two-finger Scrolling" +msgstr "Bi hatzeko korritzea" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Ertzaren korritzea" @@ -1945,11 +1972,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Hegazkin modua" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Sareko proxy-a" @@ -1957,19 +1984,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPNa" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Zerbait gaizki gertatu da. Jar zaitez softwarearen sortzailearekin " "harremanetan." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager exekutatzen egon behar da." @@ -1985,7 +2012,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2002,59 +2029,64 @@ msgid "page 2" msgstr "2. orrialdea" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Segurtasuna" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatikoa" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "%d. profila" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Bat ere ez" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Inoiz ere ez" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2062,179 +2094,179 @@ msgstr[1] "orain dela %i egun" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Bat ere ez" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Ahula" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ados" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Ona" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Oso ona" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Xehetasunak" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitatea" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Helbidea" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Sare-maskara" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Atebidea" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Ezabatu helbidea" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Gehitu" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Zerbitzaria" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Ezabatu DNS zerbitzaria" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrika" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Ezabatu bidea" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatikoa (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Eskuz" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Esteka lokalak soilik" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Aurrizkia" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatikoa" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatikoa (DHCP soilik)" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Berrezarri" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Bat ere ez" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 bit-eko gakoa (hamaseitarra edo ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 bit-eko pasaesaldia" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinamikoa (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA eta WPA2 pertsonala" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA eta WPA2 enpresa" @@ -2249,30 +2281,30 @@ msgstr "Esteka-abiadura" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 helbidea" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 helbidea" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardwarearen helbidea" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2282,7 +2314,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2365,13 +2397,13 @@ msgid "Firewall _Zone" msgstr "Suebakiaren _zona" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Lehenetsia" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zonak konexioaren fidagarritasun-maila definitzen du" @@ -2413,45 +2445,26 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Ezin da konexioaren editorea ireki" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Profil berria" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPNa" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Esleitu" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Taldea" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Zubia" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN-a" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Ezin izan dira VPN pluginak kargatu" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Inportatu fitxategitik..." -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Gehitu sareko konexioa" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +#| msgid "%s VPN" +msgid "Add VPN" +msgstr "Gehitu VPNa" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2459,7 +2472,7 @@ msgstr "_Berrezarri" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Ahaztu" @@ -2485,11 +2498,11 @@ msgid "S_ecurity" msgstr "_Segurtasuna" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Ezin da VPN konexioa inportatu" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2502,36 +2515,36 @@ "\n" "Errorea: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Hautatu fitxategia inportatzeko" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Ireki" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "'%s' izeneko fitxategia badago lehendik ere." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Ordeztu" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Nahi duzu '%s' gordetzen ari zaren VPN konexioarekin ordeztea?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Ezin da VPN konexioa esportatu" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2542,7 +2555,7 @@ "\n" "Errorea: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Esportatu VPN konexioa" @@ -2569,61 +2582,51 @@ msgid "Make available to _other users" msgstr "Egin erabilgarri beste _erabiltzaileentzako" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#| msgid "Network" +msgid "Net­work" msgstr "Sarea" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Kontrolatu nola konektatzen zaren Internetera" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +#| msgid "" +#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" +#| "vpn;vlan;bridge;bond;DNS;" msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Sarea;Haririk gabea;Wi-Fi;Wifi;IPa;Sare lokala;LAN;Proxy-a;Area Zabaleko " -"Sarea;WAN;hedapena;igorpena;Modema;Bluetooth;vpn;vlan;bridge;zubia;bond;" -"lotura;DNS;Domeinuen izen-zerbitzaria;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Esleitu morroiak" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(bat ere ez)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Zubi morroiak" +"Sarea;Haririk gabea;Wi-Fi;Wifi;IP;IPa;Sare lokala;LAN;Proxy-a;Area Zabaleko " +"Sarea;WAN;hedapena;igorpena;Modema;Bluetooth;vpn;DNS;Domeinuen" +" izen-zerbitzaria;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "inoiz ere ez" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "gaur" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "atzo" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP helbidea" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Erabilitako azkena" @@ -2633,34 +2636,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Hariduna" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Aukerak..." -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "%d. profila" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Gehitu konexio berria" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Taldearen morroiak" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2668,13 +2662,13 @@ "Haririk gabekoa ez den Interneteko konexioa badaukazu, haririk gabeko " "wifigunea konfigura dezakezu konexioa beste batzuekin partekatzeko." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Haririk gabeko wifigunea aktibatzean %s(e)tik deskonektatuko zara." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2682,23 +2676,23 @@ "Ezin da Internetera sartu zure haririk gabekoaren bitartez wifigunea aktibo " "dagoen bitartean." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Gelditu wifigunea eta deskonektatu edozein erabiltzaile?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Gelditu wifigunea" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Sistemako arauek wifigune gisa erabiltzea debekatzen dute" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Haririk gabeko gailuak ez du wifigunearen modua onartzen" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2706,11 +2700,11 @@ "Hautatutako sareen xehetasunak, pasahitzak eta konfigurazio pertsonalizatuak " "barne, galdu egingo dira." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historia" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2718,7 +2712,7 @@ msgstr "It_xi" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Ahaztu" @@ -2755,6 +2749,10 @@ msgid "Provider" msgstr "Hornitzailea" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Sarea" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2860,16 +2858,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Pasahitza" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Bat ere ez" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Erakutsi _pasahitza" @@ -2963,7 +2957,6 @@ msgstr "_Konektatu ezkutuko sarera…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historia" @@ -2985,360 +2978,338 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Pasahitza" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Azpiegitura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Egoera ezezaguna" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Kudeatu gabea" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Ez dago erabilgarri" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Konektatzen" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Autentifikazioa behar da" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Konektatuta" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Deskonektatzen" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Konexioak huts egin du" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Egoera ezezaguna (falta da)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Ez dago konektatuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konexioak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IParen konfigurazioak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IParen konfigurazioa iraungi da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Ezkutukoak behar dira, baina ez dira eman" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x-ren eskatzailea deskonektatuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x-ren eskatzailearen konfigurazioak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x-ren eskatzaileak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x-ren eskatzailea gehiegi luzatu da autentifikatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP zerbitzuak huts egin du abiatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP zerbitzua deskonektatuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP-ek huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP-ren bezeroak huts egin du abiatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-ren bezeroaren errorea" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-ren bezeroak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Partekatutako konexioaren zerbitzuak huts egin du abiatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Partekatutako konexioaren zerbitzuak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "IP automatikoaren zerbitzuak huts egin du abiatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "IP automatikoaren zerbitzuaren errorea" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "IP automatikoaren zerbitzuak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linea lanpetuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Ez dago markatze-tonurik" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Ezin izan da garraiatzailerik ezarri" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Markatze-eskaeraren denbora iraungituta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Markatze-saiakerak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modemaren hasieratzeak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Huts egin du zehaztutako APNa hautatzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Ez da sarerik bilatzen ari" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Sarea erregistratzea ukatuta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Sarea erregistratzearen denbora iraungituta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Huts egin du eskatutako sarearekin erregistratzean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PINaren egiaztaketak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Agian gailuaren firmwarea falta da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Konexioa desagertu da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Existitzen den konexioa hartu da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Ez da modemik aurkitu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth konexioak huts egin du" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Ez da SIM txartelik sartu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIMaren PINa behar da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIMaren PUKa behar da" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM arazoa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand gailuak ez du onartzen konektatutako modua" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Konexio-mendekotasunak huts egin du" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmwarea falta da" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kablea deskonektatuta" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Ez da Ziurtagiri-Emailearen ziurtagirik aukeratu" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "definitu gabeko errorea 802.1x segurtasunean (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +#| msgid "No input source selected" +msgid "no file selected" +msgstr "ez da fitxategirik hautatu" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Ziurtagiri-Emailearen (CA) ziurtagiria ez erabiltzeak konexio ez-seguru bat " -"izatea eragin dezake, batiz bat haririk gabeko sare gaizkilea. Nahi duzu " -"Ziurtagiri-Emailearen ziurtagiria aukeratu?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ez ikusi egin" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Aukeratu ZE ziurtagiria" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, edo PKCS#12 gako pribatuak (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "zehaztugabeko errorea eap metodoaren fitxategia egiaztatzean" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, edo PKCS#12 gako pribatuak (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER edo PEM ziurtagiriak (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "EAP-FAST PAC fitxategia falta da" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Aukeratu PAC fitxategia" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC fitxategiak (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _fitxategia" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Barneko autentifikazioa" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC _hornidura" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3347,41 +3318,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonimoa" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autentifikatuta" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Biak" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _fitxategia" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Barneko autentifikazioa" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#| msgid "PAC pro_visioning" +msgid "Allow automatic PAC pro_visioning" +msgstr "Baimendu PAC automatikoki _hornitzea" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "EAP-LEAPren erabiltzaile-izena falta da" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "EAP-LEAPren pasahitza falta da" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Erabiltzaile-izena:" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Erakutsi _pasahitza" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "EAP-PEAPren baliogabeko ZE ziurtagiria: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "EAP-PEAPren baliogabeko ZE ziurtagiria: ez da ziurtagirik zehaztu" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Aukeratu Ziurtagiri-Emailearen ziurtagiria" @@ -3399,19 +3403,58 @@ msgid "C_A certificate" msgstr "_ZE ziurtagiria" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#| msgid "Authentication required" +msgid "No CA certificate is _required" +msgstr "Ez da ZE ziurtagirik behar" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _bertsioa" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Eskatu pasahitz hau aldiro" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "EAPren erabiltzaile-izena falta da" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +#| msgid "Wrong password" +msgid "missing EAP password" +msgstr "EAPren pasahitza falta da" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "EAP-TLSren erabiltzaile-izena falta da" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "EAP-TLSren baliogabeko ZE ziurtagiria: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "EAP-TLSren baliogabeko ZE ziurtagiria: ez da ziurtagirik zehaztu" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "EAP-TLSren pasahitza baliogabea: falta da" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "EAP-TLSren baliogabeko gako pribatua: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "EAP-TLSren baliogabeko erabiltzaile-ziurtagiria: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Enkriptatu gabeko gako pribatuak ez dira seguruak" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3425,11 +3468,11 @@ "\n" "(Zure gako pribatua pasahitz batekin babes dezakezu openssl-rekin)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Aukeratu zure ziurtagiri pertsonala" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Aukeratu zure gako pribatua" @@ -3441,51 +3484,56 @@ msgid "_User certificate" msgstr "_Erabiltzailearen ziurtagiria" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Gako pribatua" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Gako _pribatuaren pasahitza" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "EAP-TTLSren baliogabeko ZE ziurtagiria: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "EAP-TTLSren baliogabeko ZE ziurtagiria: ez da ziurtagirik zehaztu" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Ez abisatu berriro" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ez" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Bai" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Errore ezezaguna 802.1x segurtasuna egiaztatzean" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" -msgstr "Bizkorra" +msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tuneldun TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Babestutako EAP (PEAP)" @@ -3495,6 +3543,53 @@ msgid "Au_thentication" msgstr "_Autentifikazioa" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "'leap'en erabiltzaile-izena falta da" + +#: ../panels/network/wireless-security/ws-leap.c:74 +#| msgid "Wrong password" +msgid "missing leap-password" +msgstr "'leap'en pasahitza falta da" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "wep gakoa falta da" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"baliogabeko wep gakoa: %zu luzera duen gakoak soilik digitu hamaseitarrak" +" eduki ditzake" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"baliogabeko wep gakoa: %zu luzera duen gakoak soilik ascii karaktereak eduki" +" ditzake" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"baliogabeko wep gakoa: gakoak okerreko %zu luzera du. Gako baten luzera " +"5/13 (ascii) edo 10/26 (hamaseitarra) izan behar du" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "baliogabeko wep gakoa: pasa-esaldia ezin da hutsik egon" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"baliogabeko wep gakoa: pasa-esaldia 64 karaktere baino laburragoa izan behar" +" da" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (lehenetsia)" @@ -3531,88 +3626,91 @@ msgid "WEP inde_x" msgstr "WEP _indizea" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"baliogabeko wep gakoa: gakoaren %zu luzera baliogabea. [8,63] byte edo " +"64 digitu hamaseitarrekoa izan behar da" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"baliogabeko wep gakoa: ezin da hamaseitar gisa 64 byte dituen gakoa" +" interpretatu" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Mota" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Aktibatuta" #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 -#| msgctxt "notifications" -#| msgid "Notifications" msgctxt "notifications" msgid "_Notifications" msgstr "_Jakinarazpenak" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 -#| msgctxt "notifications" -#| msgid "Sound Alerts" msgctxt "notifications" msgid "Sound _Alerts" msgstr "Soinu-a_bisuak" #: ../panels/notifications/edit-dialog.ui.h:5 -#| msgctxt "notifications" -#| msgid "Notification Banners" msgctxt "notifications" msgid "Notification _Banners" msgstr "Jakinarazpenaren _iragarkiak" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 -#| msgctxt "notifications" -#| msgid "Show Message Content in Banners" msgctxt "notifications" msgid "Show Message _Content in Banners" msgstr "Erakutsi mezuen e_dukia iragarkietan" #: ../panels/notifications/edit-dialog.ui.h:8 -#| msgctxt "notifications" -#| msgid "Lock Screen Notifications" msgctxt "notifications" msgid "_Lock Screen Notifications" msgstr "Pantaila b_lokeatzearen jakinarazpenak" #: ../panels/notifications/edit-dialog.ui.h:9 -#| msgctxt "notifications" -#| msgid "Show Message Content on Lock Screen" msgctxt "notifications" msgid "Show Message C_ontent on Lock Screen" msgstr "Erakutsi mezuen e_dukia pantaila blokeatzean" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#| msgid "Notifications" +msgid "No­ti­fi­ca­tions" msgstr "Jakinarazpenak" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "" "Kontrolatu jakinarazpenak nola bistaratzen diren eta zer erakusten duten" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "jakinarazpenak;iragarkia;mezua;erretilua;laster-leihoa;" #: ../panels/notifications/notifications.ui.h:1 -#| msgid "Notification Banners" msgid "Notification _Banners" msgstr "Jakinarazpenaren _iragarkiak" #: ../panels/notifications/notifications.ui.h:2 -#| msgid "Lock Screen Notifications" msgid "_Lock Screen Notifications" msgstr "Pantaila b_lokeatzearen jakinarazpenak" @@ -3622,80 +3720,71 @@ msgid "Applications" msgstr "Aplikazioak" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Bestelakoa" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Gehitu kontua" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Posta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +#| msgid "_Calendar" +msgid "Calendar" +msgstr "Egutegia" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontaktuak" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Berriketa" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Baliabideak" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Errorea kontuan saioa hastean" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Kredentzialak iraungita daude." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Sinatu kontu hau gaitzeko." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Sinatu" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Errorea kontua sortzean" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Errorea kontua kentzean" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Ziur zaude kontua kentzea nahi duzula?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Honek ez du kontua zerbitzaritik kenduko." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Kendu" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#| msgid "Online Accounts" +msgid "On­line Accounts" msgstr "Lineako kontuak" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Konektatu lineako zure kontuetara eta erabaki zertarako erabiliko dituzun " #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3708,6 +3797,7 @@ msgstr "Ez da lineako konturik konfiguratu" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Kendu kontua" @@ -3850,7 +3940,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Bateria" @@ -3898,106 +3988,103 @@ msgid "When _idle" msgstr "_Inaktibo dagoenean" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Energia aurreztea" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Pantailaren distira" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Distira automatikoa" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Teklatuaren distira" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Ilundu pantaila inaktibo dagoenean" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Belztu pantaila" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wifia" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Itzali haririk gabekoa energia aurrezteko." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Bandazabal _mugikorra" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Itzali mugikorraren banda-zabala (3G, 4G, LTE, e.a.) energia aurrezteko." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Bateriaren energiarekin" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Entxufea konektatutakoan" -#: ../panels/power/cc-power-panel.c:2023 -#| msgid "Don't suspend" +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Eseki" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernatu" -#: ../panels/power/cc-power-panel.c:2025 -#| msgid "Do nothing" +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ezer ez" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 -#| msgid "Suspend & Power Off" +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Esekitzeko eta itzaltzeko botoia" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Eseki _automatikoki" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Eseki automatikoki" -#: ../panels/power/cc-power-panel.c:2180 -#| msgid "When the power button is pressed:" +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Itzaltzeko botoia _sakatzean" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Gailuak" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energia" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Ikusi bateriaren egoera eta aldatu energia aurrezteko ezarpenak" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4076,11 +4163,6 @@ msgid "Delay" msgstr "Atzerapena" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Utzi" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autentifikatu" @@ -4090,138 +4172,138 @@ msgstr "Autentifikazioa behar da" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Toner gutxi" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Tonerra hutsik" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Errebelatzaile gutxi" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Errebelatzailea hutsik" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Markatzaile gutxi" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Markatzailerik gabe" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Estalkia irekita" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Atea irekita" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Paper gutxi" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Paperik ez" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Deskonektatuta" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Geldituta" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Hondakinen ontzia ia beteta" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Hondakinen ontzia beteta" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Argazki-eroale optikoa bere amaierara iristear dago" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Argazki-eroale optikoak ez du gehiago funtzionatuko" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Konfiguratzen" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Prest" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Ez du lanik onartzen" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Prozesatzen" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Tonerraren maila" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Tintaren maila" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Hornikuntzaren maila" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instalatzen" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4229,15 +4311,15 @@ msgstr[1] "%u aktibo" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Huts egin du inprimagailu berria gehitzean." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Hautatu PPD fitxategia" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4245,51 +4327,48 @@ "PostScript Printer Description fitxategiak (*.ppd, *.PPD, *.ppd.gz, *.PPD." "gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Ez da kontrolatzaile egokirik aurkitu" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Kontrolatzaile hobetsiak bilatzen..." -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Hautatu datu-basetik..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Eman PPD fitxategia..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Probako orria" -#: ../panels/printers/cc-printers-panel.c:2753 -#| msgid "Printers" -msgid "No printers" -msgstr "Inprimagailurik ez" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Ezin izan da interfazea kargatu: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#| msgid "Printers" +msgid "Prin­ters" msgstr "Inprimagailuak" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Gehitu inprimagailuak, ikusi inprimatze-lanak eta erabaki zer inprimatzea " "nahi duzun" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Inprimagailua;Ilara;Inprimatu;Papera;Tinta;Tonerra;" @@ -4300,7 +4379,6 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -#| msgid "%s Active Jobs" msgid "No Active Printer Jobs" msgstr "Inprimagailuaren lan aktiborik ez" @@ -4396,8 +4474,6 @@ #. Translators: Job's state (job is held for printing) #: ../panels/printers/pp-jobs-dialog.c:107 -#| msgctxt "printer state" -#| msgid "Paused" msgctxt "print job" msgid "Paused" msgstr "Pausatuta" @@ -4435,7 +4511,6 @@ #. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -#| msgid "%s Active Jobs" msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" msgstr "%s - Lan aktiboak" @@ -4455,6 +4530,11 @@ msgid "Parallel Port" msgstr "Ataka paraleloa" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4667,14 +4747,17 @@ msgid "_Options" msgstr "_Aukerak" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Inprimagailurik ez" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 -#| msgid "Add Printer" +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Gehitu inprimagailua" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4682,73 +4765,70 @@ "Badirudi sistemako inprimatzeko\n" "zerbitzua ez dagoela erabilgarri." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Pantailaren blokeoa" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Erabiltzen" -#: ../panels/privacy/cc-privacy-panel.c:425 -#| msgid "On" +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Aktibatuta" -#: ../panels/privacy/cc-privacy-panel.c:426 -#| msgid "Off" +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Desaktibatuta" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 -#| msgid "_Location Services" +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Kokalekuaren zerbitzuak" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Erabilera eta historia" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Hustu zakarrontziko elementu guztiak?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Zakarrontziko elementu guztiak betirako ezabatuko dira." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Hustu _zakarrontzia" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Ezabatu aldi baterako fitxategi guztiak?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Aldi baterako fitxategi guztiak betirako ezabatuko dira." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Ezabatu aldi baterako fitxategiak" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Ezabatu Zakarrontzia eta aldi baterako fitxategiak" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Softwarearen erabilpena" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Arazoaren berri ematea" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4758,21 +4838,22 @@ "gaituzu. Txostenak anonimo gisa bidaltzen dira eta datu pertsonaletatik " "garbi daude." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Pribatutasunaren araua" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Pribatutasuna" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Babestu zure informazio pertsonala eta kontrolatu besteek zer ikus dezaketen" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4910,8 +4991,7 @@ "mobile broadband increases accuracy." msgstr "" "Kokalekuaren zerbitzuak aplikazioek zure kokalekua ezagutzea baimentzen du. " -"Wi-Fi eta " -"mugikorren banda-zabalera erabiltzeak zehaztasuna handiagotzen du." +"Wi-Fi eta mugikorren banda-zabalera erabiltzeak zehaztasuna handiagotzen du." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4944,22 +5024,21 @@ msgid "Other" msgstr "Bestelakoa" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Amaitu saioa aldaketek eragina izan dezaten" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Berrabiarazi orain" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Ez da sarrerako iturbururik hautatu" -#: ../panels/region/cc-region-panel.c:1807 -#| msgid "Login Screen" +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Saio-_hasierako pantaila" @@ -4991,11 +5070,13 @@ msgid "Paper" msgstr "Papera" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#| msgid "Region & Language" +msgid "Re­gion & Lan­guage" msgstr "Eskualdea eta hizkuntza" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -5003,7 +5084,7 @@ "iturburuak" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Hizkuntza;Diseinua;Teklatua;Sarrera;" @@ -5060,7 +5141,7 @@ msgstr "Ezker+Eskuineko Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Hizkuntza" @@ -5069,7 +5150,6 @@ msgstr "Ingelesa (Erresuma Batua)" #: ../panels/region/region.ui.h:3 -#| msgid "Formats" msgid "_Formats" msgstr "_Formatuak" @@ -5111,26 +5191,11 @@ "Erabiltzaile guztiek saio-hasierako ezarpenak darabilte sisteman saioa " "hastean" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Lekuak" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Laster-markak" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Bestelakoa" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Hautatu kokalekua" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Ados" @@ -5138,11 +5203,12 @@ msgid "No applications found" msgstr "Ez da aplikaziorik aurkitu" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Bilatu" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5150,7 +5216,7 @@ "ikuspegian" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Bilaketa;Bilatu;Indizea;Ezkutatu;Pribatua;Emaitzak;" @@ -5158,6 +5224,24 @@ msgid "Search Locations" msgstr "Bilatu kokalekuak" +#: ../panels/search/search-locations-dialog.ui.h:2 +#| msgctxt "Search Location" +#| msgid "Places" +msgid "Places" +msgstr "Lekuak" + +#: ../panels/search/search-locations-dialog.ui.h:3 +#| msgctxt "Search Location" +#| msgid "Bookmarks" +msgid "Bookmarks" +msgstr "Laster-markak" + +#: ../panels/search/search-locations-dialog.ui.h:4 +#| msgctxt "Online Account" +#| msgid "Other" +msgid "Other" +msgstr "Bestelakoa" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Eraman gora" @@ -5170,6 +5254,11 @@ msgid "Preferences" msgstr "Hobespenak" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Ez da sarerik hautatu partekatzeko" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5195,21 +5284,63 @@ msgid "Choose a Folder" msgstr "Aukeratu karpeta" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Fitxategi pertsonalak partekatzeak zure 'Publikoa' karpeta uneko sarean " +"dauden beste erabiltzaileekin partekatzea baimentzen dizu hau erabiliz: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +#| msgid "" +#| "Allow remote users to connect using the Secure Shell command:\n" +#| "ssh %s" +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Urruneko saio-hasiera gaituta dagoenean, urruneko erabiltzaileek " +"konekta daitezke Shell Seguruaren komandoa erabiliz: \n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +#| msgid "" +#| "Allow remote users to view or control your screen by connecting to: vnc://%s" +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Urruneko pantaila partekatzeak urruneko erabiltzaileek zure pantaila ikustea" +" edo " +"kontrolatzea baimentzen du hona konektatuz: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopiatu" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Partekatzea" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +#| msgid "Sharing" +msgid "Sha­ring" +msgstr "Partekatzea" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Kontrolatu besteekin zer partekatzea nahi duzun" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5217,48 +5348,36 @@ "partekatu;partekatzea;ssh;ostalaria;izena;urrunekoa;mahaigaina;multimedia;" "bideoa;irudiak;argazkiak;filmak;zerbitzaria;errendatzea;" -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 -msgid "Enable or disable remote login" -msgstr "Gaitu edo desgaitu urruneko saio-hasiera" - -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 -msgid "Authentication is required to enable or disable remote login" -msgstr "Autentifikazioa behar da urruneko saioa gaitu edo desgaitzeko" - -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Ez da sarerik hautatu partekatzeko" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. #: ../panels/sharing/networks.ui.h:1 msgid "Networks" msgstr "Sareak" +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 +msgid "Enable or disable remote login" +msgstr "Gaitu edo desgaitu urruneko saio-hasiera" + +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 +msgid "Authentication is required to enable or disable remote login" +msgstr "Autentifikazioa behar da urruneko saioa gaitu edo desgaitzeko" + #: ../panels/sharing/sharing.ui.h:1 -#| msgid "Computer Name" msgid "_Computer Name" msgstr "Ordenagailuaren _izena" #: ../panels/sharing/sharing.ui.h:2 -#| msgid "Personal File Sharing" -msgid "_Personal File Sharing" -msgstr "Fitxategi _pertsonalak partekatzea" +#| msgid "_Personal File Sharing" +msgid "_File Sharing" +msgstr "_Fitxategiak partekatzea" #: ../panels/sharing/sharing.ui.h:3 -#| msgid "Screen Sharing" msgid "_Screen Sharing" msgstr "P_antaila partekatzea" #: ../panels/sharing/sharing.ui.h:4 -#| msgid "Media Sharing" msgid "_Media Sharing" msgstr "_Multimedia partekatzea" #: ../panels/sharing/sharing.ui.h:5 -#| msgid "Remote Login" msgid "_Remote Login" msgstr "_Urruneko saioa" @@ -5267,90 +5386,58 @@ msgstr "Zerbitzu batzuk desgaituta daude ez dagoelako sarerako sarbiderik." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Fitxategi pertsonalak partekatzea" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Fitxategi pertsonalak partekatzeak zure 'Publikoa' karpeta uneko sarean " -"dauden beste erabiltzaileekin partekatzea baimentzen dizu hau erabiliz: dav://%s" +#| msgid "Sharing" +msgid "File Sharing" +msgstr "Fitxategiak partekatzea" -#: ../panels/sharing/sharing.ui.h:10 -#| msgid "Require Password" +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Eskatu pasahitza" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Urruneko saioa" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Baimendu urruneko erabiltzaileei konektatzea Shell Seguruaren komandoa " -"erabiliz: \n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Pantaila partekatzea" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Baimendu urruneko erabiltzaileei zure pantaila ikustea edo kontrolatzea hona " -"konektatuz: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -#| msgid "Allow Remote Control" -msgid "_Allow Remote Control" -msgstr "_Baimendu urruneko kontrola" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Baimendu konexioek pantaila kontrolatzea" -#: ../panels/sharing/sharing.ui.h:20 -#| msgid "_Password" +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Pasahitza:" -#: ../panels/sharing/sharing.ui.h:21 -#| msgid "Show Password" +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "E_rakutsi pasahitza" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Sarbidetzaren aukerak" -#: ../panels/sharing/sharing.ui.h:23 -#| msgid "New connections must ask for access" +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Konexio _berriek sarbidetza eskatu behar dute" -#: ../panels/sharing/sharing.ui.h:24 -#| msgid "Require a password" +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Eskatu pasahitza" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Multimedia partekatzea" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." +#: ../panels/sharing/sharing.ui.h:19 +#| msgid "" +#| "Media sharing allows you to share music, photos and videos over the " +#| "network." +msgid "Share music, photos and videos over the network." msgstr "Partekatu musika, argazkiak eta bideoak sarean zehar." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Karpetak" @@ -5479,11 +5566,6 @@ msgid "Peak detect" msgstr "Gailur-detekzioa" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Izena" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Gailua" @@ -5578,17 +5660,23 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Pertsonalizatua" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +#| msgid "Universal Access" +msgid "Uni­ver­sal Access" +msgstr "Sarbide unibertsala" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "" "Egin errazagoa ikusteko, entzuteko, idazteko, kokatzeko eta klik egiteko" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5639,12 +5727,10 @@ msgstr "Pantailako _teklatua" #: ../panels/universal-access/uap.ui.h:13 -#| msgid "Repeat Keys" msgid "R_epeat Keys" msgstr "E_rrepikatze-teklak" #: ../panels/universal-access/uap.ui.h:14 -#| msgid "Cursor Blinking" msgid "Cursor _Blinking" msgstr "Kurtsore _keinukaria" @@ -5665,12 +5751,10 @@ msgstr "_Klik egitearen laguntzailea" #: ../panels/universal-access/uap.ui.h:19 -#| msgid "_Double-click" msgid "_Double-Click Delay" msgstr "_Klik bikoitzaren atzerapena" #: ../panels/universal-access/uap.ui.h:20 -#| msgid "Double-Click Timeout" msgid "Double-Click Delay" msgstr "Klik bikoitzaren atzerapena" @@ -5693,8 +5777,9 @@ msgstr "Teklak soinuarekin" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Jo soinua Blok. Zenb edo Blok Maius pizten direnean." +#| msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Jo soinua Blok. Zenb edo Blok Maius pizten edo itzaltzen direnean." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5721,13 +5806,11 @@ msgstr "Errepikatze-teklak" #: ../panels/universal-access/uap.ui.h:32 -#| msgid "Key presses _repeat when key is held down" msgid "Key presses repeat when key is held down." msgstr "" "Tekla sakatuta dagoen bitartean, tekla hori behin eta berriz errepikatzen da." #: ../panels/universal-access/uap.ui.h:34 -#| msgid "Repeat keys speed" msgid "Repeat keys delay" msgstr "Tekla-errepikatzeen atzerapena" @@ -5744,12 +5827,10 @@ msgstr "Kurtsore keinukaria" #: ../panels/universal-access/uap.ui.h:38 -#| msgid "Cursor _blinks in text fields" msgid "Cursor blinks in text fields." msgstr "Kurtsorea keinuka testu-eremuetan." #: ../panels/universal-access/uap.ui.h:39 -#| msgid "Cursor blink speed" msgid "Cursor blinking speed" msgstr "Kurtsore-keinuaren abiadura" @@ -5953,37 +6034,30 @@ msgstr "Zoomaren aukerak" #: ../panels/universal-access/zoom-options.ui.h:8 -#| msgid "Magnification:" msgid "_Magnification:" msgstr "_Lupa:" #: ../panels/universal-access/zoom-options.ui.h:9 -#| msgid "Follow mouse cursor" msgid "_Follow mouse cursor" msgstr "_Jarraitu saguaren kurtsoreari" #: ../panels/universal-access/zoom-options.ui.h:10 -#| msgid "Screen part:" msgid "_Screen part:" msgstr "Pantaila-_zatia:" #: ../panels/universal-access/zoom-options.ui.h:11 -#| msgid "Magnifier extends outside of screen" msgid "Magnifier _extends outside of screen" msgstr "Lupa pantailaren kanpoaldean _zabaltzen da" #: ../panels/universal-access/zoom-options.ui.h:12 -#| msgid "Keep magnifier cursor centered" msgid "_Keep magnifier cursor centered" msgstr "_Mantendu luparen kurtsorea zentratuta" #: ../panels/universal-access/zoom-options.ui.h:13 -#| msgid "Magnifier cursor pushes contents around" msgid "Magnifier cursor _pushes contents around" msgstr "Luparen kurtsorea edukia inguruan _bultzatzen du" #: ../panels/universal-access/zoom-options.ui.h:14 -#| msgid "Magnifier cursor moves with contents" msgid "Magnifier cursor moves with _contents" msgstr "Luparen kurtsorea edukiarekin _mugitzen da" @@ -5996,7 +6070,6 @@ msgstr "Lupa" #: ../panels/universal-access/zoom-options.ui.h:17 -#| msgid "Thickness:" msgid "_Thickness:" msgstr "L_odiera:" @@ -6011,23 +6084,19 @@ msgstr "Lodia" #: ../panels/universal-access/zoom-options.ui.h:20 -#| msgid "Length:" msgid "_Length:" msgstr "L_uzera:" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -#| msgid "Color:" msgid "Co_lor:" msgstr "_Kolorea:" #: ../panels/universal-access/zoom-options.ui.h:23 -#| msgid "Crosshairs:" msgid "_Crosshairs:" msgstr "_Gurutzaguneak:" #: ../panels/universal-access/zoom-options.ui.h:24 -#| msgid "Overlaps mouse cursor" msgid "_Overlaps mouse cursor" msgstr "Saguaren kurtsorea _teilakatzen du" @@ -6036,17 +6105,14 @@ msgstr "Gurutzaguneak" #: ../panels/universal-access/zoom-options.ui.h:26 -#| msgid "White on black:" msgid "_White on black:" msgstr "_Zuria beltzaren gainean:" #: ../panels/universal-access/zoom-options.ui.h:27 -#| msgid "Brightness:" msgid "_Brightness:" msgstr "_Distira:" #: ../panels/universal-access/zoom-options.ui.h:28 -#| msgid "Contrast:" msgid "_Contrast:" msgstr "_Kontrastea:" @@ -6095,97 +6161,80 @@ msgstr "Kolore-efektuak" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Gehitu erabiltzailea" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Izen osoa" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#| msgctxt "Account type" +#| msgid "Standard" msgid "Standard" msgstr "Arrunta" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#| msgctxt "Account type" +#| msgid "Administrator" msgid "Administrator" msgstr "Administratzailea" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Izen osoa" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Kontu _mota" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 -#| msgid "Allow user to set a password when they next login" +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Baimendu erabiltzaileei _hurrengo saio-hasieran pasahitza ezartzea" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 -#| msgid "Set a password now" +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Ezarri pasahitza _orain" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Egiaztatu" - -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +#| msgid "_Configure..." +msgid "_Confirm" +msgstr "_Berretsi" + +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +#| msgid "" +#| "Enterprise login allows an existing centrally managed user account to be " +#| "used on this device." msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Enpresako pasahitzak erabiltzaileen kontu zentralizatua erabiltzea " -"baimentzen du gailu honetan erabil ahal izateko." +"Enpresako saio-hasierak erabiltzaileen kontu zentralizatua erabiltzea " +"baimentzen du gailu honetan erabil ahal izateko. Kontu hau ere " +"erabil dezakezu enpresaren interneteko baliabideak atzitzeko." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domeinua" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Konektatu zaitez\n" -"enpresako saio-hasierako kontuak gehitzeko." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Enpresako saioa-hasiera" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Gehitu erabiltzailea" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Elkartu" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Domeinuaren administratzailearen saio-hasiera" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Enpresako saioa erabil ahal izateko, ordenagailu honek\n" -"domeinuaren zati izan behar du. Eskatu ezaiozu sareko\n" -"administratzaileari hemen domeinuaren bere pasahitza idazteko." +#| msgctxt "printer state" +#| msgid "Offline" +msgid "You are Offline" +msgstr "Deskonektatuta zaude" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Administratzailearen _izena" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#| msgid "" +#| "Go online to add\n" +#| "enterprise login accounts." +msgid "You must be online in order to add enterprise users." +msgstr "Konektatu zaitez enpresako erabiltzaileak gehitzeko." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Administratzailearen pasahitza" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Enpresako saioa-hasiera" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6220,7 +6269,7 @@ msgstr "Eskuineko hatz txikia" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Gaitu hatz-markarekin saioa-hastea" @@ -6258,9 +6307,32 @@ msgstr "" "Erabiltzaile-izena;Izena;Hatz-marka;Avatarra;Logotipoa;Aurpegia;Pasahitza;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Saio-hasieraren _historia" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Elkartu" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Domeinuaren administratzailearen saio-hasiera" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Enpresako saioa erabil ahal izateko, ordenagailu honek\n" +"domeinuaren zati izan behar du. Eskatu ezaiozu sareko\n" +"administratzaileari hemen domeinuaren bere pasahitza idazteko." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Administratzailearen _izena" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Administratzailearen pasahitza" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6283,38 +6355,33 @@ msgstr "Uneko _pasahitza" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Baimendu erabiltzaileari hurrengo saio-hasieran pasahitza ezartzea" +#| msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" +msgstr "" +"Baimendu erabiltzaileei hurrengo saio-hasieran haien pasahitzak ezartzea" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Ezarri pasahitza orain" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Gehitu erabiltzailearen kontua" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Kendu erabiltzailearen kontua" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "_Gehitu erabiltzailea…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Saioa hasteko aukerak" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Saio-hasiera _automatikoa" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Hatz-markarekin saioa-hastea" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Erabiltzailearen ikonoa" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Azken saio-hasiera" @@ -6418,8 +6485,10 @@ msgstr "Saiatu hizki, zenbaki eta ikur gehiago gehitzea." #: ../panels/user-accounts/pw-utils.c:117 +#| msgctxt "Password hint" +#| msgid "Mix uppercase and lowercase and use a number or two." msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" "Nahastu hizki maiuskulak eta minuskulak eta erabili zenbaki bat edo bi." @@ -6511,32 +6580,33 @@ msgstr "Errore ezezaguna" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +#| msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Zure kontuaren hornitzailearen web helbidearekin bat etorri behar du." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Huts egin du kontua gehitzean" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Pasahitzak ez datoz bat." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Huts egin du kontua erregistratzean" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Ez dago modurik onartuta domeinu honekin autentifikatzeko" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Huts egin du domeinuarekin elkartzean" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6544,7 +6614,7 @@ "Saioaren hasierako izenak ez du funtzionatzen.\n" "Saiatu berriro." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6552,14 +6622,24 @@ "Saioaren hasierako pasahitzak ez du funtzionatzen.\n" "Saiatu berriro." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Huts egin du domeinuan saioa hastean" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Ezin da domeinua bilatu. Ongi idatzi duzu?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Arrunta" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administratzailea" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6579,15 +6659,15 @@ msgid "Enabled" msgstr "Gaituta" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Ezabatu erregistratutako hatz-markak?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Ezabatu hatz-markak" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6595,15 +6675,15 @@ "Erregistratutako zure hatz-markak ezabatze nahi duzu, hatz-marken bidezko " "saio-hasiera desgaituz?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Eginda!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Ezin izan da '%s' gailua atzitu" @@ -6611,16 +6691,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Ezin izan da hatz-marken kaptura abiarazi '%s' gailuan" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Ezin izan da inolako hatz-marken irakurgailua atzitu" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "" "Jar zaitez sistemako administratzailearekin harremanetan laguntza " @@ -6631,7 +6711,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6640,11 +6720,11 @@ "Hatz-markarekin saioa-hastea gaitzeko zure hatz-markak gorde behar dituzu " "aurrenik, '%s' gailua erabiliz." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Hatzaren hautapena" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Hatz-markak erregistratzen" @@ -6698,14 +6778,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Saioa amaituta" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Saioa hasita" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Kontuaren jarduera" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Aukeratu beste pasahitz bat." @@ -6767,7 +6854,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Ezin izan da %s domeinuarekin konektatu: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Beste kontuak" @@ -6848,15 +6935,15 @@ msgid "Logged in" msgstr "Saioan sartuta" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Huts egin du kontuaren zerbitzuarekin kontaktatzean" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Ziurtatu zaitez kontuen zerbitzua instalatuta eta gaituta dagoela." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6864,12 +6951,12 @@ "Aldaketak egiteko\n" "aurrenik egin klik * ikonoan" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Sortu erabiltzailearen kontua" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6877,12 +6964,12 @@ "Erabiltzailearen kontu bat sortzeko\n" "aurrenik egin klik * ikonoan" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Ezabatu hautatutako erabiltzailearen kontua" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6890,33 +6977,36 @@ "Hautatutako erabiltzailearen kontua ezabatzeko\n" "aurrenik egin klik * ikonoan" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Nire kontua" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "'%s' erabiltzaile-izeneko erabiltzaile bat badago lehendik ere." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Erabiltzaile-izen hori ez dago erabilgarri. Saiatu bestelako batekin." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Erabiltzaile-izena luzeegia da." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Erabiltzaile-izena ezin da '-' karakterearekin hasi." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 +#| msgid "" +#| "The username should only consist of lower and upper case letters from a-" +#| "z, digits and any of characters '.', '-' and '_'." msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Erabiltzaile-izenak soilik honakoak eduki ditzake: alfabetoko a-z arteko " -"hizkiak, digituak eta '.', '-' eta '_' karaktereetako edozer." +"hizki maiuskulak eta minuskulak, digituak eta '.', '-' eta '_' karaktereetako" +" edozer." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Zure karpeta nagusia izendatzeko erabiliko da, eta ezin da aldatu." @@ -6933,8 +7023,8 @@ "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." msgstr "" -"Lasterbide bat editatzeko: aukeratu 'Bidali tekla sakatzea' ekintza, sakatu " -"teklatuaren lasterbidearen botoia eta eduki sakatuta tekla berriak edo " +"Laster-tekla bat editatzeko: aukeratu 'Bidali tekla sakatzea' ekintza, sakatu " +"teklatuaren laster-teklaren botoia eta eduki sakatuta tekla berriak edo " "sakatu Atzera-tekla garbitzeko." #: ../panels/wacom/calibrator/calibrator-gui.c:83 @@ -7006,19 +7096,20 @@ msgid "Button" msgstr "Botoia" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#| msgid "Wacom Tablet" +msgid "Wa­com Tab­let" msgstr "Wacom taula" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Ezarri botoi-mapatzea eta doitu arkatzaren sentikortasuna taula " "grafikoentzako" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Taula;Wacom;Estiloa;Borragoma;Sagua;" @@ -7050,6 +7141,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth ezarpenak" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom taula" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapatu monitorera..." @@ -7143,29 +7238,29 @@ msgid "Mode Switch #%d" msgstr "%d. modu aldaketa" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "%d. ezkerreko botoia" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "%d. eskuineko botoia" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "%d. goiko botoia" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "%d. beheko botoia" #: ../panels/wacom/gsd-wacom-key-shortcut-button.c:263 msgid "New shortcut…" -msgstr "Lasterbide berria..." +msgstr "Laster-tekla berria..." #: ../panels/wacom/wacom-stylus-page.ui.h:1 msgid "No Action" @@ -7235,6 +7330,11 @@ msgid "Tip Pressure Feel" msgstr "Puntaren presioaren sentikortasuna" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Ezarpen guztiak" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOMEren kontrol-zentroa" @@ -7291,22 +7391,18 @@ msgid "Quit" msgstr "Irten" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Ezarpen guztiak" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Pertsonala" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardwarea" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7316,19 +7412,16 @@ msgstr "Hobespenak;Ezarpenak;" #: ../shell/help-overlay.ui.h:1 -#| msgid "General" msgctxt "shortcut window" msgid "General" msgstr "Orokorra" #: ../shell/help-overlay.ui.h:2 -#| msgid "Quit" msgctxt "shortcut window" msgid "Quit" msgstr "Irten" #: ../shell/help-overlay.ui.h:3 -#| msgid "Search" msgctxt "shortcut window" msgid "Search" msgstr "Bilatu" @@ -7339,18 +7432,197 @@ msgstr "Panelak" #: ../shell/help-overlay.ui.h:5 -#| msgid "Show the overview" msgctxt "shortcut window" msgid "Go back to the overview" msgstr "Itzuli ikuspegi orokorrera" #: ../shell/help-overlay.ui.h:6 -#| msgctxt "print job" -#| msgid "Canceled" msgctxt "shortcut window" msgid "Cancel search" msgstr "Utzi bilaketa" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +#| msgid "_Stop Hotspot" +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Wifigunea" + +#~ msgid "Color" +#~ msgstr "Kolorea" + +#~ msgid "_Name:" +#~ msgstr "I_zena:" + +#~ msgid "Add Shortcut" +#~ msgstr "Gehitu lasterbidea" + +#~ msgid "Remove Shortcut" +#~ msgstr "Kendu lasterbidea" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Lasterbide bat editatzeko, egin klik dagokion errenkadan eta eduki " +#~ "sakatuta tekla berriak edo sakatu Atzera-tekla garbitzeko." + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "\"%s\" lasterbidea ezin da erabili: erabilkaitza izango delako tekla hau " +#~ "erabiltzean.\n" +#~ "Saiatu Kontrol, Alt edo Maius bezalako tekla batekin aldi berean." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "\"%s\" lasterbidea erabilita dago honetarako:\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Lasterbidea \"%s\"(r)i berriro esleitzen badiozu, \"%s\" lasterbidea " +#~ "desgaitu egingo da." + +#~ msgid "_Reassign" +#~ msgstr "_Esleitu berriz" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "'%s' lasterbideak esleitutako '%s' laster-tekla du. Nahi duzu " +#~ "automatikoki '%s'(e)ra ezartzea?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Unean '%s' '%s'(r)i esleituta dago, lasterbidea desgaitu egingo da " +#~ "aurrera jarraitzen baduzu." + +#~ msgid "_Assign" +#~ msgstr "_Esleitu" + +#~ msgid "Bond" +#~ msgstr "Esleitu" + +#~ msgid "Team" +#~ msgstr "Taldea" + +#~ msgid "Bridge" +#~ msgstr "Zubia" + +#~ msgid "VLAN" +#~ msgstr "VLAN-a" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Ezin izan dira VPN pluginak kargatu" + +#~ msgid "Add Network Connection" +#~ msgstr "Gehitu sareko konexioa" + +#~ msgid "Bond slaves" +#~ msgstr "Esleitu morroiak" + +#~ msgid "(none)" +#~ msgstr "(bat ere ez)" + +#~ msgid "Bridge slaves" +#~ msgstr "Zubi morroiak" + +#~ msgid "Team slaves" +#~ msgstr "Taldearen morroiak" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand gailuak ez du onartzen konektatutako modua" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Ez da Ziurtagiri-Emailearen ziurtagirik aukeratu" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Ziurtagiri-Emailearen (CA) ziurtagiria ez erabiltzeak konexio ez-seguru " +#~ "bat izatea eragin dezake, batiz bat haririk gabeko sare gaizkilea. Nahi " +#~ "duzu Ziurtagiri-Emailearen ziurtagiria aukeratu?" + +#~ msgid "Ignore" +#~ msgstr "Ez ikusi egin" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Aukeratu ZE ziurtagiria" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Eskatu pasahitz hau aldiro" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Ez abisatu berriro" + +#~ msgid "No" +#~ msgstr "Ez" + +#~ msgid "Yes" +#~ msgstr "Bai" + +#~ msgid "Error logging into the account" +#~ msgstr "Errorea kontuan saioa hastean" + +#~ msgid "Credentials have expired." +#~ msgstr "Kredentzialak iraungita daude." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Sinatu kontu hau gaitzeko." + +#~ msgid "_Sign In" +#~ msgstr "_Sinatu" + +#~ msgid "Power" +#~ msgstr "Energia" + +#~ msgid "Privacy" +#~ msgstr "Pribatutasuna" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Bestelakoa" + +#~ msgid "Personal File Sharing" +#~ msgstr "Fitxategi pertsonalak partekatzea" + +#~| msgid "Allow Remote Control" +#~ msgid "_Allow Remote Control" +#~ msgstr "_Baimendu urruneko kontrola" + +#~ msgid "_Verify" +#~ msgstr "_Egiaztatu" + +#~ msgid "Login History" +#~ msgstr "Saio-hasieraren _historia" + +#~ msgid "Add User Account" +#~ msgstr "Gehitu erabiltzailearen kontua" + +#~ msgid "Remove User Account" +#~ msgstr "Kendu erabiltzailearen kontua" + +#~ msgid "Login Options" +#~ msgstr "Saioa hasteko aukerak" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "'%s' erabiltzaile-izeneko erabiltzaile bat badago lehendik ere." + #~ msgid "Done" #~ msgstr "Eginda" @@ -7423,9 +7695,6 @@ #~ msgid "Fast" #~ msgstr "Azkarra" -#~ msgid "Two _finger scroll" -#~ msgstr "Bi _hatzeko korritzea" - #~ msgid "No printers available" #~ msgstr "Ez dago inprimagailurik eskuragarri" @@ -8085,9 +8354,6 @@ #~ msgid "The current password is not correct" #~ msgstr "Uneko pasahitza ez da zuzena" -#~ msgid "Wrong password" -#~ msgstr "Okerreko pasahitza" - #~ msgid "Switch Modes" #~ msgstr "Aldatu moduak" @@ -8447,9 +8713,6 @@ #~ msgid "C_reate..." #~ msgstr "Sortu..." -#~ msgid "_Configure..." -#~ msgstr "_Konfiguratu..." - #, fuzzy #~| msgid "Disconnected" #~ msgid "_Disconnect" @@ -8619,9 +8882,6 @@ #~ msgid "Acti_on:" #~ msgstr "_Ekintza:" -#~ msgid "Shortcut" -#~ msgstr "Lasterbidea" - #~ msgid "A_cceleration:" #~ msgstr "_Azelerazioa:" @@ -9070,9 +9330,6 @@ #~ msgid "The type of accelerator." #~ msgstr "Bizkortzaile-mota." -#~ msgid "Error saving the new shortcut" -#~ msgstr "Errorea lasterbide berria gordetzean" - #~ msgid "Too many custom shortcuts" #~ msgstr "Lasterbide pertsonalizatu gehiegi" diff -Nru gnome-control-center-3.20.2/po/fa.po gnome-control-center-3.22.1/po/fa.po --- gnome-control-center-3.20.2/po/fa.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/fa.po 2016-09-27 12:37:36.000000000 +0000 @@ -15,17 +15,17 @@ "Project-Id-Version: gnome-control-center HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-08 14:29+0000\n" -"PO-Revision-Date: 2016-04-09 11:46+0430\n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-13 18:02+0430\n" "Last-Translator: Arash Mousavi \n" "Language-Team: Persian <>\n" -"Language: fa_IR\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.9\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -97,7 +97,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "منزل" @@ -112,24 +112,23 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 ../panels/network/network-wifi.ui.h:1 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 ../panels/region/format-chooser.ui.h:3 +#: ../panels/privacy/cc-privacy-panel.c:1048 ../panels/region/format-chooser.ui.h:3 #: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -160,16 +159,17 @@ msgid "Current background" msgstr "تصویر پس‌زمینه کنونی" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "پس‌زمینه" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "تصویر پس‌زمینه‌ی خود را به یک کاغذ دیواری یا عکس تغییر دهید" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "پس‌زمینه;صفحه‌نمایش;رومیزی;" @@ -209,18 +209,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "برای فعال‌سازی بلوتوث حالت هواپیمایی را خاموش کنید." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "بلوتوث" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "بلوتوث را خاموش و روشن کنید و به دستگاه‌های خود متصل شوید" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;اشتراک;اشتراک‌گذاری;بلوتوث;" @@ -387,7 +386,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "همه‌ی پرونده‌ها" @@ -427,7 +426,7 @@ msgstr "ذخیره مجموعه‌تنظیمات" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_ذخیره" @@ -680,7 +679,7 @@ "ویندوز مفید باشند." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "خلاصه" @@ -692,11 +691,11 @@ msgid "_Import File…" msgstr "واردکردن _پرونده…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "ا_ضافه کردن" @@ -844,17 +843,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "رنگ" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "دستگاه‌های خود را، نظیر صفحه‌نمایش‌ها، دوربین‌ها و یا چاپگرها را درجه‌بندی رنگ کنید" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "رنگ;ICC;مجموعه تنظیمات;درجه‌بندی;چاپگر;نمایشگر;" @@ -871,23 +871,23 @@ msgid "No languages found" msgstr "هیچ زبانی پیدا نشد" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "امروز" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "دیروز" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b %Oe" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%b %Oe، %OY" @@ -1007,8 +1007,9 @@ msgid "December" msgstr "دسامبر" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "تاریخ و زمان" @@ -1065,12 +1066,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "تغییر ساعت و تاریخ، شامل منطقه زمانی" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "سایت;منطقه‌ی زمانی;مکان;" @@ -1082,208 +1083,223 @@ msgid "To change time or date settings, you need to authenticate." msgstr "برای تغییر تنظیمات تاریخ و ساعت، احتیاج به تصدیق هویت دارید." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "در بسته شد" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "آیینه‌ای" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "اصلی" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "خاموش" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "ثانویه" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "چینش نمایشگرهای تلفیق شده" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_اِعمال" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "نمایشگرها را بکشید تا چینش آنها را تغییر دهید" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%Id Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%Id هرتز" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "چرخش پادساعتگرد °۹۰" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "چرخش °۱۸۰" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "چرخش ساعتگرد °۹۰" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "اندازه" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "نسبت طول به عرض" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "تفکیک‌پذیری" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "تنظیم برای تلویزیون" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "آهنگ نوسازی:" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "نمایش نوار بالایی و نمای‌کلی فعالیت‌ها در این نمایشگر" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "نمایشگر ثانویه" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "ادغام این نمایشگر با دیگری جهت ساخت " -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "ارائه" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "فقط نمایش اسلایدها و رسانه" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "آینه" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "نمایش نمای موجود در هر دو نمایشگر" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "خاموش کردن" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "از این نمایشگر استفاده نکن" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "نمی‌توان اطلاعات صفحه‌نمایش را دریافت کرد" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_چینش نمایشگرهای تلفیق شده" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "نمایشگرها" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "نحوه استفاده از نمایشگرها و پروژکتورهای متصل شده را انتخاب کنید" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "تابلو;پروژکتور;xrandr;نمایشگر;تفکیک‌پذیری;نوسازی;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "ناشناخته" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (شناسه ساخت: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (شناسه ساخت: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %Id بیت" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%Id بیت" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "بپرس چه باید کرد" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "کاری نکن" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "پوشه‌ را باز کن" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "رسانه‌های دیگر" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "یک برنامه‌ برای پخش سی‌دی‌های صوتی انتخاب کن" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "یک برنامه‌ برای پخش دی‌وی‌دی‌های ویدیویی انتخاب کن" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "یک برنامه برای اجرا جهت زمانی که یک پخش‌کننده موسیقی متصل می‌شود، انتخاب کنید" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "یک برنامه برای اجرا جهت زمانی که یک دوربین متصل می‌شود، انتخاب کنید" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "یک برنامه‌ برای سی‌دی‌های نرم‌افزار انتخاب کن" @@ -1292,87 +1308,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "دی‌وی‌دی صوتی" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "دیسک بلو-ری خالی" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "دیسک سی‌دی خالی" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "دیسک دی‌وی‌دی خالی" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "دیسک دی‌وی‌دی اچ‌دی خالی" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "دیسک ویدئویی بلو-ری خالی" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "کتاب الکترونیکی خوان" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "دیسک ویدئویی دی‌وی‌دی اچ‌دی" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "سی‌دی تصویر" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "سی‌دی ویدئویی برتر" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "سی‌دی ویدیویی" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "نرم‌افزار ویندوز" -#: ../panels/info/cc-info-panel.c:1435 ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "بخش" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "مرور کلی" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "برنامه‌های پیش‌فرض" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "رسانه‌های جدا شدنی" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "نسخه %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "جزئیات" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "نمایش اطلاعات مربوط به سیستم شما" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;preferred;" "cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1546,8 +1561,9 @@ msgid "Launch help browser" msgstr "راه‌اندازی مرورگر راهنما" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "تنظیمات" @@ -1620,7 +1636,6 @@ msgstr "قفل‌کردن صفحه‌نمایش" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "دسترسی همگانی" @@ -1656,12 +1671,22 @@ msgid "High contrast on or off" msgstr "روشن یا خاموش کردن سایه روشن" +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "میان‌برهای سفارشی" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 -#: ../panels/network/network-wifi.ui.h:31 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" @@ -1687,125 +1712,132 @@ msgid "Modifiers-only switch to next source" msgstr "کلید Modifiers-only تعویض به منبع بعدی" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "صفحه‌کلید" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "تنظیم مجدد میان‌بر به مقدار پیش‌فرض" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be disabled" +msgstr "" +"مورد %s از قبل برای %s در حال استفاده بوده است. اگر آن را جایگزین کنید، " +"%s غیرفعال خواهد شد" + +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "تنظیم میان‌بر سفارشی" + +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "تنظیم میان‌بر" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "وارد کردن یک میان‌بر جدید برای تغییر %s." + +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "اضافه کردن میان‌بر سفارشی" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "صفحه‌کلید" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "نمایش و تغییر میانبرهای صفحه‌کلید و تنظیم ترجیحات تایپ" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "میان‌بر;تکرار;چشمک;" -# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "میان‌بر سفارشی" +msgid "No keyboard shortcut found" +msgstr "هیچ میان‌بر صفحه‌کلیدی پیدا نشد" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_نام:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "_فرمان:" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "یک جست‌وجو دیگر را امتحان کنید" -# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "اضافه‌کردن میان‌بر" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "برای لغو ESC را فشار دهید." -# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "حذف میان‌بر" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "نام" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press Backspace " -"to clear." -msgstr "" -"برای ویرایش یک کلید میان‌بر، روی ردیف مربوط به آن کلیک کرده و یک ترکیب جدید تایپ " -"کنید، و یا برای پاک‌کردن پس‌بر را فشار دهید." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "فرمان" # ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "میان‌برهای سفارشی" - -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<کنش ناشناخته>" - -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"استفاده از میانبر «%s» به این دلیل که امکان تایپ به وسیله‌ی این کلید را غیرممکن " -"می کند، امکان‌پذیر نیست.\n" -"لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید." - -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"میان‌بر «%s» قبلاً استفاده شده است برای:\n" -"‏ «%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "میان‌بر" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "ویرایش" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد." +#: ../panels/keyboard/shortcut-editor.ui.h:8 ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "هیچ‌کدام" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_جای‌گذاری مجدد" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "حذف" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "میان‌بر جدید را وارد کنید" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"میان‌بر «%s» یک میان‌بر مرتبط «%s» دارد. آیا مایلید به طور خودکار به «%s» تنظیم " -"شود؟" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "لغو" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled if " -"you move forward." -msgstr "" -"درحال حاضر «%s» به «%s» وابسته است، اگر پیشروی کنید این میان‌بر غیرفعال خواهد شد." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "اضافه کردن" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_جای‌گذاری" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "جای‌گزینی" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "تنظیم" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "آزمایش _تنظیمات شما" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "موشی و صفحه‌لمسی" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "تغییر میزان حساسیت موشی یا صفحه‌لمسی و انتخاب راست دست یا چپ دست بودن" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "صفحه‌جهت‌ده;نشانگر;کلیک;ضربه;دوبار;دکمه;صفحه ردیاب;لغزش;" @@ -1863,6 +1895,10 @@ msgstr "ضربه جهت کلیک" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "لغزش دو-انگشتی" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "لغزش در گوشه‌ها" @@ -1900,11 +1936,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "حالت _هواپیمایی" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "پیشکار شبکه" @@ -1912,17 +1948,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "وی‌پی‌ان %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "اوه، به نظر مشکلی پیش آمده.لطفا با تولید کننده نرم‌افزار خود تماس بگیرید." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "لازم است NetworkManager در حال اجرا باشد." @@ -1938,7 +1974,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1955,56 +1991,61 @@ msgid "page 2" msgstr "صفحه ۲" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "امنیت" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "خودکار" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "مجموعه‌تنظیمات %Id" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "هیچ‌کدام" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "هرگز" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2012,178 +2053,178 @@ msgstr[1] "%Ii روز قبل" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%Id مگابیت/ثانیه" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "هیچ‌کدام" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "ضعیف" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "کافی" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "خوب" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "عالی" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "جزئیات" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "هویت" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "آدرس" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "ماسک شبکه" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "دروازه" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "حذف آدرس" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "اضافه کردن" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "کارگزار" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "حذف کارگزار دی‌ان‌اس" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "متریک" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "حذف مسیر" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "خودکار (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 -#: ../panels/network/network-wifi.ui.h:26 ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 +#: ../panels/network/network-wifi.ui.h:26 ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "دستی" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "فقط Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "پیشوند" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "خودکار" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "خودکار، فقط DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "تنظیم مجدد" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "هیچ‌کدام" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "کلید WEP 40/128 بیت (Hex یا ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "عبارت‌رمز ۱۲۸ بیت WEP" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "‫WEP پویا (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "‫WPA و WPA2 شخصی" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2198,28 +2239,28 @@ msgstr "سرعت پیوند" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 ../panels/network/network-wifi.ui.h:7 -#: ../panels/network/panel-common.c:695 +#: ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "نشانی آی‌پی ن۴" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "نشانی آی‌پی ن۶" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "نشانی سخت‌افزار" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 msgid "Default Route" @@ -2228,7 +2269,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 msgid "DNS" @@ -2310,13 +2351,13 @@ msgid "Firewall _Zone" msgstr "_منطقه دیوارآتشین" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "پیش‌فرض" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "منطقه سطح اعتماد به اتصال را تعیین می‌کند" @@ -2358,45 +2399,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "نمی‌توان ویرایشگر اتصال را باز کرد" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "مجموعه‌تنظیمات جدید" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "وی‌پی‌ان" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "گروه" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "وارد کردن از پرونده..." -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "اضافه کردن اتصال شبکه" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "اضافه کردن وی‌پی‌ان" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2404,7 +2425,7 @@ msgstr "_تنظیم مجدد" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 ../panels/network/network-wifi.ui.h:42 +#: ../panels/network/net-device-wifi.c:1536 ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_فراموش کردن" @@ -2427,11 +2448,11 @@ msgid "S_ecurity" msgstr "_امنیت" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "نمی‌توان اتصال وی‌پی‌ان را وارد کرد" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN connection " @@ -2443,37 +2464,37 @@ "\n" "خطا: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "برای وارد کردن یک پرونده انتخاب کنید" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_بازکردن" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "یک پرونده با نام «%s» از قبل وجود دارد." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_جای‌گزینی" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "آیا می‌خواهید که %s را با اتصال وی‌پی‌ان که درحال ذخیره آن هستید جای‌گزین کنید؟" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "نمی‌توان اتصال وی‌پی‌ان را صادر کرد" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2484,7 +2505,7 @@ "\n" "خطا: %s" -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "صادر کردن اتصال وی‌پی‌ان..." @@ -2511,61 +2532,45 @@ msgid "Make available to _other users" msgstr "در دسترس قراردادن برای کاربران _دیگر" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "شبکه" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "اینکه چطور به اینترنت متصل می‌شوید را کنترل کنید" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" -"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;" -"bridge;bond;DNS;" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;" msgstr "" -"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;" -"bridge;bond;DNS;شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;وی پی " -"ان;دی ان اس;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond slaves" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(هیچ)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge slaves" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;DNS;" +"شبکه;بیسیم;وای فای;آی پی;لن;پروکسی;ون;پهن‌باند;مودم;بلوتوث;وی پی ان;دی ان اس;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "هرگز" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "امروز" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "دیروز" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "آی‌پی" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "آخرین استفاده" @@ -2575,34 +2580,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "سیمی" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 ../panels/network/network-simple.ui.h:8 #: ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "گزینه‌ها..." -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "مجموعه‌تنظیمات %Id" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "اضافه کردن اتصال جدید" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "برده‌های گروه" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up a " "wireless hotspot to share the connection with others." @@ -2610,35 +2606,35 @@ "اگر شما اتصالی به اینترنت غیر از اتصال بی‌سیم دارید، می‌توانید یک hotspot بی‌سیم " "راه‌اندازی کنید و آن را با دیگران به اشتراک بگذارید." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "روشن کردن بی‌سیم شما را از %s قطع خواهد کرد." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" "امکان دسترسی به اینترنت از طریق بی‌سیم، هنگامی که hotspot فعال است، وجود ندارد." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "توقع منبع اصلی و قطع ارتباط با کاربران؟" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_توقف منبع اصلی" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "سیاست‌های سیستم استفاده از Hotspot را منع کرده است" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "دستگاه بی‌سیم از حالت Hotspot پشتیبانی نمی‌کند" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any custom " "configuration will be lost." @@ -2646,11 +2642,11 @@ "جزئیات شبکه برای شبکه‌های انتخاب شده، شامل گذرواژه‌ها و هرگونه پیکربندی سفارشی حذف " "خواهند شد." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "تاریخچه" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 ../panels/wacom/button-mapping.ui.h:2 #: ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2658,7 +2654,7 @@ msgstr "_بستن" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_فراموش کردن" @@ -2693,6 +2689,10 @@ msgid "Provider" msgstr "فراهم‌کننده" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "شبکه" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2799,15 +2799,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_گذرواژه" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "هیچ‌کدام" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "نمایش گ_ذرواژه" @@ -2899,7 +2895,6 @@ msgstr "اتصال به شبکه مخفی..." #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_تاریخچه" @@ -2921,359 +2916,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "گذرواژه" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "زیرساخت" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "وضعیت ناشناس" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "مدیریت نشده" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "موجود نیست" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "درحال اتصال" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "تصدیق هویت شکست خورد" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "متصل شده" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "درحال قطع ارتباط" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "اتصال شکست خورد" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "وضعیت ناشناس (ناپیدا)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "متصل نشده" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "پیکربندی شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "پیکربندی IP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "پیکربندی IP منقضی شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "رمزها لازم بودند، اما فراهم نشدند" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "درخواست کننده 802.1x قطع شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "تنظیمات پیکربندی درخواست کننده 802.1x شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "درخواست کننده 802.1x شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "تصدیق‌هویت دروخواست کننده 802.1x مدت زیادی طول کشید" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "شروع کارگزار PPP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "سرویس PPP قطع شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "شروع کردن کارگیر DHCP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "خطا کارگیر DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "کارگیر DHCP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "شروع کردن سرویس اتصالِ اشتراک گذاشته شده شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "سرویس اتصال به‌اشتراک گذاشته شده شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "شروع سرویس AutoIP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "خطا سرویس AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "سرویس AutoIP شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "خطِ مشغول" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "بوق شماره‌گیری وجود ندارد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "اتصال به هیچ فراهم‌کننده‌ای امکان‌پذیر نبود" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "مهلت درخواست شماره‌گیری تمام شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "تلاش برای شماره‌گیری شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "مقداردهی اولیه مودم شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "انتخاب APN مشخص شده شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "درحال جست‌وجو برای شبکه‌ها نیست" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "ثبت شبکه رد شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "مهلت ثبت شبکه تمام شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "ثبت از طریق شبکه درخواست شده شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "بررسی پین شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "ممکن است میان‌افزار مربوط به دستگاه موجود نباشد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "اتصال محو شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "اتصال فعلی استفاده شد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "مودم پیدا نشد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "اتصال بلوتوث شکست خورد" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "کارت SIM وارد نشده است" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "کد پین SIM لازم است" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "کد پاک SIM لازم است" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM نادرست" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "دستگاه InfiniBand از حالت متصل شده پشتیبانی نمی‌کند" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "نیازمندی‌های اتصال شکست خورد" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "میان‌افزار موجود نیست" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "کابل قطع شد" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "هیچ گواهینامه‌ای برای مرجع گواهینامه انتخاب نشد" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "خطا تعریف نشده در 802.1x (‫wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "هیچ پرونده‌ای انتخاب نشد" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections to " -"insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"استفاده نکردن از گواهینامه‌ی مرجع گواهینامه (CA) می‌تواند باعث اتصال به یک شبکه‌ی " -"وای‌فای خطرناک و ناامن شود. آیا مایلید یک گواهینامه‌ی مرجع گواهینامه انتخاب کنید؟" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "نادیده گرفتن" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "انتخاب گواهینامه CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "کلیدهای خصوصی DER، PEM یا PKCS#12 شامل ‪(*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "خطا مشخص نشده در تایید اعتبار پرونده eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "کلیدهای خصوصی DER، PEM یا PKCS#12 شامل (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "گواهینامه‌های DER یا PEM شامل ‪(*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "پرونده EAP-FAST PAC فراهم نشده" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "یک پرونده PAC انتخاب کنید" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "پرونده‌های PAC شامل ‪(*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_پرونده PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "تایید هویت _داخلی" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_تامین PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3282,41 +3254,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "ناشناس" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "تایید هویت شده" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "هردو" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_پرونده PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "تایید هویت _داخلی" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "اجازه دادن برای آ_ماده‌سازی خودکار PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "نام‌کاربری EAP-LEAP فراهم نشده" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "گذرواژه EAP-LEAP فراهم نشده" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "نا_م کاربری" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_نمایش گذرواژه" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "گواهینامه EAP-PEAP CA نامعتبر است: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "گواهینامه EAP-PEAP CA نامعتبر است: هیچ گواهینامه‌ای مشخص نشده" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "یک گواهینامه‌ی مرجع گواهینامه (CA) انتخاب کنید" @@ -3334,19 +3338,57 @@ msgid "C_A certificate" msgstr "گواهینامه C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "به گواهینامه CA _نیازی نیست" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_نسخه PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "این گذرواژه را هربار _بپرس" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "نام‌کاربری EAP فراهم نشده" + +# ../capplets/common/gconf-property-editor.:c:183 +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "گذرواژه EAP وارد نشده" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "شناسه EAP-TLS فراهم نشده" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "گواهینامه EAP-TLS CA نامعتبر است: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "گواهینامه EAP-TLS CA نامعتبر است: هیچ گواهینامه‌ای فراهم نشده" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "گذرواژه EAP-TLS نامعتبر است: فراهم نشده" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "کلید خصوصی EAP-TLS نامعتبر است: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "گواهینامه کاربر EAP-TLS نامعتبر است: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "کلیدهای خصوصی رمزنگاری نشده ناامن هستند" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. This " "could allow your security credentials to be compromised. Please select a " @@ -3360,11 +3402,11 @@ "\n" "(شما می‌توانید به‌وسیله‌ی openssl برروی کلید خود گذرواژه بگذارید)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "گواهینامه شخصی خود را انتخاب کنید" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "کلید خصوصی خود را انتخاب کنید" @@ -3376,51 +3418,56 @@ msgid "_User certificate" msgstr "گواهینامه‌ی _کاربر" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_کلید خصوصی" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "گذرواژه کلید _خصوصی" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "گواهینامه EAP-TTLS CA نامعتبر است: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "گواهینامه EAP-TTLS CA نامعتبر است: هیچ گواهینامه‌ای فراهم نشده" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "دوباره به من _هشدار نده" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "خیر" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "بله" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "خطا ناشناس در تایید اعتبار 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "‫TLS تونل شده" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "‫EAP محافظت شده (PEAP)" @@ -3430,6 +3477,48 @@ msgid "Au_thentication" msgstr "تایید_هویت" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "گزینه leap-username فراهم نشده است" + +# ../capplets/common/gconf-property-editor.:c:183 +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "گذرواژه leap وارد نشده" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "گزینه wep-key فراهم نشده است" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "گزینه wep-key نامعتبر است: کلیدی با طول %zu تنها باید شامل hex-digit باشد" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"گزینه hex-digits نامعتبر است: کلیدی با طول %zu باید شامل نویسه‌های ascii باشد" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"گزینه wep-key نامعتبر: طول کلید نامعتبر %zu. یک کلید یا باید طول 5/13 (ascii) یا " +"10/26 (hex) داشته باشد." + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "گزینه wep-key نامعتبر: عبارت‌رمز نباید خالی باشد" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "گزینه wep-key نامعتبر: عبارت‌رمز باید کمتر از ۶۴ نویسه باشد" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "۱ (پیش‌فرض)" @@ -3466,19 +3555,31 @@ msgid "WEP inde_x" msgstr "_فهرست WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex digits" +msgstr "" +"گزینه wpa-psk نامعتبر: طول کلید نامعتبر %zu.باید یا [8,63] باید یا ۶۴ رقم hex " +"باشد" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "گزینه wpa-psk نامعتبر است: نمی‌توان کلید ۶۴ بایتی را به عنوان hex تفسیر کرد" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_نوع" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "روشن" @@ -3515,16 +3616,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "نمایش م_حتویات پیام در صفحه‌ی قفل" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "اعلان‌ها" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "کنترل کنید که چه اعلان‌هایی نمایش داده می‌شوند و چه چیزی نمایش می‌دهند" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifications;Banner;Message;Tray;Popup;اعلانها;بنر;پیام;سینی;واشو;" @@ -3542,79 +3644,68 @@ msgid "Applications" msgstr "برنامه‌ها" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "موارد دیگر" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "اضافه کردن حساب" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "پست‌الکترونیکی" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "تقویم" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "آشناها" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "گپ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "منابع" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "خطا در هنگاک ورود به حساب" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "اعتبارنامه‌ها منقضی شده‌اند." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "وارد شوید تا این حساب فعال شود." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_ورود به سیستم" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "خطا در ایجاد حساب" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "خطا در هنگام حذف کردن حساب" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "آیا مطمئنید که می‌خواهید حساب را حذف کنید؟" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "این کار حساب را بر روی کارگزار پاک نخواهد کرد." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_حذف" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "حساب‌های برخط" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "به حساب‌های برخط خود متصل شوید و تصمیم بگیرد چه استفاده‌ای از آنها بکنید" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3627,6 +3718,7 @@ msgstr "هیچ حساب برخطی پیکربندی نشده است" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "حذف حساب" @@ -3769,7 +3861,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "باتری" @@ -3817,102 +3909,103 @@ msgid "When _idle" msgstr "هنگام _بیکاری" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "صرفه‌جویی انرژی" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "روشنایی _صفحه‌نمایش" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "روشنایی خودکار" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "روشنایی _صفحه‌کلید" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_تیره کردن صفحه‌نمایش زمان بیکاری" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "صفحه _خالی" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_وای-فای" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "برای ذخیره انرژی وای-فای را خاموش کنید." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "پهن‌باند _موبایل" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "جهت ذخیره انرژی دستگاه‌های پهن‌باند همراه (3G، 4G، WiMax و...) را خاموش کنید." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_بلوتوث" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "هنگامی که روی انرژی باتری است" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "زمان اتصال به برق" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "تعلیق" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "خواب زمستانی" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "هیچکدام" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "تعلیق و دکمه روشن" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_تعلیق خودکار" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "تعلیق خودکار" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_زمانی که کلید خاموش/روشن فشرده شد" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "‌دستگاه‌ها" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "انرژی" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "وضعیت باتری خود را ببینید و تنظیمات صرفه‌جویی در انرژی را تغییر دهید" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -3991,11 +4084,6 @@ msgid "Delay" msgstr "وقفه" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "لغو" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "تایید هویت" @@ -4005,138 +4093,138 @@ msgstr "تصدیق هویت لازم است" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "جوهر کم است" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "عدم وجود تونر" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "کمبود در سازنده" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "عدم وجود سازنده" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "کمبود ذخیره محفظه رنگ" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "عدم وجود ذخیره محفظه رنگ" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "بازکردن پوشش" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "در را باز کن" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "کمبود کاغذ" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "عدم وجود کاغذ" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "برون‌خط" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "توقف کرده" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "محفظه مواد زائد تقریبا پُر است" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "محفظه مواد زائد پُر است" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "راهنمایِ نوریِ تصویر، نزدیک به اتمام است" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "راهنمای نوری تصویر، دیگر عملکردی ندارد" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "درحال پیکربندی" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "آماده" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "کاری قبول نمی‌کند" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "در حال پردازش" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "سطح تونر" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "سطح جوهر" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "سطح ذخیره" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "درحال نصب" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4144,63 +4232,60 @@ msgstr[1] "%Iu کار فعال" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "اضافه‌کردن چاپگر جدید شکست خورد." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "انتخاب پرونده‌ی PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" msgstr "پرونده‌های تفسیری پست‌اسکریپت (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "هیچ راه‌انداز مناسبی پیدا نشد" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "جست‌وجو برای راه‌اندازهای ترجیح داده..." -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "انتخاب از بانک اطلاعاتی..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "فراهم کردن پرونده PPD..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "صفحه‌ی آزمایشی" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "هیچ چاپگری موجود نیست" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "ناتوان در باز کردن واسط کاربری: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "چاپ‌گرها" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "چاپگرها" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "چاپگر اضافه کنید، کارهای چاپگر را ببینید و تصمیم بگیرید که چگونه می‌خواهید چاپ " "کنید" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "چاپگر;صف;چاپ;کاغذ;جوهر;Toner;" @@ -4362,6 +4447,11 @@ msgid "Parallel Port" msgstr "درگاه موازی" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "بلوتوث" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4572,13 +4662,17 @@ msgid "_Options" msgstr "_گزینه‌ها" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "هیچ چاپگری موجود نیست" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "اضافه‌کردن یک چاپگر" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4586,70 +4680,70 @@ "متاسفم! سرویس چاپگر سیستم\n" "به نظر در دسترس نیست." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "صفحه‌قفل" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "در حال استفاده" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "روشن" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "خاموش" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "خدمات مکان‌یابی" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "استفاده و تاریخچه" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "حذف تمام موارد از زباله‌دان؟" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "تمام موارد موجود در زباله‌دان برای همیشه پاک می‌شوند." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_خالی کردن زباله‌دان" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "حذف تمام پرونده‌های موقت؟" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "تمام پرونده‌های موقت برای همیشه حذف خواهند شد." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_پاکسازی پرونده‌های موقت" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "پاکسازی زباله‌دان و پرونده‌های موقت" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "طریقه استفاده نرم‌افزار" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "گزارش اشکال" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4658,21 +4752,22 @@ "ارسال گزارش‌های مربوط به اشکالات تکنیکی %s به ما جهت گسترشش کمک می‌کند. گزارش‌ها به " "صورت ناشناس اراسل می‌شود و آری از اطلاعات شخصی است." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "حریم‌خصوصی" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "حریم‌خصوصی" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "از اطلاعات شخصی خود محافظت کنید و چیزهایی که دیگران ممکن است ببیند را کنترل کنید" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;" "identity;" @@ -4842,21 +4937,21 @@ msgid "Other" msgstr "موارد دیگر" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "لازم است نشست شما مجددا راه‌اندازی شود تا تغییرات اعمال شوند" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "اکنون راه‌اندازی مجدد کن" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "هیچ منبع ورودی‌ای انتخاب نشد" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_صفحه ورود به سیستم" @@ -4888,16 +4983,17 @@ msgid "Paper" msgstr "کاغذ" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "ناحیه و زبان" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "Select your display language, formats, keyboard layouts and input sources" msgstr "زبان نمایش، قالب‌ها، چیدمان صفحه‌کلید و منابع ورودی خود را انتخاب کنید" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "زبان;چیدمان;صفحه‌کلید؛ورودی;Language;Layout;Keyboard;Input;" @@ -4954,7 +5050,7 @@ msgstr "چپ+دگرساز راست" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_زبان" @@ -4998,30 +5094,15 @@ msgid "Show input source keyboard layout" msgstr "نمایش چیدمان صفحه‌کلید منبع ورودی" -#: ../panels/region/region.ui.h:13 -msgid "Login settings are used by all users when logging into the system" -msgstr "تنظیمات ورود به سیستم توسط تمام کاربران هنگام ورود استفاده می‌شود" - -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "محل‌ها" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "نشانک‌ها" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "موارد دیگر" +#: ../panels/region/region.ui.h:13 +msgid "Login settings are used by all users when logging into the system" +msgstr "تنظیمات ورود به سیستم توسط تمام کاربران هنگام ورود استفاده می‌شود" -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "انتخاب مکان" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_تایید" @@ -5029,18 +5110,19 @@ msgid "No applications found" msgstr "هیچ برنامه‌ای پیدا نشد" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "جستجو" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "Control which applications show search results in the Activities Overview" msgstr "" "اینکه کدام برنامه‌ها در نتایج جستجو نمای‌کلی فعالیت‌ها نمایش داده می‌شوند را کنترل " "کنید" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Search;Find;Index;Hide;Privacy;Results;جستجو;پیدا;فهرست;مخفی;حریم خصوصی;نتایج;" @@ -5049,6 +5131,18 @@ msgid "Search Locations" msgstr "مکان‌های جست‌وجو" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "مکان‌ها" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "نشانک‌ها" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "موارد دیگر" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "جابه‌جایی به بالا" @@ -5061,6 +5155,11 @@ msgid "Preferences" msgstr "ترجیحات" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "هیچ شبکه‌ای برای اشتراک‌گذاری انتخاب نشده" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5098,36 +5197,42 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure Shell " +"command:\n" "ssh %s" msgstr "" -"به کاربران دوردست اجازه بده تا با استفاده از فرمان پوسته‌ی امن متصل شوند:\n" +"هنگام فعال بودن ورود از دوردست، به کاربران دوردست اجازه می‌دهد تا با استفاده از " +"فرمان پوسته‌ی امن متصل شوند:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by connecting " +"to vnc://%s" msgstr "" -"به کاربران دوردست اجازه بده تا صفحه‌نمایش شما را با اتصال به‌وسیله‌ی vnc://%s کنترل کنند" +"اشتراک‌گذاری صفحه به کاربران دوردست اجازه می‌دهد تا صفحه‌نمایش شما را با اتصال از " +"طریق vnc://%s کنترل کنند" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "رونوشت" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "اشتراک‌گذاری" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "اشتراک‌گذاری" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "اینکه چه چیزهایی را می‌خواهید با دیگران به‌اشتراک بگذارید را انتخاب کنید" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5135,6 +5240,10 @@ "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "شبکه‌ها" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "فعال یا غیرفعال کردن ورود به سیستم دوردست" @@ -5143,25 +5252,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "جهت فعال یا غیرفعال کردن ورود به سیستم دوردست، تصدیق‌هویت لازم است" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "هیچ شبکه‌ای برای اشتراک‌گذاری انتخاب نشده" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "شبکه‌ها" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "نام _رایانه" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "به‌اشتراک‌گذاری پرونده _شخصی" +msgid "_File Sharing" +msgstr "اشتراک‌گذاری _پرونده" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5180,8 +5277,8 @@ msgstr "تعدادی از سرویس‌ها به‌دلیل در دسترس نبودن شبکه، غیرفعال شده‌اند." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "به‌اشتراک‌گذاری پرونده شخصی" +msgid "File Sharing" +msgstr "اشتراک‌گذاری پرونده" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5196,8 +5293,8 @@ msgstr "اشتراک‌گذاری صفحه‌نمایش" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "اجازه دادن برای _کنترل دوردست" +msgid "_Allow connections to control the screen" +msgstr "_اجازه دادن به اتصال‌ها برای کنترل صفحه" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5224,11 +5321,8 @@ msgstr "اشتراک‌گذاری رسانه" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"اشتراک‌گذاری رسانه به شما اجازه می‌دهد تا موسیقی، عکس و ویدئو را از طریق شبکه به " -"اشتراک بگذارید." +msgid "Share music, photos and videos over the network." +msgstr "موسیقی، تصویر و ویدئو را از طریق شبکه به اشتراک بگذارید." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5358,11 +5452,6 @@ msgid "Peak detect" msgstr "یافتن اوج" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "نام" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "دستگاه" @@ -5456,16 +5545,21 @@ msgid "Subwoofer" msgstr "ساب ووفر" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "سفارشی" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "دسترسی فراگیر" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "نگاه کردن، شنیدن، تایپ کردن، نشانه رفتن و کلیک کردن را ساده‌تر کنید" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5563,7 +5657,7 @@ msgstr "کلید‌های صوتی" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "هنگامی که قفل اعداد و قفل تبدیل روشن است، بوق بزن." #: ../panels/universal-access/uap.ui.h:26 @@ -5950,95 +6044,67 @@ msgstr "جلوه‌های رنگی" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "اضافه کردن کاربر" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_نام کامل" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "استاندارد" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "مدیر" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_نام کامل" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_نوع حساب" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "اجازه می‌دهد تا کاربران در زمان _ورود بعدی یک گذرواژه انتخاب کنند" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_هم‌اکنون یک گذرواژه تنظیم کنید" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_تایید" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be used on " -"this device." +"this device. You can also use this account to access company resources on the " +"internet." msgstr "" -"ورود به سیستم تجاری اجازه می‌دهد تا یک حساب کاربری مدیریت شده‌ی متمرکز در این " -"دستگاه استفاده شود." +"امکان «ورود به سیستم سازمانی» اجازه می‌دهد تا یک حساب کاربری مدیریت شدهٔ متمرکز در " +"این دستگاه استفاده شود. شما همچنین از این حساب می‌توانید برای دسترسی به منابع " +"شرکت در اینترنت استفاده کنید." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_دامنه" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"برای اضافه کردن حساب‌های ورود\n" -"به سیستم تجاری برخط شوید." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "ورود به سیستم _تجاری" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "اضافه کردن کاربر" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_ثبت" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "ورود مدیر دامنه" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"جهت استفاده از ورود به سیستم تجاری، این رایانه لازم است\n" -"در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n" -"خود را اینجا بنویسند." +msgid "You are Offline" +msgstr "شما برون‌خط هستید" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_نام مدیر" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "برای ایجاد کاربران سازمانی، باید برخط باشید." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "گذرواژه مدیر" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "ورود به سیستم _تجاری" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6073,7 +6139,7 @@ msgstr "انگشت کوچک راست" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "به‌کارانداختن امکان ورود به سیستم از طریق اثرانگشت" @@ -6110,9 +6176,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "نام ورود;نام;اثرانگشت;آواتار;نشان;تصویرصورت;گذرواژه;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "تاریخچه ورود به سیستم" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_ثبت" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "ورود مدیر دامنه" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"جهت استفاده از ورود به سیستم سازمانی، این رایانه لازم است\n" +"در دامنه ثبت شود. لطفا از مدیریت شبکه بخواهید گذرواژه\n" +"خود را اینجا بنویسند." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_نام مدیر" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "گذرواژه مدیر" # ../capplets/common/gconf-property-editor.:c:183 #: ../panels/user-accounts/data/password-dialog.ui.h:1 @@ -6137,38 +6226,30 @@ msgstr "گذرواژه‌ی _فعلی" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "اجازه می‌دهد تا کاربران در زمان ورود بعدی یک گذرواژه انتخاب کنند" +msgid "Allow user to change their password on next login" +msgstr "اجازه می‌دهد تا کاربران در زمان ورود بعدی گذرواژه خود را تغییر دهند" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "هم‌اکنون یک گذرواژه تنظیم کنید" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "اضافه‌کردن حساب کاربر" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "حذف حساب کاربر" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "ا_ضافه کردن کاربر…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "گزینه‌های ورود به سیستم" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "ورود _خودکار" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "ورود به سیستم از طریق اثر _انگشت" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "شمایل کاربر" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "آخرین ورود" @@ -6272,7 +6353,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "حروف بزرگ و کوچک را ادغام کنید و از یک یا چند عدد هم استفاده کنید." #: ../panels/user-accounts/pw-utils.c:119 @@ -6358,32 +6439,32 @@ msgstr "خطای ناشناخته" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ حساب شما یکسان باشد." +msgid "Should match the web address of your login provider." +msgstr "باید با آدرس اینترنتی فراهم‌کننده‌ٔ حساب شما یکسان باشد." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "اضافه کردن حساب شکست خورد" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "گذرواژه‌ها برابر نیستند." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "ثبت حساب شکست خورد" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "هیچ راه پیشتیبانی شده‌ای برای تصدیق‌هویت با این دامنه وجود ندارد" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "پیوستن به دامنه شکست خورد" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6391,7 +6472,7 @@ "نام ورود به سیستم اشتباه بود.\n" "لطفا دوباره تلاش کنید." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6399,14 +6480,24 @@ "گذواژه‌ی ورود به سیستم اشتباه بود.\n" "لطفا دوباره تلاش کنید." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "ورود به دامنه شکست خورد" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "امکان پیدا کردن دامنه نیست. شاید اشتباه نوشته‌اید؟" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "استاندارد" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "مدیر" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6424,15 +6515,15 @@ msgid "Enabled" msgstr "به‌کارافتاده" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "اثرانگشت‌های ثبت شده پاک شوند؟" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_حذف اثرانگشت‌ها" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6440,15 +6531,15 @@ "آیا مایلید که تمام اثرانگشت‌های ثبت شده را حذف کنید تا در نتیجه امکان ورود به " "سیستم از طریق اثرانگشت غیرفعال شود؟" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "انجام شد!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "نمی‌توان به دستگاه «%s» دسترسی داشت" @@ -6456,16 +6547,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "نمی‌توان شروع به انگشت‌نگاری با استفاده از دستگاه «%s» کرد" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "نمی‌توان به هیچ دستگاه انگشت‌نگاری متصل شد" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "لطفا جهت دریافت کمک به مدیر سیستم خود مراجعه کنید." @@ -6474,7 +6565,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, using " @@ -6483,11 +6574,11 @@ "برای به‌کارانداختن امکان ورود با استفاده از اثرانگشت، شما باید یکی از اثرانگشت‌های " "خود را با استفاده از دستگاه «%s» ذخیره کنید." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "در حال انتخاب انگشت" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "در حال ثبت اثر انگشت‌ها" @@ -6541,14 +6632,21 @@ msgid "%s, %s" msgstr "%s، %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "نشست پایان یافت" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "نشست آغاز شد" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - فعالیت حساب" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "لطفاً گذرواژه‌ی دیگری انتخاب کنید." @@ -6610,7 +6708,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "نمی‌توان به دامنه %s متصل شد: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "حساب‌های دیگر" @@ -6690,15 +6788,15 @@ msgid "Logged in" msgstr "وارد شده" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "ارتباط با سرویس حساب شکست خورد" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "لطفا مطمئن شوید که AccountService نصب و فعال است." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6706,12 +6804,12 @@ "برای ایجاد تغییرات،\n" "ابتدا بر روی نقشک * کلیک کنید" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "ساخت یک حساب کاربری" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6719,12 +6817,12 @@ "برای ساختن یک حساب کاربر،\n" "ابتدا بر روی شمایل * کلیک کنید" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "حذف حساب کاربر انتخاب شده" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6732,33 +6830,32 @@ "برای حذف حساب کاربر انتخاب شده،\n" "ابتدا بر روی شمایل * کلیک کنید" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "حساب من" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "یک کاربر با نام «%s» از پیش وجود دارد." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "متاسفیم، نام‌کاربری انتخاب شده موجود نیست. لطفا یک نام دیگر امتحان کنید." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "نام کاربری خیلی بلند است." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "نام کاربری نمیتواند با یک «-» شروع شود." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و هر کدام از " -"نویسه‌های «.» «-» و «_» باشد." +"نام کاربری تنها باید شامل حرف کوچک و بزرگ در بازه a-z، اعداد و نویسه‌های مقابل " +"باشد: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "این برای نام‌گذاری پوشه خانگی شما استفاده می‌شود و قابل تغییر نیست." @@ -6847,17 +6944,17 @@ msgid "Button" msgstr "دکمه" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "تبلت Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "تنظیم هدایت کلیدها و تنظیم حساسیت قلم برای تبلت‌های گرافیکی" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "تبلت;Wacom;Stylus;Eraser;موشی;" @@ -6889,6 +6986,10 @@ msgid "Bluetooth Settings" msgstr "تنظیمات بلوتوث" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "تبلت Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "هدایت به صفحه‌نمایش..." @@ -7075,6 +7176,10 @@ msgid "Tip Pressure Feel" msgstr "حساسیت فشار ضربه" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "همه‌ی تنظیمات" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "مرکز کنترل گنوم" @@ -7129,22 +7234,18 @@ msgid "Quit" msgstr "خروج" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "همه‌ی تنظیمات" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "شخصی" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "سخت‌افزار" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "سیستم" @@ -7183,6 +7284,188 @@ msgid "Cancel search" msgstr "لغو جست‌وجو" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "کانون فعال" + +#~ msgid "Color" +#~ msgstr "رنگ" + +#~ msgid "_Name:" +#~ msgstr "_نام:" + +#~ msgid "C_ommand:" +#~ msgstr "_فرمان:" + +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#~ msgid "Add Shortcut" +#~ msgstr "اضافه‌کردن میان‌بر" + +# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error +#~ msgid "Remove Shortcut" +#~ msgstr "حذف میان‌بر" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "برای ویرایش یک کلید میان‌بر، روی ردیف مربوط به آن کلیک کرده و یک ترکیب جدید " +#~ "تایپ کنید، و یا برای پاک‌کردن پس‌بر را فشار دهید." + +#~ msgid "" +#~ msgstr "<کنش ناشناخته>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to type " +#~ "using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "استفاده از میانبر «%s» به این دلیل که امکان تایپ به وسیله‌ی این کلید را " +#~ "غیرممکن می کند، امکان‌پذیر نیست.\n" +#~ "لطفا از یکی از کلیدهای مهار، دگرساز و یا تبدیل، به طور همزمان استفاده کنید." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "میان‌بر «%s» قبلاً استفاده شده است برای:\n" +#~ "‏ «%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." +#~ msgstr "اگر میانبر را با «%s» جای‌گذاری کنید، میانبر «%s» غیرفعال خواهد شد." + +#~ msgid "_Reassign" +#~ msgstr "_جای‌گذاری مجدد" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "میان‌بر «%s» یک میان‌بر مرتبط «%s» دارد. آیا مایلید به طور خودکار به «%s» تنظیم " +#~ "شود؟" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be disabled if " +#~ "you move forward." +#~ msgstr "" +#~ "درحال حاضر «%s» به «%s» وابسته است، اگر پیشروی کنید این میان‌بر غیرفعال خواهد " +#~ "شد." + +#~ msgid "_Assign" +#~ msgstr "_جای‌گذاری" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "گروه" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "نمی‌توان افزونه‌های وی‌پی‌ان را بار کرد" + +#~ msgid "Add Network Connection" +#~ msgstr "اضافه کردن اتصال شبکه" + +#~ msgid "Bond slaves" +#~ msgstr "Bond slaves" + +#~ msgid "(none)" +#~ msgstr "(هیچ)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge slaves" + +#~ msgid "Team slaves" +#~ msgstr "برده‌های گروه" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "دستگاه InfiniBand از حالت متصل شده پشتیبانی نمی‌کند" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "هیچ گواهینامه‌ای برای مرجع گواهینامه انتخاب نشد" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in connections " +#~ "to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " +#~ "Authority certificate?" +#~ msgstr "" +#~ "استفاده نکردن از گواهینامه‌ی مرجع گواهینامه (CA) می‌تواند باعث اتصال به یک " +#~ "شبکه‌ی وای‌فای خطرناک و ناامن شود. آیا مایلید یک گواهینامه‌ی مرجع گواهینامه " +#~ "انتخاب کنید؟" + +#~ msgid "Ignore" +#~ msgstr "نادیده گرفتن" + +#~ msgid "Choose CA Certificate" +#~ msgstr "انتخاب گواهینامه CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "این گذرواژه را هربار _بپرس" + +#~ msgid "Don't _warn me again" +#~ msgstr "دوباره به من _هشدار نده" + +#~ msgid "No" +#~ msgstr "خیر" + +#~ msgid "Yes" +#~ msgstr "بله" + +#~ msgid "Error logging into the account" +#~ msgstr "خطا در هنگاک ورود به حساب" + +#~ msgid "Credentials have expired." +#~ msgstr "اعتبارنامه‌ها منقضی شده‌اند." + +#~ msgid "Sign in to enable this account." +#~ msgstr "وارد شوید تا این حساب فعال شود." + +#~ msgid "_Sign In" +#~ msgstr "_ورود به سیستم" + +#~ msgid "Power" +#~ msgstr "انرژی" + +#~ msgid "Privacy" +#~ msgstr "حریم‌خصوصی" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "موارد دیگر" + +#~ msgid "Personal File Sharing" +#~ msgstr "به‌اشتراک‌گذاری پرونده شخصی" + +#~ msgid "_Allow Remote Control" +#~ msgstr "اجازه دادن برای _کنترل دوردست" + +#~ msgid "_Verify" +#~ msgstr "_تایید" + +#~ msgid "Login History" +#~ msgstr "تاریخچه ورود به سیستم" + +#~ msgid "Add User Account" +#~ msgstr "اضافه‌کردن حساب کاربر" + +#~ msgid "Remove User Account" +#~ msgstr "حذف حساب کاربر" + +#~ msgid "Login Options" +#~ msgstr "گزینه‌های ورود به سیستم" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "یک کاربر با نام «%s» از پیش وجود دارد." + #~ msgid "Done" #~ msgstr "انجام شد" @@ -7257,9 +7540,6 @@ #~ msgid "Fast" #~ msgstr "سریع" -#~ msgid "Two _finger scroll" -#~ msgstr "لغزش دو ا_نگشتی" - #~ msgid "No printers available" #~ msgstr "هیچ چاپگری موجود نیست" @@ -7947,10 +8227,6 @@ #~ msgid "The current password is not correct" #~ msgstr "گذرواژه فعلی صحیح نیست" -# ../capplets/common/gconf-property-editor.:c:183 -#~ msgid "Wrong password" -#~ msgstr "گذرواژه اشتباه" - #~ msgid "Switch Modes" #~ msgstr "حالت‌های معاوضه" @@ -8136,9 +8412,6 @@ #~ msgid "C_reate..." #~ msgstr "_ایجاد..." -#~ msgid "_Configure..." -#~ msgstr "_پیکربندی" - #~| msgid "Wireless mouse" #~ msgid "Wireless Hotspot" #~ msgstr "نقطه داغ بی‌سیم" @@ -8450,10 +8723,6 @@ #~ msgid "Take a screenshot" #~ msgstr "یک عکس‌صفحه بگیرید" -# ../capplets/keybindings/gnome-keybinding-properties.c:873gnome-control-center.gnome-2-10.fa.po:609:2: parse error -#~ msgid "Shortcut" -#~ msgstr "میان‌بر" - #~ msgid "_Right-handed" #~ msgstr "_راست دست" @@ -8725,9 +8994,6 @@ #~ msgid "The type of accelerator." #~ msgstr "نوع شتاب‌ده." -#~ msgid "Error saving the new shortcut" -#~ msgstr "خطا در هنگام ذخیره‌ی میان‌بر جدید" - #~ msgid "Too many custom shortcuts" #~ msgstr "تعداد زیادی میان‌بر سفارشی" @@ -11101,9 +11367,6 @@ #~ msgid "_Detachable toolbars" #~ msgstr "نوار ابزارهای _جداشدنی" -#~ msgid "_Edit" -#~ msgstr "_ویرایش" - #~ msgid "_Editable menu accelerators" #~ msgstr "شتاب‌دهنده‌های منوی _قابل ویرایش" @@ -11513,9 +11776,6 @@ #~ msgid "Window Manager" #~ msgstr "مدیر پنجره‌ها" -#~ msgid "_Command:" -#~ msgstr "_فرمان:" - #~ msgid "_Select:" #~ msgstr "_انتخاب" diff -Nru gnome-control-center-3.20.2/po/fi.po gnome-control-center-3.22.1/po/fi.po --- gnome-control-center-3.20.2/po/fi.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/fi.po 2016-09-27 12:37:36.000000000 +0000 @@ -26,10 +26,10 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-17 21:55+0200\n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-12 20:30+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: suomi \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -109,7 +109,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Koti" @@ -124,26 +124,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -174,16 +172,17 @@ msgid "Current background" msgstr "Nykyinen taustakuva" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Taustakuva" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Vaihda taustakuva" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Taustakuva;Näyttö;Työpöytä;Wallpaper;Screen;Desktop;" @@ -223,18 +222,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Poista lentokonetila käytöstä käyttääksesi Bluetoothia." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Kytke Bluetooth päälle tai pois ja yhdistä laitteita" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;jakaminen;jaot;" @@ -403,7 +401,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Kaikki tiedostot" @@ -443,7 +441,7 @@ msgstr "Tallenna profiili" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Tallenna" @@ -697,7 +695,7 @@ "saattaa olla hyötyä." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Yhteenveto" @@ -710,11 +708,10 @@ msgstr "_Tuo tiedosto\t…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Lisää" @@ -864,17 +861,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Värit" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Väri" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Kalibroi laitteidesi, kuten näytön, kameran ja tulostimen värejä" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "väri;ICC;color;profiili;kalibrointi;Calibrate;Tulostin;Printer;Näyttö;" @@ -892,23 +890,23 @@ msgid "No languages found" msgstr "Kieli ei löytynyt" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Tänään" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Eilen" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e. %b %Y" @@ -1028,8 +1026,9 @@ msgid "December" msgstr "Joulukuu" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Päivä ja aika" @@ -1086,12 +1085,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Vaihda aikaa, päivää tai aikavyöhykettä" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Kello;Aikavyöhyke;Sijainti;" @@ -1103,209 +1102,224 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Muuttaaksesi ajan tai päivän asetuksia sinun tulee tunnistautua." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Kansi suljettu" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Peilattu" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Ensisijainen" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Pois" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Toissijainen" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Järjestä yhdistetyt näytöt" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Toteuta" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Järjestä näytöt vetämällä niitä" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Käännä vastapäivään 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Käännä 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Käännä myötäpäivään 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Koko" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Kuvasuhde" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Tarkkuus" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Sovita TV:hen" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Päivitystaajuus" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Näytä yläpalkki ja yleisnäkymä tällä näytöllä" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Toissijainen näyttö" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Liitä tämä näyttö toiseen luodaksesi lisää työtilaa" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Esitys" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Näyttää vain diaesitykset ja muun median" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Peili" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Näytä nykyinen näkymä molemmilla näytöillä" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Sammuta" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Älä käytä tätä näyttöä" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Näytön tietoja ei saatu" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Järjestä yhdistetyt näytöt" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Näytöt" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Valitse kuinka näyttöjä ja projektoreja käsitellään" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Paneeli;Projektori;" "Näyttö;Resoluutio;Tarkkuus;Virkistystaajuus;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Tuntematon" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (Tunniste: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (Tunniste: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Kysy mitä tehdään" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Älä tee mitään" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Avaa kansio" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Muu media" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Valitse sovellus ääni-CD-levyille" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Valitse sovellus video-DVD-levyille" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Valitse sovellus ajettavaksi kun musiikkisoitin kytketään" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Valitse sovellus ajettavaksi kun kamera kytketään" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Valitse sovellus ohjelmisto-CD-levyille" @@ -1314,88 +1328,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "ääni-DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "tyhjä Blu-ray-levy" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "tyhjä CD-levy" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "tyhjä DVD-levy" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "tyhjä HD DVD -levy" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray-videolevy" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-kirjalukija" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD -videolevy" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Kuva-CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video-CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows-ohjelmisto" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Osio" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Yhteenveto" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Oletussovellukset" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Erilliset tallennusvälineet" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versio %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Tiedot" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Katsele järjestelmän tietoja" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1571,8 +1583,9 @@ msgid "Launch help browser" msgstr "Käynnistä ohjeselain" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Asetukset" @@ -1645,7 +1658,6 @@ msgstr "Lukitse näyttö" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Esteettömyys" @@ -1681,11 +1693,21 @@ msgid "High contrast on or off" msgstr "Korkea kontrasti päälle/pois" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Omat pikanäppäimet" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1714,126 +1736,133 @@ msgid "Modifiers-only switch to next source" msgstr "Vaihda seuraavaan lähteeseen" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Näppäimistö" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Palauta pikanäppäin oletusarvoon" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"Pikanäppäin %s on jo asetettu toimintoon %s. Jos korvaat sen, " +"poistetaan toiminto %s poistetaan käytöstä" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Aseta oma pikanäppäin" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Aseta pikanäppäin" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Anna uusi pikanäppäin vaihtaaksesi %s." +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Lisää oma pikanäppäin" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Näppäimistö" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Katsele ja muuta näppäimistön pikanäppäimiä ja aseta kirjoitusasetuksesi" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Pikanäppäin;Toisto;Vilkkuminen;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Oma pikanäppäin" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nimi:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Ko_mento:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Lisää pikanäppäin" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Poista pikanäppäin" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Muokkaa pikanäppäintä napsauttamalla riviä ja paina sitten haluamasi uudet " -"näppäimet pohjaan. Pikanäppäimen voi poistaa käytöstä painamalla " -"askelpalautinta." +msgid "No keyboard shortcut found" +msgstr "Näppäimistön pikanäppäintä ei löytynyt" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Omat pikanäppäimet" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Yritä eri hakuehdoilla" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Paina Esc peruaksesi." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Pikanäppäintä ”%s” ei voi käyttää, koska tällöin kyseistä näppäintä ei enää " -"voi käyttää kirjoittamiseen.\n" -"Kokeile yhdistämällä näppäin esimerkiksi Control-, Alt- tai vaihtonäppäimeen." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nimi" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Pikanäppäin ”%s” on jo kytketty toimintoon\n" -"”%s”" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Komento" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Pikanäppäin" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Muokkaa" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Jos siirrät pikanäppäimen toimintoon \"%s\", poistetaan pikanäppäin \"%s\" " -"käytöstä." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ei mikään" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Siirrä" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Poista" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Anna uusi pikanäppäin" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Peru" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" on sidottu toimintoon \"%s\", tämä pikanäppäin poistetaan käytöstä " -"jos jatkat eteenpäin." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Lisää" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Aseta" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Korvaa" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Aseta" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Testaa asetukset" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Hiiri ja kosketuslevy" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Muuta hiiren tai kosketuslevyn herkkyyttä ja valitse kumpaa kättä käytät" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Kosketuslevy;Trackpad;Osoitin;Kohdistin;Napsauta;Klikkaa;Painike;Nappi;" @@ -1895,6 +1924,10 @@ msgstr "Napsauta napauttamalla" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Kahden sormen vieritys" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Reunavieritys" @@ -1933,11 +1966,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Le_ntokonetila" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Verkon välityspalvelin" @@ -1945,17 +1978,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s - VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Hups, jokin taisi mennä pieleen. Ota yhteys sovellustoimittajaan." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManagerin tulee olla käynnissä." @@ -1971,7 +2004,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1988,59 +2021,64 @@ msgid "page 2" msgstr "sivu 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Tietoturva" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automaattinen" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profiili %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Yritys" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ei mitään" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Ei koskaan" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2048,179 +2086,179 @@ msgstr[1] "%i päivää sitten" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Ei mitään" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Heikko" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "OK" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Hyvä" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Erinomainen" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Tiedot" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identiteetti" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Osoite" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Aliverkon peite" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Yhdyskäytävä" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Poista osoite" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Lisää" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Palvelin" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Poista DNS-palvelin" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Mitta" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Poista reitti" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automaattinen (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuaalinen" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Vain linkkiyhteys" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Etuliite" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automaattinen" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automaattinen, vain DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Tyhjennä asetukset" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ei mitään" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bittinen avain (Hex tai ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bittinen salalause" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynaaminen WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2235,30 +2273,30 @@ msgstr "Yhteysnopeus" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-osoite" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-osoite" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Laiteosoite" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2268,7 +2306,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2351,13 +2389,13 @@ msgid "Firewall _Zone" msgstr "Palomuurin _vyöhyke" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Oletus" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Vyöhyke määrittää yhteyden luottamustason" @@ -2399,45 +2437,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Yhteyseditorin avaaminen epäonnistui" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Uusi profiili" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Liitos" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Silta" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "VPN-liittänäisten lataus epäonnistui" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Tuo tiedostosta…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Lisää verkkoyhteys" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Lisää VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2445,7 +2463,7 @@ msgstr "_Tyhjennä" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Unohda" @@ -2471,11 +2489,11 @@ msgid "S_ecurity" msgstr "_Tietoturva" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "VPN-yhteyden tuonti epäonnistui" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2488,37 +2506,37 @@ "\n" "Virhe: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Valitse tuotava tiedosto" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Avaa" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Tiedosto nimeltä \"%s\" on jo olemassa." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Korvaa" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Haluatko korvata tiedoston %s VPN-asetuksilla, joita olet tallentamassa?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "VPN-yhteyden vienti epäonnistui" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2529,7 +2547,7 @@ "\n" "Virhe: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Vie VPN-yhteys" @@ -2556,62 +2574,47 @@ msgid "Make available to _other users" msgstr "Aseta _kaikkien käyttäjien käytettäväksi" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Verkko" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Hallitse internetyhteyden asetuksia" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" "vlan;bridge;bond;DNS;verkko;langaton;lähiverkko;välityspalvelin;laajakaista;" "modeemi;nimipalvelut;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ei mitään)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ei koskaan" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "tänään" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "eilen" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-osoite" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Viimeksi käytetty" @@ -2621,35 +2624,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Kiinteä" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Valinnat…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profiili %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Lisää uusi yhteys" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2657,14 +2650,14 @@ "Jos käytössäsi on myös muu kuin langaton internetyhteys, voit käyttää sitä " "kyseisen yhteyden jakamiseen muiden käyttäjien kanssa." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Yhteyspisteen käyttöönotto katkaisee yhteyden langattomaan verkkoon %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2672,34 +2665,34 @@ "Yhteyspisteen ollessa käytössä langattoman internetyhteyden käyttö ei ole " "mahdollista." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Suljetaanko yhteyspiste ja katkaistaanko kaikkien käyttäjien yhteydet?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Sulje yhteyspiste" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Järjestelmäkäytännöt estävät käytön yhteyspisteenä" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Langaton verkkolaite ei tue yhteyspisteeksi asettamista" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "" "Valittujen verkkojen tiedot, kuten salasanat ja omat asetukset, häviävät." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historia" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2707,7 +2700,7 @@ msgstr "_Sulje" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Unohda" @@ -2742,6 +2735,10 @@ msgid "Provider" msgstr "Tarjoaja" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Verkko" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2847,16 +2844,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Salasana" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ei mikään" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "_Näytä salasana" @@ -2950,7 +2943,6 @@ msgstr "Y_hdistä piilotettuun verkkoon…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historia" @@ -2972,360 +2964,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Salasana" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktuuri" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Tuntematon tila" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Hallitsematon" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Ei saatavilla" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Yhdistetään" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Tunnistautuminen vaaditaan" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Yhdistetty" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Katkaistaan yhteyttä" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Yhteys epäonnistui" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Tila tuntematon (puuttuu)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Ei yhteyttä" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Kokoonpanon käyttö epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP-asetukset epäonnistuivat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP-asetukset vanhenivat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Salaisuuksia ei annettu, vaikka niitä pyydettiin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x-anojan yhteys katkaistu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x-anojan asetukset epäonnistuivat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x-anoja epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x-anojalla kesti liian kauan tunnistautua" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP-palvelun käynnistys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP-palvelun yhteys katkaistu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP-asiakkaan käynnistys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-asiakkaan virhe" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-asiakas epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Jaetun yhteyden palvelun käynnistys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Jaetun yhteyden palvelu epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP-palvelun käynnistys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP-palvelun virhe" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP-palvelu epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linja on varattu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Ei valintaääntä" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Kantoaaltoa ei voitu muodostaa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Soittopyyntö aikatkaistiin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Soittoyritys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modeemin alustus epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Halutun APN:n valinta epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Verkkoja ei etsitä" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Verkkoon rekisteröinti estettiin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Rekisteröinti verkkoon aikakatkaistiin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Määritettyyn verkkoon rekisteröinti epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN-tarkistus epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Laitteen laiteohjelmisto saattaa puuttua" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Yhteys katosi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Oletettiin olemassa oleva yhteys" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modeemia ei löytynyt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth-yhteys epäonnistui" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM-korttia ei ole liitetty" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM-kortin PIN vaaditaan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM-kortin PUK vaaditaan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM väärin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand-laite ei tue yhdistettyä tilaa" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Yhteysriippuvuus epäonnistui" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Laiteohjelmisto puuttuu" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Johto on irti" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Varmentajavarmennetta ei valittu" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "määrittelemätön virhe 802.1x-tietoturvassa (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "ei tiedostoa valittuna" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Varmentajan (CA) käyttämättä jättäminen voi johtaa yhteyksien ottamiseen " -"turvattomiin, epäluotettaviin langattomiin verkkoihin. Haluatko valita " -"varmentajan varmenteen?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ohita" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Valitse CA-varmenne" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER-, PEM- tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER-, PEM-, tai PKCS#12-yksityisavaimet (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER- tai PEM-varmenteet (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "puuttuva EAP-FAST PAC -tiedosto" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Valitse PAC-tiedosto" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC-tiedostot (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PA_C-tiedosto" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Sisempi tunnistautuminen" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC-pro_visiointi" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3334,41 +3302,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonyymi" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Todennettu" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Molemmat" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PA_C-tiedosto" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Sisempi tunnistautuminen" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Salli automaattinen PAC-pro_visiointi" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "puuttuva EAP-LEAP-käyttäjätunnus" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "puuttuva EAP-LEAP-salasana" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Käyttäjätunnus" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "N_äytä salasana" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "virheellinen EAP-PEAP CA -varmenne: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "virheellinen EAP-PEAP CA -varmenne: varmennetta ei määritetty" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Valitse varmentajavarmenne" @@ -3386,19 +3386,56 @@ msgid "C_A certificate" msgstr "_Varmentajavarmenne (CA-varmenne)" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "_CA-varmennetta ei vaadita" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP-_versio" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "K_ysy tätä salasanaa joka kerta" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "puuttuva EAP-käyttäjätunnus" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "puuttuva EAP-salasana" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "puuttuva EAP-TLS-identiteetti" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "virheellinen EAP-TLS CA -varmenne: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "virheellinen EAP-TLS-salasana: puuttuu" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "virheellinen EAP-TLS-käyttäjävarmenne: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Salaamattomat yksityiset avaimet ovat epäluotettavia" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3412,11 +3449,11 @@ "\n" "(Voit suojata yksityisen avaimesi openssl:llä)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Valitse henkilökohtainen varmenteesi" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Valitse yksityinen avaimesi" @@ -3428,51 +3465,56 @@ msgid "_User certificate" msgstr "_Käyttäjävarmenne" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Yksityinen avain" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Yksityisen avaimen _salasana" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "virheellinen EAP-TTLS CA -varmenne: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "virheellinen EAP-TTLS CA -varmenne: varmennetta ei määritetty" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Älä varoita uudelleen" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ei" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Kyllä" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Tuntematon virhe 802.1x-tietoturvaa vahvistaessa" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunneloitu TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Suojattu EAP (PEAP)" @@ -3482,6 +3524,45 @@ msgid "Au_thentication" msgstr "_Tunnistautuminen" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "puuttuva leap-käyttäjätunnus" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "puuttuva leap-salasana" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "puuttuva wep-avain" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "virheellinen wep-avain: tunnuslause ei voi olla tyhjä" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"virheellinen wep-avain: tunnuslause tulee olla vähemmän kuin 64 merkkiä" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Oletus)" @@ -3518,19 +3599,30 @@ msgid "WEP inde_x" msgstr "WEP-inde_ksi" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tyyppi" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Päällä" @@ -3567,16 +3659,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Näytä viestin sisältö _lukitusnäytöllä" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Ilmoitukset" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Hallitse näytettäviä ilmoituksia ja niiden sisältämää tietoa" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Notifications;Banner;Message;Tray;Popup;ilmoitus;ilmoitukset;banneri;viesti;" @@ -3595,79 +3688,68 @@ msgid "Applications" msgstr "Sovellukset" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Muu" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Lisää tili" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Sähköposti" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalenteri" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Yhteystiedot" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Keskustelu" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Resurssit" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Virhe kirjauduttaessa käyttäjätilille" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Kirjautumistiedot ovat vanhentuneet." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Kirjaudu sisään ottaaksesi tämän tilin käyttöön." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Kirjaudu sisään" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Virhe tiliä luotaessa" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Virhe tiliä poistaessa" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Haluatko varmasti poistaa tilin?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Tämä ei poista käyttäjää palvelimelta." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Poista" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Verkkotilit" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Liitä verkkotilisi ja päätä, mihin tarkoituksiin niitä käytetään" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3681,6 +3763,7 @@ msgstr "Verkkotilejä ei ole määritelty" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Poista tili" @@ -3823,7 +3906,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Akku" @@ -3871,101 +3954,102 @@ msgid "When _idle" msgstr "Kun _käyttämättä" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Virransäästö" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Näytön kirkkaus" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automaattinen kirkkaus" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Näppäimistön _kirkkaus" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Himmennä näyttö koneen ollessa käyttämättä" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Tyhjä näyttö" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wifi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Sammuta wifi säästääksesi virtaa." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobiililaajakaista" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Sammuta mobiililaajakaista (3G, 4G, LTE jne.) säästääksesi virtaa." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Käytettäessä akkua" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Käytettäessä verkkovirtaa" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Valmiustila" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Lepotila" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ei mitään" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Valmiustila ja virran katkaisu" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automaattinen valmiustila" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automaattinen valmiustila" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Kun virtapainiketta painetaan" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Laitteet" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Virransäästö" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Virranhallinta" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Tarkkaile akkusi tilaa ja muuta virransäästöasetuksia" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4045,11 +4129,6 @@ msgid "Delay" msgstr "Viive" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Peru" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Tunnistaudu" @@ -4059,138 +4138,138 @@ msgstr "Tunnistautuminen vaaditaan" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Muste on vähissä" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Muste on loppu" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Kehite on vähissä" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Kehite on loppu" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Väriaine vähissä" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Väriaine loppu" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Avaa kansi" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Avaa ovi" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Paperi vähissä" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Paperi on loppu" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Poissa verkosta" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Pysäytetty" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Jätesäiliö melkein täynnä" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Jätesäiliö täynnä" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Valojohdeyksikkö on vaihdettava pian" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Valojohdeyksikkö on rikki" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Määritetään asetuksia" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Valmiina" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Ei hyväksy töitä" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Käsitellään" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Värikasetin taso" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Musteen taso" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Täyttöaste" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Asennetaan" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4198,15 +4277,15 @@ msgstr[1] "%u aktiivista" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Uuden tulostimen lisäys epäonnistui." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Valitse PPD-tiedosto" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4214,48 +4293,45 @@ "PostScript Printer Description -tiedostot (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, " "*.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Soveltuvaa ajuria ei löytynyt" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Etsitään ensisijaisia ajureita…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Valitse tietokannasta…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Määritä PPD-tiedosto…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Testisivu" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Ei tulostimia" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Käyttöliittymätiedoston lataus epäonnistui: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Tulostimet" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Lisää tulostimia, seuraa tulostustöitä ja määritä tulostusasetukset" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "" "tulostin;jono;tulosta;paperi;muste;värikasetti;Printer;Queue;Print;Paper;Ink;" @@ -4419,6 +4495,11 @@ msgid "Parallel Port" msgstr "Rinnakkaisportti" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4631,13 +4712,17 @@ msgid "_Options" msgstr "_Valinnat" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Ei tulostimia" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Lisää tulostin" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4645,70 +4730,70 @@ "Valitettavasti tulostuspalvelu\n" "ei vaikuta olevan käytettävissä." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Näytön lukitus" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Käytössä" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Päällä" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Pois" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Sijaintipalvelut" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Käyttö ja historia" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Tyhjennetäänkö roskakorin koko sisältö?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Kaikki roskakorissa olevat kohteet poistetaan pysyvästi." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Tyhjennä roskakori" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Poistetaanko kaikki väliaikaiset tiedostot?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Kaikki väliaikaiset tiedostot poistetaan pysyvästi." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Tu_hoa väliaikaistiedostot" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Tuhoa väliaikaiset ja roskakorin tiedostot" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Ohjelmistojen käyttö" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Vikailmoitukset" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4717,21 +4802,22 @@ "Vikailmoitusten lähettäminen auttaa parantamaan %sa. Ilmoitukset eivät " "sisällä henkilökohtaisia tietoja. Ilmoitukset lähetetään anonyymisti." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Tietosuoja" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Yksityisyys" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Suojaa henkilökohtaisia tietojasi ja hallitse, mitä tietoja muut voivat nähdä" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4902,21 +4988,21 @@ msgid "Other" msgstr "Muu" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Istunto täytyy käynnistää uudelleen, jotta muutokset tulevat voimaan." -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Käynnistä uudelleen nyt" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Syötelähdettä ei valittu" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Kirjautumisnäytt_ö" @@ -4948,18 +5034,19 @@ msgid "Paper" msgstr "Paperi" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Alue ja kielet" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Valitse näytettävä kieli, formaatit, näppäimistöasettelu ja syötelähteet" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Kieli;Asettelu;Näppäimistö;Syöte;" @@ -5016,7 +5103,7 @@ msgstr "Vasen+Oikea Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Kieli" @@ -5065,26 +5152,11 @@ msgstr "" "Kaikki käyttäjät käyttävät kirjautumisasetuksia kirjautuessaan järjestelmään" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Sijainnit" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Kirjanmerkit" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Muu" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Valitse sijainti" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5092,17 +5164,18 @@ msgid "No applications found" msgstr "Sovelluksia ei löytynyt" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Haku" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "Mitkä ohjelmat näyttävät hakutuloksia Toiminnot-näkymässä" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Search;Find;Index;Hide;Privacy;Results;Haku;Etsi;Indeksi;Piilota;Yksityisyys;" @@ -5112,6 +5185,18 @@ msgid "Search Locations" msgstr "Hakukohteet" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Sijainnit" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Kirjanmerkit" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Muu" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Siirrä _ylös" @@ -5124,6 +5209,11 @@ msgid "Preferences" msgstr "Asetukset" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Ei verkkoja valittu jakamista varten" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5149,21 +5239,54 @@ msgid "Choose a Folder" msgstr "Valitse kansio" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon " +"muiden käyttäjien kanssa käyttäen osoitetta dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Kun etäkirjautuminen on sallittu, etäkäyttäjät voivat yhdistää käyttäen " +"Secure Shell -komentoa:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Näytön jakaminen sallii etäkäyttäjien seurata ja hallita näyttöäsi " +"yhdistämällä kohteeseen vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopioi" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Jakaminen" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Jakaminen" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Valitse mitä haluat jakaa muiden kanssa" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5171,6 +5294,10 @@ "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;jako;jakaminen;etä;työpöytä;ääni;video;kuvat;palvelin;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Verkot" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Käytä tai poista käytöstä etäkirjautuminen" @@ -5179,25 +5306,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "Etäkirjautumisen hallinta vaatii tunnistautuminen" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Ei verkkoja valittu jakamista varten" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Verkot" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Ti_etokoneen nimi" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Henkilökohtainen _tiedostonjako" +msgid "_File Sharing" +msgstr "_Tiedostonjako" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5216,84 +5331,54 @@ msgstr "Jotkut palvelut ovat poissa käytöstä, koska verkkoyhteyttä ei ole." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Henkilökohtainen tiedostonjako" +msgid "File Sharing" +msgstr "Tiedostojako" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Henkilökohtaisen tiedostonjaon avulla voit jakaa julkisen kansiosi verkon " -"muiden käyttäjien kanssa käyttäen osoitetta dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Vaa_di salasana" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Etäkirjautuminen" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Salli etäkäyttäjien yhdistää käyttäen Secure Shell -komentoa:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Näytön jakaminen" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Salli etäkäyttäjien seurata ja hallita näyttöäsi yhdistämällä kohteeseen: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "S_alli etäkäyttö" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Sa_lli yhteydet näytön hallintaan" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Salasana:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Näytä salasana" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Käyttövalinnat" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Uusien yhteyksien tulee ky_syä lupa" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Vaadi salasana" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Mediajako" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Mediajakaminen mahdollistaa musiikkin, valokuvien ja videoiden jakamisen " -"verkon kautta." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Jaa musiikkia, kuvia ja videoita verkon kautta." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Kansiot" @@ -5423,11 +5508,6 @@ msgid "Peak detect" msgstr "Havaitse piikit" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nimi" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Laite" @@ -5522,16 +5602,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Oma" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Esteettömyys" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Helpota näkemistä, kuulemista, kirjoittamista ja hiiren käyttöä" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5633,7 +5718,7 @@ msgstr "_Äänekkäät näppäimet" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "Piippaa kun Num Lock tai Caps Lock otetaan käyttöön." #: ../panels/universal-access/uap.ui.h:26 @@ -6016,95 +6101,67 @@ msgstr "Väritehosteet" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Lisää käyttäjä" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "K_oko nimi" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Normaali" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Ylläpitäjä" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "K_oko nimi" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Tilin _tyyppi" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Salli käyttäjän vaihtaa salasana seuraavalla ki_rjautumiskerralla" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Aseta salasana nyt" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_Vahvista" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Yrityskirjautuminen mahdollistaa ennestään keskitetysti hallitun " -"käyttäjätilin käytön tällä laitteella." +"käyttäjätilin käytön tällä laitteella. Voit käyttää tätä tiliä myös " +"yrityksen resurssien käyttöön internetissä." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "T_oimialue" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Muodosta verkkoyhteys lisätäksesi\n" -"yrityskirjautumistilejä." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Yrityskirjautumisen vaativa tili" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Lisää käyttäjä" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Liitä toimialueeseen" +msgid "You are Offline" +msgstr "Olet poissa verkosta" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Toimialueen ylläpitäjän kirjautuminen" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Yrityskirjautumisen käyttö vaatii, että tietokone on rekisteröity\n" -"toimialueeseen. Pyydä verkkosi ylläpitäjää kirjoittamaan\n" -"toimialueen salasanan tähän." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Ylläpitäjän _nimi" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Muodosta verkkoyhteys lisätäksesi yrityskirjautumistilejä." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Ylläpitäjän salasana" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Yrityskirjautumisen vaativa tili" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6139,7 +6196,7 @@ msgstr "Oikea pikkurilli" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Ota sormenjäljellä kirjautuminen käyttöön" @@ -6178,9 +6235,32 @@ "Login;Name;Fingerprint;Avatar;Logo;Face;Password;kirjautuminen;nimi;" "sormenjälki;avatar;kasvokuva;salasana;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Kirjautumishistoria" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Liitä toimialueeseen" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Toimialueen ylläpitäjän kirjautuminen" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Yrityskirjautumisen käyttö vaatii, että tietokone on rekisteröity\n" +"toimialueeseen. Pyydä verkkosi ylläpitäjää kirjoittamaan\n" +"toimialueen salasanan tähän." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Ylläpitäjän _nimi" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Ylläpitäjän salasana" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6203,38 +6283,30 @@ msgstr "_Nykyinen salasana" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "Salli käyttäjän vaihtaa salasana seuraavalla kirjautumiskerralla" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Aseta salasana nyt" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Lisää käyttäjätili" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Poista käyttäjätili" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Lisää käyttäjä…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Sisäänkirjautumisvalinnat" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomaattinen kirjautuminen" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Sormenjäljellä kirjautuminen" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Käyttäjän kuvake" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Viimeisin kirjautuminen" @@ -6337,7 +6409,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Käytä isoja ja pieniä kirjaimia sekä joitain numeroita." #: ../panels/user-accounts/pw-utils.c:119 @@ -6429,33 +6501,33 @@ msgstr "Tuntematon virhe" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Tulisi vastata tilisi myöntäjän verkko-osoitetta." +msgid "Should match the web address of your login provider." +msgstr "Tulisi vastata kirjautumistilisi myöntäjän verkko-osoitetta." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Tilin lisäys epäonnistui" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Salasanat eivät täsmää." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Tilin rekisteröinti epäonnistui" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "" "Tähän toimialueeseen vaadittavaa tunnistautumistapaa ei ole käytettävissä" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Toimialueeseen liittyminen epäonnistui" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6463,7 +6535,7 @@ "Käyttäjätunnus ei kelvannut.\n" "Yritä uudelleen." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6471,14 +6543,24 @@ "Salasana ei kelvannut.\n" "Yritä uudelleen." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Toimialueeseen kirjautuminen epäonnistui" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Toimialuetta ei löytynyt. Kirjoititko sen oikein?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Normaali" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Ylläpitäjä" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6497,15 +6579,15 @@ msgid "Enabled" msgstr "Käytössä" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Poistetaanko rekisteröidyt sormenjäljet?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Poista sormenjäljet" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6513,15 +6595,15 @@ "Haluatko poistaa rekisteröidyt sormenjälkesi, jolloin sormenjäljillä " "kirjautuminen poistetaan käytöstä?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Valmis!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Laitetta ”%s” ei voitu käsitellä" @@ -6529,16 +6611,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Sormenjäljen tunnistusta ei voitu aloitta laitteella ”%s”" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Sormenjälkilukijoita ei voitu käyttää" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Kysy apua järjestelmäsi ylläpitäjältä." @@ -6547,7 +6629,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6556,11 +6638,11 @@ "Jotta voit ottaa sormenjäljellä kirjautumisen käyttöön, täytyy yksi " "sormenjäljistä tallentaa käyttäen laitetta ”%s”." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Valitaan sormea" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Kirjataan sormenjälkiä" @@ -6614,14 +6696,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Istunto päättyi" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Istunto alkoi" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Tilin käyttöhistoria" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Valitse jokin toinen salasana." @@ -6683,7 +6772,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Toimialueeseen %s yhdistäminen epäonnistui: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Muut tilit" @@ -6763,15 +6852,15 @@ msgid "Logged in" msgstr "Sisäänkirjautuneena" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Yhteys tilipalveluun (accounts service) epäonnistui" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Varmista, että AccountService on asennettu ja käytössä." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6779,12 +6868,12 @@ "Tee muutoksia\n" "napsauttamalla ensin *-kuvaketta" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Luo käyttäjätili" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6792,12 +6881,12 @@ "Luo käyttäjätili\n" "napsauttamalla ensin *-kuvaketta" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Poista valittu käyttäjätili" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6805,33 +6894,34 @@ "Poista valittu käyttäjä\n" "napsauttamalla ensin *-kuvaketta" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Oma tili" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Käyttäjä tunnuksella '%s' on jo olemassa." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Valitettavasti kyseinen käyttäjätunnus ei ole saatavilla. Valitse toinen " +"käyttäjätunnus." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Käyttäjätunnus on liian pitkä." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Käyttäjätunnus ei voi alkaa merkillä '-'." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Käyttäjätunnus voi koostua kirjaimista välillä a-z, numeroista sekä " -"merkeistä '.', '-' ja '_'." +"Käyttäjätunnus voi koostua pienistä ja isoista kirjaimista välillä a-z, " +"numeroista sekä seuraavista merkeistä: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Tätä käytetään kotikansiosi nimeämiseen, eikä sitä voi vaihtaa." @@ -6920,17 +7010,17 @@ msgid "Button" msgstr "Painike" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom-piirtopöydät" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wacom-piirtopöytä" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "Aseta piirtopöydän painikkeet ja kynän herkkyys" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Piirtopöytä;Wacom;Stylus;Eraser;Hiiri;Tablet;Mouse;" @@ -6962,6 +7052,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-asetukset" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom-piirtopöydät" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Kohdista näyttöön…" @@ -7055,22 +7149,22 @@ msgid "Mode Switch #%d" msgstr "Tilavaihdin #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Vasen painike #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Oikea painike #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Yläpainike #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Alapainike #%d" @@ -7147,6 +7241,11 @@ msgid "Tip Pressure Feel" msgstr "Kynän kärjen paineentuntu" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Kaikki asetukset" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Gnomen asetuskeskus" @@ -7203,22 +7302,18 @@ msgid "Quit" msgstr "Lopeta" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Kaikki asetukset" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Henkilökohtaiset" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Laitteisto" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Järjestelmä" @@ -7257,6 +7352,173 @@ msgid "Cancel search" msgstr "Peru haku" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Yhteyspiste" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Pikanäppäin toiminnolle %s. Anna uusi pikanäppäin vaihtaaksesi." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Muokkaa pikanäppäintä napsauttamalla riviä ja paina sitten haluamasi " +#~ "uudet näppäimet pohjaan. Pikanäppäimen voi poistaa käytöstä painamalla " +#~ "askelpalautinta." + +#~ msgid "Error logging into the account" +#~ msgstr "Virhe kirjauduttaessa käyttäjätilille" + +#~ msgid "Credentials have expired." +#~ msgstr "Kirjautumistiedot ovat vanhentuneet." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Kirjaudu sisään ottaaksesi tämän tilin käyttöön." + +#~ msgid "_Sign In" +#~ msgstr "_Kirjaudu sisään" + +#~ msgid "Color" +#~ msgstr "Värit" + +#~ msgid "_Name:" +#~ msgstr "_Nimi:" + +#~ msgid "Add Shortcut" +#~ msgstr "Lisää pikanäppäin" + +#~ msgid "Remove Shortcut" +#~ msgstr "Poista pikanäppäin" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Pikanäppäintä ”%s” ei voi käyttää, koska tällöin kyseistä näppäintä ei " +#~ "enää voi käyttää kirjoittamiseen.\n" +#~ "Kokeile yhdistämällä näppäin esimerkiksi Control-, Alt- tai " +#~ "vaihtonäppäimeen." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Pikanäppäin ”%s” on jo kytketty toimintoon\n" +#~ "”%s”" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Jos siirrät pikanäppäimen toimintoon \"%s\", poistetaan pikanäppäin \"%s" +#~ "\" käytöstä." + +#~ msgid "_Reassign" +#~ msgstr "_Siirrä" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" on sidottu toimintoon \"%s\", tämä pikanäppäin poistetaan käytöstä " +#~ "jos jatkat eteenpäin." + +#~ msgid "_Assign" +#~ msgstr "_Aseta" + +#~ msgid "Bond" +#~ msgstr "Liitos" + +#~ msgid "Bridge" +#~ msgstr "Silta" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "VPN-liittänäisten lataus epäonnistui" + +#~ msgid "Add Network Connection" +#~ msgstr "Lisää verkkoyhteys" + +#~ msgid "(none)" +#~ msgstr "(ei mitään)" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand-laite ei tue yhdistettyä tilaa" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Varmentajavarmennetta ei valittu" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Varmentajan (CA) käyttämättä jättäminen voi johtaa yhteyksien ottamiseen " +#~ "turvattomiin, epäluotettaviin langattomiin verkkoihin. Haluatko valita " +#~ "varmentajan varmenteen?" + +#~ msgid "Ignore" +#~ msgstr "Ohita" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Valitse CA-varmenne" + +#~ msgid "As_k for this password every time" +#~ msgstr "K_ysy tätä salasanaa joka kerta" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Älä varoita uudelleen" + +#~ msgid "No" +#~ msgstr "Ei" + +#~ msgid "Yes" +#~ msgstr "Kyllä" + +#~ msgid "Power" +#~ msgstr "Virransäästö" + +#~ msgid "Privacy" +#~ msgstr "Yksityisyys" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Muu" + +#~ msgid "Personal File Sharing" +#~ msgstr "Henkilökohtainen tiedostonjako" + +#~ msgid "_Allow Remote Control" +#~ msgstr "S_alli etäkäyttö" + +#~ msgid "_Verify" +#~ msgstr "_Vahvista" + +#~ msgid "Login History" +#~ msgstr "Kirjautumishistoria" + +#~ msgid "Add User Account" +#~ msgstr "Lisää käyttäjätili" + +#~ msgid "Remove User Account" +#~ msgstr "Poista käyttäjätili" + +#~ msgid "Login Options" +#~ msgstr "Sisäänkirjautumisvalinnat" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Käyttäjä tunnuksella '%s' on jo olemassa." + #~ msgid "Used to determine your geographical location" #~ msgstr "Käytetään maantieteellisen sijaintisi määrittämiseen" @@ -7335,16 +7597,9 @@ #~ msgid "S_peed:" #~ msgstr "_Nopeus:" -#~ msgid "Shortcuts" -#~ msgstr "Pikanäppäimet" - #~ msgid "For mice and touchpads." #~ msgstr "Hiirelle ja kosketuslevylle." -#~| msgid "Two _finger scroll" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Kahden sormen vieritys" - #~ msgid "Test Your Settings" #~ msgstr "Testaa asetukset" diff -Nru gnome-control-center-3.20.2/po/fr.po gnome-control-center-3.22.1/po/fr.po --- gnome-control-center-3.20.2/po/fr.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/fr.po 2016-09-27 12:37:36.000000000 +0000 @@ -25,9 +25,9 @@ # Laurent Coudeur , 2009, 2010. # Gérard Baylard , 2011. # Grawok , 2012. -# Alain Lojewski , 2011-2015. +# Alain Lojewski , 2011-2016. # Julien Hardelin , 2013. -# Alexandre Franke , 2013. +# Alexandre Franke , 2013-2016. # Guillaume Bernard , 2015. # Erwan Georget , 2015. # @@ -36,16 +36,16 @@ "Project-Id-Version: gnome-control-center HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-18 12:28+0000\n" -"PO-Revision-Date: 2016-03-18 20:22+0100\n" -"Last-Translator: Alain Lojewski \n" +"POT-Creation-Date: 2016-09-13 09:47+0000\n" +"PO-Revision-Date: 2016-09-19 11:42+0200\n" +"Last-Translator: Jean-Baptiste Holcroft \n" "Language-Team: français \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -117,7 +117,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Dossier personnel" @@ -133,25 +133,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -182,16 +181,17 @@ msgid "Current background" msgstr "Arrière-plan actuel" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Arrière-plan" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Ar­ri­ère-plan" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Remplacer votre image d'arrière-plan par un papier peint ou une photo" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Papier peint;Écran;Bureau;" @@ -233,18 +233,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Désactivez le mode avion pour activer le Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Active/désactive le Bluetooth et connecte vos périphériques" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "partage;partager;bluetooth;obex;" @@ -418,7 +417,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Tous les fichiers" @@ -460,7 +459,7 @@ msgstr "Enregistrer le profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Enregistrer" @@ -718,7 +717,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Résumé" @@ -730,11 +729,11 @@ msgid "_Import File…" msgstr "_Importer un fichier…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Ajouter" @@ -884,11 +883,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Couleur" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Cou­leur" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -896,7 +896,7 @@ "photos ou les imprimantes" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Couleur;ICC;Profil;Étalonner;Étalonnage;Imprimante;Écran;" @@ -914,23 +914,23 @@ msgid "No languages found" msgstr "Aucune langue trouvée" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Aujourd'hui" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Hier" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b %e" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%b %e, %Y" @@ -1050,8 +1050,9 @@ msgid "December" msgstr "décembre" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Date & heure" @@ -1108,12 +1109,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Modifier la date et l'heure, y compris le fuseau horaire" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Horloge;Fuseau;Heure;Date;Emplacement;" @@ -1125,210 +1126,225 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Vous devez vous authentifier pour modifier la date ou l'heure." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Écran rabattu" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Clonés" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Principal" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Désactivé" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secondaire" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Organiser les écrans associés" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Appliquer" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Faites glisser les écrans pour les réorganiser" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Pivoter de 90° vers la gauche" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Pivoter de 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Pivoter de 90° vers la droite" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Taille" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proportion" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Résolution" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Adapter aux téléviseurs" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Taux de rafraîchissement" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Afficher la barre supérieure et la vue d'ensemble des activités sur cet écran" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Écran secondaire" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Accoller cet écran à un autre pour élargir l'espace de travail" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Présentation" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "N'afficher que les diaporamas et les médias" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Cloner" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Afficher votre vue actuelle sur les deux écrans" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Éteindre" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Ne pas utiliser cet écran" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Impossible d'obtenir les informations concernant l'écran" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Organiser les écrans associés" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Écrans" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Éc­rans" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Choisir le mode d'utilisation des écrans et projecteurs connectés" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panneau;Projecteur;xrandr;Écran;Définition;Résolution;Rafraîchissement;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Inconnu" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d bits (identifiant : %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d bits (identifiant : %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d bits" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d bits" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Demander que faire" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ne rien faire" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Ouvrir le dossier" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Autres médias" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Sélectionnez une application pour vos CD audio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Sélectionnez une application pour vos DVD audio" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Sélectionnez une application à lancer lorsqu'un baladeur est connecté" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "" "Sélectionnez une application à lancer lorsqu'un appareil photo est connecté" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Sélectionnez une application pour les CD contenant des logiciels" @@ -1337,88 +1353,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD audio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "disque Blu-ray vierge" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "disque CD vierge" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "disque DVD vierge" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "disque HD DVD vierge" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "disque vidéo Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "lecteur e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "disque vidéo HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Vidéo CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD vidéo" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Logiciels Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Section" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Vue d'ensemble" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Applications par défaut" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Médias amovibles" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Détails" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "Dé­tails" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Afficher les informations sur le système" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1579,11 +1593,11 @@ #: ../panels/keyboard/01-input-sources.xml.in.h:2 msgid "Switch to next input source" -msgstr "Basculer vers la source suivante" +msgstr "Passer à la source de saisie suivante" #: ../panels/keyboard/01-input-sources.xml.in.h:3 msgid "Switch to previous input source" -msgstr "Basculer vers la source précédente" +msgstr "Passer à la source de saisie précédente" #: ../panels/keyboard/01-launchers.xml.in.h:1 msgid "Launchers" @@ -1593,8 +1607,9 @@ msgid "Launch help browser" msgstr "Démarrer le navigateur d'aide" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Paramètres" @@ -1667,7 +1682,6 @@ msgstr "Verrouiller l'écran" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Accès universel" @@ -1703,11 +1717,21 @@ msgid "High contrast on or off" msgstr "Activer ou désactiver le contraste élevé" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Raccourcis personnalisés" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1735,127 +1759,133 @@ msgstr "" "Avec les touches de modification seules, basculer vers la source suivante" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Clavier" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Réinitialiser le raccourci à sa valeur par défaut" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s est déjà utilisé pour %s. Si vous le remplacez, %s sera désactivé" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Définir un raccourci personnalisé" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Définir un raccourci" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Saisissez un nouveau raccourci pour changer %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Ajouter un raccourci personnalisé" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Cla­vier" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Afficher, modifier les raccourcis clavier et définir vos préférences de " "saisie" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Raccourci;Répétition;Clignotement;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Raccourci personnalisé" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nom :" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "C_ommande :" +msgid "No keyboard shortcut found" +msgstr "Aucun raccourci clavier trouvé" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Ajouter un raccourci" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Supprimer le raccourci" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Pour modifier un raccourci, cliquez sur la ligne et actionnez les nouvelles " -"touches, ou bien pressez « Retour arrière » pour l'effacer." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Raccourcis personnalisés" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Essayez une autre recherche" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Appuyez sur Échap. pour annuler." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Le raccourci « %s » ne peut pas être utilisé parce qu'une saisie avec cette " -"touche deviendrait impossible.\n" -"Veuillez essayer avec une touche telle que Ctrl, Alt ou Maj simultanément." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nom" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Le raccourci clavier « %s » est déjà utilisé pour \n" -"« %s »" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Commande" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Raccourci" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Modifier" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Si vous réassignez le raccourci à « %s », le raccourci « %s » sera désactivé." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Aucun" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Réassigner" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Supprimer" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Saisir le nouveau raccourci" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Le raccourci « %s » est associé à « %s ». Voulez-vous le définir " -"automatiquement à « %s » ?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Annuler" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Comme « %s » est actuellement associé à « %s », ce raccourci sera désactivé " -"si vous continuez." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Ajouter" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Assigner" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Remplacer" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Définir" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Tester vos p_aramètres" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Souris & pavé tactile" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Sou­ris & pavé tac­tile" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Modifier la sensibilité du pavé tactile et choisir entre droitier ou gaucher" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Pavé;Tactile;Pointeur;Clic;Frappe;Double;Bouton;Boule;Défilement;" @@ -1914,6 +1944,10 @@ msgstr "Taper pour cliquer" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Défilement à deux doigts" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Défilement aux bords" @@ -1952,11 +1986,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Mode a_vion" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Serveur mandataire" @@ -1964,19 +1998,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Oups, quelque chose s'est mal passé. Veuillez contacter le fournisseur de " "votre logiciel." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager doit être en fonctionnement." @@ -1992,7 +2026,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2009,59 +2043,64 @@ msgid "page 2" msgstr "page 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sécurité" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatique" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Entreprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Aucune" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Jamais" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2069,179 +2108,179 @@ msgstr[1] "Il y a %i jours" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Aucun" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Faible" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Correct" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Bon" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excellent" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Détails" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identité" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresse" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Masque de réseau" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Passerelle" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Supprimer l'adresse" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Ajouter" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Serveur" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Supprimer le serveur DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Métrique" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Supprimer la route" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatique (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuel" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Réseau local seulement" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:942 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Préfixe" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatique" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatique, DHCP seulement" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Réinitialiser" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Aucune" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" -msgstr "Clé WEP 40/128-bit (Hex or ASCII)" +msgstr "Clé WEP 40/128 bits (Hex ou ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" -msgstr "Phrase de passe WEP 128-bit" +msgstr "Phrase de passe WEP 128 bits" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dynamique (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA et WPA2 privées" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA et WPA2 d'entreprise" @@ -2256,30 +2295,30 @@ msgstr "Vitesse de la connexion" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Adresse IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Adresse IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Adresse matérielle" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2289,7 +2328,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2372,13 +2411,13 @@ msgid "Firewall _Zone" msgstr "_Zone du pare-feu" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Par défaut" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "La zone définit le niveau de confiance de la connexion" @@ -2420,45 +2459,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Impossible d'ouvrir l'éditeur de connexions" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nouveau profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Agrégat (lien)" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Agrégat (équipe)" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Agrégat (pont)" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Impossible de charger les greffons du VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importer depuis un fichier…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Ajouter une connexion réseau" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Ajouter un VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2466,7 +2485,7 @@ msgstr "_Réinitialiser" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Oublier" @@ -2492,11 +2511,11 @@ msgid "S_ecurity" msgstr "Séc_urité" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Impossible d'importer la connexion VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2509,37 +2528,37 @@ "\n" "Erreur : %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Sélectionner le fichier à importer" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Ouvrir" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Un fichier nommé « %s » existe déjà." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Remplacer" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Voulez-vous remplacer %s avec la connexion VPN en cours d'enregistrement ?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Impossible d'exporter la connexion VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2550,7 +2569,7 @@ "\n" "Erreur : %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportation de la connexion VPN" @@ -2577,60 +2596,46 @@ msgid "Make available to _other users" msgstr "Rendre accessible aux _autres utilisateurs" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Réseau" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Ré­seau" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Contrôler votre façon de vous connecter à Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Réseau;Sans fil;Wi-Fi;Wifi;IP;LAN;Mandataire;WAN;Large bande;Modem;Bluetooth;" -"vpn;vlan;pont;lien;liée;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Esclaves de l’agrégat de type « Lien »" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(rien)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Esclaves de l’agrégat de type « Pont »" +"vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "jamais" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "aujourd'hui" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "hier" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Adresse IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Dernière utilisation" @@ -2640,34 +2645,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Filaire" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Options…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Ajouter une nouvelle connexion" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Esclaves de l’agrégat de type « Équipe »" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2675,13 +2671,13 @@ "Si vous disposez d'une connexion filaire vers Internet, vous pouvez créer un " "point d'accès sans fil pour partager votre connexion avec les autres." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Basculer sur le point d'accès sans fil va vous déconnecter de %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2689,24 +2685,24 @@ "Vous ne pouvez pas accéder à Internet par votre connexion sans fil pendant " "que le point d'accès est actif." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Interrompre le point d'accès et déconnecter tous les utilisateurs ?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Interrompre le point d'accès" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Les règles du système interdisent son utilisation comme point d'accès" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "" "Le périphérique sans fil ne prend pas en charge le mode « point d'accès »" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2714,11 +2710,11 @@ "Les informations des réseaux sélectionnés, y compris les mots de passe et " "toute configuration personnalisée seront perdus." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historique" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2726,7 +2722,7 @@ msgstr "_Fermer" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Oublier" @@ -2763,6 +2759,10 @@ msgid "Provider" msgstr "Fournisseur" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Réseau" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2868,16 +2868,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "Mot de _passe" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Aucun" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Afficher le mot de p_asse" @@ -2971,7 +2967,6 @@ msgstr "_Connexion à un réseau masqué…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historique" @@ -2993,360 +2988,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Mot de passe" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructure" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "État inconnu" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Non géré" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Indisponible" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Connexion en cours" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Authentification requise" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Connecté" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Déconnexion en cours" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Échec de la connexion" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "État inconnu (absent)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Non connecté" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Échec de la configuration" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Échec de la configuration IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Configuration IP expirée" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Des éléments secrets, non fournis, étaient nécessaires" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Le client 802.1x s'est déconnecté" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "La configuration du client 802.1x a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Le client 802.1x a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Le client 802.1x a mis trop de temps pour s'authentifier" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Le service PPP n'a pas réussi à démarrer" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Service PPP déconnecté" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Le client DHCP n'a pas réussi à démarrer" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Erreur du client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Le client DHCP a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Le service de connexion partagée n'a pas réussi à démarrer" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Le service de connexion partagée a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Le service autoIP n'a pas réussi à démarrer" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Erreur du service autoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Le service autoIP a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Ligne occupée" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Pas de tonalité" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Aucune porteuse n'a pu être établie" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Délai de numérotation dépassé" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "La tentative de numérotation a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "L'initialisation du modem a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Échec de la sélection de l'APN spécifié" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Aucune recherche de réseau en cours" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Enregistrement au réseau refusé" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Délai dépassé pour l'enregistrement au réseau" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Échec de l'enregistrement au réseau demandé" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "La vérification du code PIN a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Il se peut que le micrologiciel du périphérique manque" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "La connexion a disparu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Une connexion existante a été supposée" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem non trouvé" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "La connexion Bluetooth a échoué" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "La carte SIM n'est pas insérée" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Le code PIN de la SIM est nécessaire" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Le code PUK de la SIM est requis" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Mauvaise SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Le périphérique infiniBand ne prend pas en charge le mode connecté" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "La dépendance de la connexion a échoué" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Micrologiciel absent" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Câble débranché" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Pas de certificat d'autorité de certification choisi" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "erreur de sécurité inconnue dans 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "aucun fichier sélectionné" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"La non utilisation d'un certificat d'autorité de certification (CA) peut " -"conduire à des connexions non sécurisées et à un piratage du réseau Wi-Fi. " -"Voulez-vous choisir un certificat d'autorité de certification ?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorer" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Choisir un certificat CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Clés privées DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "erreur inconnue à la validation du fichier eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Clés privées DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "fichier EAP-FAST PAC manquant" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Choisir un fichier PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Fichiers PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Fichier PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Authentification _interne" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_Obtention de PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3355,41 +3326,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonyme" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Authentifié" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Les deux" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Fichier PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Authentification _interne" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Autoriser l'_obtention automatique de PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "nom d'utilisateur d'EAP-LEAP manquant" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "mot de passe d'EAP-LEAP manquant" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nom d'_utilisateur" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Affi_cher le mot de passe" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "certificat CA d'EAP-PEAP non valide : %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "certificat CA d'EAP-PEAP non valide : aucun certificat spécifié" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Choisir un certificat d'une autorité de certification" @@ -3407,19 +3410,56 @@ msgid "C_A certificate" msgstr "Certificat C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Aucun certificat CA _requis" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Version PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "D_emander ce mot de passe à chaque fois" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "nom d'utilisateur EAP manquant" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "mot de passe EAP manquant" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "identité EAP-TLS manquante" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificat CA EAP-TLS non valide : %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificat CA EAP-TLS non valide : aucun certificat spécifié" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "mot de passe EAP-TLS manquant" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "clé privée EAP-TLS non valide : %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificat utilisateur EAP-TLS non valide : %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Les clés privées non chiffrées ne sont pas fiables" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3433,11 +3473,11 @@ "\n" "(Vous pouvez protéger votre clé par mot de passe avec openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Choisissez votre certificat personnel" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Choisissez votre clé privée" @@ -3449,51 +3489,56 @@ msgid "_User certificate" msgstr "Certificat _utilisateur" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Clé privée" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Mot de passe de la _clé privée" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificat CA EAP-TTLS non valide : %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificat CA EAP-TTLS non valide : aucun certificat spécifié" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Ne plus m'_avertir" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Non" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Oui" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Erreur inconnue à la validation de la sécurité de 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS avec tunnel (TTLS)" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP sécurisé (PEAP)" @@ -3503,6 +3548,50 @@ msgid "Au_thentication" msgstr "Au_thentification" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "nom d'utilisateur leap manquant" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "mot de passe leap manquant" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "clé wep manquante" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"clé wep non valide : une clé de %zu ne doit contenir que des caractères " +"hexadécimaux" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"clé wep non valide : une clé de %zu ne doit contenir que des caractères ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"clé wep non valide : longueur de clé %zu incorrecte. Elle doit être de 5 à " +"13 caractères en ascii ou de 10 à 26 en hexa" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "clé wep non valide : phrase de passe non renseignée" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"clé wep non valide : la phrase de passe doit contenir moins de 64 caractères" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (par défaut)" @@ -3539,19 +3628,34 @@ msgid "WEP inde_x" msgstr "Inde_x WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk non valide : longueur de clé %zu incorrecte. Doit être de [8,63] " +"octets ou 64 caratères hexadécimaux" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk non valide : impossible de considérer une clé de 64 octets comme " +"hexadécimale" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Type" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Activé" @@ -3588,16 +3692,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Afficher le c_ontenu du message sur l'écran verrouillé" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notifications" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Contrôler quelles notifications s'affichent et leur contenu" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifications;Messages surgissants;Message;Tiroir;Popup;" @@ -3615,79 +3720,68 @@ msgid "Applications" msgstr "Applications" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Autre" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Ajouter un compte" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Courriel" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Agenda" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contacts" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Discussion" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Sources" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Erreur de connexion sur le compte" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Vos identifiants ont expiré." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Identifiez-vous pour activer ce compte." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Identification" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Erreur lors de la création du compte" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Erreur lors de la suppression du compte" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Êtes-vous sûr de vouloir effacer le compte ?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Le compte sur le serveur ne sera pas supprimé." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Supprimer" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Comptes en ligne" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Connectez-vous à vos comptes en ligne et décidez de leur utilité" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3700,6 +3794,7 @@ msgstr "Aucun compte en ligne configuré" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Supprimer le compte" @@ -3842,7 +3937,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batterie" @@ -3890,105 +3985,106 @@ msgid "When _idle" msgstr "Quand _inactif" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Économie d'énergie" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Luminosité de l'é_cran" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Luminosité automatique" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Luminosité du _clavier" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "A_ssombrir l'écran si inactif" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Écran _noir" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Désactivez le Wi-Fi pour économiser de l'énergie." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobile à large bande" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Désactivez les périphériques mobiles à large bande (3G, 4G, LTE, etc.) pour " "économiser de l'énergie." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Quand sur batterie" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Quand le câble est branché" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Mettre en veille" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hiberner" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Rien" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Bouton de mise en veille et extinction" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Mise en veille _automatique" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Mise en veille automatique" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Lorsque le bouton d'extinction est enfoncé" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Périphériques" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Énergie" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Éner­gie" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "S'informer sur l'état de la batterie et modifier les paramètres d'économie " "d'énergie" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4067,11 +4163,6 @@ msgid "Delay" msgstr "Délai" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Annuler" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Authentification" @@ -4081,138 +4172,138 @@ msgstr "Authentification requise" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Toner pratiquement épuisé" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Plus de toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Révélateur pratiquement épuisé" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Plus de révélateur" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Cartouche de couleur pratiquement vide" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Cartouche de couleur vide" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Couvercle ouvert" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Porte ouverte" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Pratiquement plus de papier" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Plus de papier" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Hors ligne" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Arrêtée" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Récipient à déchets pratiquement plein" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Récipient à déchets plein" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Le photo-conducteur optique est pratiquement en fin de vie" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Le photo-conducteur optique n'est plus en état" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Configuration en cours" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Prête" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "N'accepte plus de tâche supplémentaire" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Traitement en cours" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Niveau de toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Niveau d'encre" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "État des consommables" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Installation en cours" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4220,15 +4311,15 @@ msgstr[1] "%u actives" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "L'ajout de la nouvelle imprimante a échoué." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Sélectionnez un fichier PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4236,50 +4327,47 @@ "Fichiers de description PostScript de l'imprimante (*.ppd, *.PPD, *.ppd.gz, " "*.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Aucun pilote adéquat trouvé" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Recherche de pilotes préférés…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Sélectionner à partir de la base de données…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Fournir le fichier PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 -msgid "Test page" -msgstr "Page de test" - -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Aucune imprimante" +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 +msgid "Test page" +msgstr "Page de test" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Impossible de charger l'interface utilisateur : %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Imprimantes" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Im­pri­man­tes" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Ajouter des imprimantes, afficher les tâches et décider quand vous voulez " "imprimer" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Imprimante;File;Queue;Impression;Papier;Encre;Toner;" @@ -4441,6 +4529,11 @@ msgid "Parallel Port" msgstr "Port parallèle" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4653,13 +4746,17 @@ msgid "_Options" msgstr "_Options" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Aucune imprimante" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Ajouter une imprimante" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4667,70 +4764,70 @@ "Désolé ! Le service d'impression du système\n" "ne semble pas être disponible." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Verrouillage de l'écran" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "En cours d'utilisation" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Activé" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Désactivé" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Services de localisation" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Utilisation et historique" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Vider complètement la corbeille ?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Tout le contenu de la corbeille sera définitivement supprimé." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Vider la corbeille" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Supprimer tous les fichiers temporaires ?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Tous les fichiers temporaires seront définitivement supprimés." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Purger les fichiers temporaires" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Vider la corbeille et les fichiers temporaires" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Statistiques d'utilisation des logiciels" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Signalement de problèmes" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4740,22 +4837,23 @@ "améliorer %s. Les rapports sont envoyés anonymement et sont épurés de toute " "donnée personnelle." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Politique de confidentialité" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Confidentialité" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Con­fi­den­tia­li­té" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Protéger vos informations personnelles et contrôler ce que d'autres peuvent " "voir" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4921,29 +5019,29 @@ #: ../panels/region/cc-input-chooser.c:182 msgid "No input sources found" -msgstr "Aucune source d'entrée trouvée" +msgstr "Aucune source de saisie trouvée" #: ../panels/region/cc-input-chooser.c:992 msgctxt "Input Source" msgid "Other" msgstr "Autre" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Vous devez redémarrer la session pour que les changements soient effectifs" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Redémarrer maintenant" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" -msgstr "Aucune source d'entrée sélectionnée" +msgstr "Aucune source de saisie sélectionnée" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Écran de conne_xion" @@ -4975,34 +5073,34 @@ msgid "Paper" msgstr "Papier" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Pays & langue" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" -"Sélectionnez la langue, les formats, l'agencement clavier et les sources " -"d'entrées" +"Sélectionnez la langue, les formats, l'agencement clavier et les sources de saisie" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" -msgstr "Langue;Disposition;Clavier;Entrée;" +msgstr "Langue;Disposition;Clavier;Saisie;" #: ../panels/region/input-chooser.ui.h:1 msgid "Add an Input Source" -msgstr "Ajouter une source d'entrée" +msgstr "Ajouter une source de saisie" #: ../panels/region/input-chooser.ui.h:4 msgid "Input methods can't be used on the login screen" msgstr "" -"Les méthodes d'entrée ne peuvent pas être utilisées sur l'écran de connexion" +"Les méthodes de saisie ne peuvent pas être utilisées sur l'écran de connexion" #: ../panels/region/input-options.ui.h:1 msgid "Input Source Options" -msgstr "Options de la source d'entrée" +msgstr "Options de la source de saisie" #: ../panels/region/input-options.ui.h:2 msgid "Use the _same source for all windows" @@ -5045,7 +5143,7 @@ msgstr "Alt de droite+Alt de gauche" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Langue" @@ -5063,31 +5161,31 @@ #: ../panels/region/region.ui.h:5 msgid "Input Sources" -msgstr "Sources d'entrée" +msgstr "Sources de saisie" #: ../panels/region/region.ui.h:7 msgid "Add input source" -msgstr "Ajouter la source d'entrée" +msgstr "Ajouter la source de saisie" #: ../panels/region/region.ui.h:8 msgid "Remove input source" -msgstr "Supprimer la source d'entrée" +msgstr "Retirer la source de saisie" #: ../panels/region/region.ui.h:9 msgid "Move input source up" -msgstr "Déplacer la source d'entrée vers le haut" +msgstr "Monter la source de saisie" #: ../panels/region/region.ui.h:10 msgid "Move input source down" -msgstr "Déplacer la source d'entrée vers le bas" +msgstr "Descendre la source de saisie" #: ../panels/region/region.ui.h:11 msgid "Configure input source" -msgstr "Configurer la source d'entrée" +msgstr "Configurer la source de saisie" #: ../panels/region/region.ui.h:12 msgid "Show input source keyboard layout" -msgstr "Afficher la disposition de clavier de la source d'entrée" +msgstr "Afficher la disposition de clavier de la source de saisie" #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" @@ -5095,26 +5193,11 @@ "Les paramètres de connexion sont utilisés par tous les utilisateurs pour " "accéder au système" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Emplacements" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Signets" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Autre" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Sélectionner un emplacement" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5122,11 +5205,12 @@ msgid "No applications found" msgstr "Aucune application trouvée" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Rechercher" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5134,7 +5218,7 @@ "la vue d'ensemble des activités" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Rechercher;Recherche;Index;Masquer;Confidentialité;Privé;Résultats;" @@ -5142,6 +5226,18 @@ msgid "Search Locations" msgstr "Emplacements de la recherche" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Emplacements" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Signets" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Autre" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Remonter" @@ -5154,6 +5250,11 @@ msgid "Preferences" msgstr "Préférences" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Aucun réseau de partage n'est sélectionné" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5179,21 +5280,55 @@ msgid "Choose a Folder" msgstr "Choisir un dossier" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Le partage de fichiers personnels vous permet de partager votre Dossier " +"public avec les autres sur le réseau actuel en utilisant : dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Lorsque la connexion à distance est activée, tout utilisateur distant peut " +"se connecter à l'aide de cette commande shell sécurisée :\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Le partage d'écran permet aux utilisateurs distants de voir ou contrôler " +"votre écran en se connectant à vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copier" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Partage" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Par­tage" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Contrôler ce que vous souhaitez partager avec les autres" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5201,6 +5336,10 @@ "partage;partager;ssh;hôte;nom;distant;bureau;média;audio;vidéo;images;photos;" "film,serveur;moteur de rendu;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Réseaux" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Activer ou désactiver une connexion distante" @@ -5210,29 +5349,17 @@ msgstr "" "Authentification requise pour activer ou désactiver une connexion distante" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Aucun réseau de partage n'est sélectionné" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Réseaux" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nom de l'_ordinateur" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Partage de fichiers _personnels" +msgid "_File Sharing" +msgstr "Partage de _fichiers" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" -msgstr "Partage de l'é_cran" +msgstr "Partage d'é_cran" #: ../panels/sharing/sharing.ui.h:4 msgid "_Media Sharing" @@ -5247,86 +5374,54 @@ msgstr "Certains services sont désactivés faute d'accès au réseau." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Partage de fichiers personnels" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Le partage de fichiers personnels vous permet de partager votre Dossier " -"public avec les autres sur le réseau actuel en utilisant : dav://%s" +msgid "File Sharing" +msgstr "Partage de fichiers" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Demander le mot de _passe" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Connexion distante" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Tout utilisateur distant doit se connecter à l'aide de cette commande shell " -"sécurisée :\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" -msgstr "Partage de l'écran" - -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Tout utilisateur distant peut voir ou contrôler votre écran en se connectant " -"à : vnc://%s" +msgstr "Partage d'écran" -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Autoriser le contrôle à distance" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Autoriser les connectés à contrôler l'écran" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "Mot de _passe :" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "A_fficher le mot de passe" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" -msgstr "Options d'accés " +msgstr "Options d'accès" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" -msgstr "Les _nouvelles connexions doivent être explicitement validées." +msgstr "Les _nouveaux connectés doivent demander l'autorisation d'accès." -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" -msgstr "Demande_r le mot de passe" +msgstr "Demande_r un mot de passe" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Partage de médias" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Le partage multimédia vous permet d'échanger de la musique, des photos et " -"des vidéos sur le réseau." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Partager de la musique, des photos et des vidéos sur le réseau." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Dossiers" @@ -5337,7 +5432,7 @@ #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2 msgid "Change sound levels, inputs, outputs, and alert sounds" msgstr "" -"Modifier les volumes sonores, les entrées, les sorties et les alertes sonores" +"Modifier les volumes sonores, les saisies, les sorties et les alertes sonores" #. Translators: those are keywords for the sound control-center panel #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4 @@ -5455,11 +5550,6 @@ msgid "Peak detect" msgstr "Détecteur de pics" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nom" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Périphérique" @@ -5554,16 +5644,21 @@ msgid "Subwoofer" msgstr "Caisson de basse" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personnalisée" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Ac­cès uni­ver­sel" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Faciliter la vision, l'écoute, la saisie, la sélection et le clic" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5664,7 +5759,7 @@ msgstr "Touches son" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "Émet un bip lors d'un appui sur les touches Verr. Num. ou Verr. Maj." #: ../panels/universal-access/uap.ui.h:26 @@ -6050,96 +6145,69 @@ msgstr "Effets de couleur" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Ajouter un utilisateur" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Nom complet" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Normal" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrateur" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Nom complet" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Type de compte" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Autoriser l'utilisateur à définir un mot de passe à la prochaine conne_xion" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Définir un mot de passe _maintenant" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Vérifier" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirmer" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Un identifiant d'entreprise autorise l'usage d'un compte utilisateur " -"centralisé sur ce périphérique." +"Un compte d'entreprise autorise l'usage d'un compte utilisateur centralisé à " +"partir de ce périphérique. Il permet aussi d'accéder aux différents sites de " +"la compagnie présents sur Internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domaine" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Aller en ligne pour ajouter\n" -"des comptes identifiants d'entreprise." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Identifiant d'e_ntreprise" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Ajouter un utilisateur" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Inscrire" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Identifiant de l'administrateur du domaine" +msgid "You are Offline" +msgstr "Vous êtes hors ligne" -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." msgstr "" -"Pour utiliser des identifiants d'entreprise, cet ordinateur doit\n" -"être inscrit au domaine. Veuillez demander à votre administrateur\n" -"réseau de saisir son mot de passe du domaine ici." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nom de l'administrateur" +"Vous devez être en ligne pour ajouter des utilisateurs de l'entreprise." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Mot de passe de l'administrateur" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Compte d'e_ntreprise" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6174,7 +6242,7 @@ msgstr "Auriculaire droit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Activer l'identification de connexion par empreinte digitale" @@ -6212,9 +6280,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Connexion;Nom;Empreinte;Avatar;Logo;Visage;Tête;Mot de passe;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Historique de connexion" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Inscrire" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Identifiant de l'administrateur du domaine" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Pour utiliser des identifiants d'entreprise, cet ordinateur doit\n" +"être inscrit au domaine. Veuillez demander à votre administrateur\n" +"réseau de saisir son mot de passe du domaine ici." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nom de l'administrateur" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Mot de passe de l'administrateur" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6237,39 +6328,31 @@ msgstr "Mot de _passe actuel" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" -"Autoriser l'utilisateur à définir un mot de passe à la prochaine connexion" +"Autoriser l'utilisateur à changer son mot de passe à la prochaine connexion" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Définir un mot de passe maintenant" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Ajouter un compte utilisateur" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Supprimer le compte utilisateur" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Ajouter un utilisateur…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Options de connexion" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Connexion a_utomatique" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Connexion par _reconnaissance d'empreintes" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icône utilisateur" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Dernière connexion" @@ -6374,7 +6457,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Mélangez des majuscules, des minuscules et aussi un ou deux nombres." #: ../panels/user-accounts/pw-utils.c:119 @@ -6469,32 +6552,32 @@ msgstr "Erreur inconnue" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Doit correspondre à l'adresse Web de votre fournisseur de compte." +msgid "Should match the web address of your login provider." +msgstr "Doit correspondre à l'adresse Web de votre fournisseur d'accès." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "L'ajout du compte a échoué" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Mots de passe non concordants." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "L'enregistrement du compte a échoué" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Impossible de s'authentifier auprès de ce domaine" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Impossible de joindre ce domaine" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6502,7 +6585,7 @@ "Cet identifiant de connexion ne fonctionne pas.\n" "Veuillez réessayer." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6510,14 +6593,24 @@ "Ce mot de passe de connexion ne fonctionne pas.\n" "Veuillez réessayer." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "La connexion à ce domaine a échoué" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Impossible de trouver ce domaine. Vérifiez son orthographe." +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Normal" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrateur" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6537,15 +6630,15 @@ msgid "Enabled" msgstr "Activé" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Supprimer les empreintes enregistrées ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Supprimer les empreintes" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6553,15 +6646,15 @@ "Souhaitez-vous supprimer les empreintes digitales enregistrées et désactiver " "ainsi ce type de connexion ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Terminé !" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Impossible d'accéder au périphérique « %s »" @@ -6569,17 +6662,17 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "" "Impossible de démarrer la capture d'empreintes avec le périphérique « %s »" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Aucun lecteur d'empreintes digitales n'est accessible" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contactez votre administrateur système pour assistance." @@ -6588,7 +6681,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6597,11 +6690,11 @@ "Pour activer l'authentification par empreintes digitales, vous devez " "enregistrer une de vos empreintes à l'aide du périphérique « %s »." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Sélection du doigt" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Enregistrement des empreintes digitales" @@ -6655,14 +6748,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Fin de session" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Début de session" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "Activité du compte de %s" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Veuillez choisir un autre mot de passe." @@ -6724,7 +6824,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Connexion au domaine %s impossible : %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Autres comptes" @@ -6805,15 +6905,15 @@ msgid "Logged in" msgstr "Connecté" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "La connexion au service des comptes a échoué" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Veuillez vérifier que AccountService est installé et activé." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6821,12 +6921,12 @@ "Pour effectuer les modifications,\n" "cliquez d'abord sur l'icône *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Créer un compte utilisateur" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6834,12 +6934,12 @@ "Pour créer un compte utilisateur,\n" "cliquez d'abord sur l'icône *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Supprimer le compte utilisateur sélectionné" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6847,34 +6947,34 @@ "Pour supprimer le compte utilisateur sélectionné,\n" "cliquez d'abord sur l'icône *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mon compte" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Un utilisateur nommé « %s » existe déjà." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Désolé, ce nom d'utilisateur n'est pas disponible. Veuillez en choisir un " +"autre." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Le nom d'utilisateur est trop long." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Le nom d'utilisateur ne peut pas débuter par « - »." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Un nom d'utilisateur ne peut contenir que des lettres minuscules ou " -"majuscules de a à z, des chiffres et l'un des caractères « . », « - » ou " -"« _ »." +"majuscules de a à z et l'un de ces caractères : . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Ceci est utilisé pour nommer votre dossier personnel et ne peut être modifié." @@ -6965,19 +7065,19 @@ msgid "Button" msgstr "Bouton" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Tablette Wacom" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Ta­blet­te Wa­com" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Associer les boutons et ajuster la sensibilité du stylet des tablettes " "graphiques" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablette;Wacom;Stylet;Gomme;Souris;" @@ -7009,6 +7109,10 @@ msgid "Bluetooth Settings" msgstr "Paramètres du Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablette Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Associer à l'écran…" @@ -7102,22 +7206,22 @@ msgid "Mode Switch #%d" msgstr "Commutateur de mode numéro %d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Bouton gauche numéro %d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Bouton droit numéro %d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Bouton supérieur numéro %d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Bouton inférieur numéro %d" @@ -7194,6 +7298,11 @@ msgid "Tip Pressure Feel" msgstr "Pression ressentie sur la pointe" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Tous les paramètres" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centre de contrôle GNOME" @@ -7250,22 +7359,18 @@ msgid "Quit" msgstr "Quitter" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Tous les paramètres" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personnel" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Matériel" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Système" @@ -7304,5 +7409,138 @@ msgid "Cancel search" msgstr "Interrompre la recherche" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Point d'accès" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Raccourci clavier de %s. Saisissez-en un nouveau pour le modifier." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Pour modifier un raccourci, cliquez sur la ligne et actionnez les " +#~ "nouvelles touches, ou bien pressez « Retour arrière » pour l'effacer." + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Le raccourci « %s » ne peut pas être utilisé parce qu'une saisie avec " +#~ "cette touche deviendrait impossible.\n" +#~ "Veuillez essayer avec une touche telle que Ctrl, Alt ou Maj simultanément." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Le raccourci clavier « %s » est déjà utilisé pour \n" +#~ "« %s »" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Si vous réassignez le raccourci à « %s », le raccourci « %s » sera " +#~ "désactivé." + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Le raccourci « %s » est associé à « %s ». Voulez-vous le définir " +#~ "automatiquement à « %s » ?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Comme « %s » est actuellement associé à « %s », ce raccourci sera " +#~ "désactivé si vous continuez." + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Le périphérique infiniBand ne prend pas en charge le mode connecté" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Pas de certificat d'autorité de certification choisi" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "La non utilisation d'un certificat d'autorité de certification (CA) peut " +#~ "conduire à des connexions non sécurisées et à un piratage du réseau Wi-" +#~ "Fi. Voulez-vous choisir un certificat d'autorité de certification ?" + +#~ msgid "Ignore" +#~ msgstr "Ignorer" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Choisir un certificat CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "D_emander ce mot de passe à chaque fois" + +#~ msgid "Don't _warn me again" +#~ msgstr "Ne plus m'_avertir" + +#~ msgid "No" +#~ msgstr "Non" + +#~ msgid "Yes" +#~ msgstr "Oui" + +#~ msgid "Error logging into the account" +#~ msgstr "Erreur de connexion sur le compte" + +#~ msgid "Credentials have expired." +#~ msgstr "Vos identifiants ont expiré." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Identifiez-vous pour activer ce compte." + +#~ msgid "_Sign In" +#~ msgstr "_Identification" + +#~ msgid "Power" +#~ msgstr "Énergie" + +#~ msgid "Privacy" +#~ msgstr "Confidentialité" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Autre" + +#~ msgid "Personal File Sharing" +#~ msgstr "Partage de fichiers personnels" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Autoriser le contrôle à distance" + +#~ msgid "_Verify" +#~ msgstr "_Vérifier" + +#~ msgid "Login History" +#~ msgstr "Historique de connexion" + +#~ msgid "Add User Account" +#~ msgstr "Ajouter un compte utilisateur" + +#~ msgid "Remove User Account" +#~ msgstr "Supprimer le compte utilisateur" + +#~ msgid "Login Options" +#~ msgstr "Options de connexion" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Un utilisateur nommé « %s » existe déjà." + #~ msgid "Used to determine your geographical location" #~ msgstr "Servent à déterminer votre position géographique" diff -Nru gnome-control-center-3.20.2/po/fur.po gnome-control-center-3.22.1/po/fur.po --- gnome-control-center-3.20.2/po/fur.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/fur.po 2016-09-27 12:37:36.000000000 +0000 @@ -6,10 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-" -"center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-15 19:50+0000\n" -"PO-Revision-Date: 2016-04-16 01:18+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-09 16:44+0200\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.5\n" +"X-Generator: Poedit 1.8.8\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -89,7 +89,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Cjase" @@ -98,28 +98,31 @@ #: ../panels/background/cc-background-chooser-dialog.c:573 #, c-format msgid "You can add images to your %s folder and they will show up here" -msgstr "Al è pussibil zontâ imagjins ae tô cartele %s e a vegnaran mostradis a chi" +msgstr "" +"Al è pussibil zontâ imagjins ae tô cartele %s e a vegnaran mostradis a chi" #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 -#: ../panels/common/language-chooser.ui.h:3 ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/common/language-chooser.ui.h:3 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 ../panels/network/net-device-wifi.c:1481 -#: ../panels/network/network-wifi.ui.h:1 ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 +#: ../panels/network/network-wifi.ui.h:1 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -150,16 +153,17 @@ msgid "Current background" msgstr "Sfont atuâl" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Sfont" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Cambie la tô imagjin di sfont cuntun rivestiment o une foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Rivestiment;Sfont;Scrivanie;Desktop;" @@ -199,40 +203,42 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Stude il cric de modalitât Avion par abilitâ il Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Pie e stude il Bluetooth e conet i tiei dispositîfs" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "condividi;condivision;bluetooth;obex;" #. TRANSLATORS: The user has to attach the sensor to the screen #: ../panels/color/cc-color-calibrate.c:361 msgid "Place your calibration device over the square and press 'Start'" -msgstr "Place il tô dispositîf di calibrazion parsore dal cuadrât e sclice 'Start'" +msgstr "" +"Place il tô dispositîf di calibrazion parsore dal cuadrât e sclice 'Start'" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... #: ../panels/color/cc-color-calibrate.c:367 -msgid "Move your calibration device to the calibrate position and press 'Continue'" +msgid "" +"Move your calibration device to the calibrate position and press 'Continue'" msgstr "" -"Sposte il tô dispositîf di calibrazion su le posizion di calibradure e sclice " -"'Continue'" +"Sposte il tô dispositîf di calibrazion su le posizion di calibradure e " +"sclice 'Continue'" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... #: ../panels/color/cc-color-calibrate.c:373 -msgid "Move your calibration device to the surface position and press 'Continue'" +msgid "" +"Move your calibration device to the surface position and press 'Continue'" msgstr "" "Sposte il tô dispositîf di calibrazion inte posizion di superficie e sclice " "'Continue'" @@ -381,7 +387,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Ducj i file" @@ -408,7 +414,8 @@ #: ../panels/color/cc-color-panel.c:925 msgid "Restart this computer and boot your normal operating system." -msgstr "Torne invie il computer e eseguìs il boot dal abituâl sisteme operatîf." +msgstr "" +"Torne invie il computer e eseguìs il boot dal abituâl sisteme operatîf." #: ../panels/color/cc-color-panel.c:926 msgid "Type the URL into your browser to download and install the profile." @@ -420,7 +427,7 @@ msgstr "Salve Profîl" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Salve" @@ -435,8 +442,8 @@ "The measuring instrument is not detected. Please check it is turned on and " "correctly connected." msgstr "" -"Nol è stât rilevât nissun strument di misure. Controle che al seti piât e tacât te " -"juste maniere." +"Nol è stât rilevât nissun strument di misure. Controle che al seti piât e " +"tacât te juste maniere." #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1373 @@ -539,7 +546,8 @@ msgstr "_Ripie" #. This button returns the user back to the color control panel -#: ../panels/color/color-calibrate.ui.h:8 ../panels/common/language-chooser.ui.h:2 +#: ../panels/color/color-calibrate.ui.h:8 +#: ../panels/common/language-chooser.ui.h:2 #: ../panels/region/format-chooser.ui.h:2 msgid "_Done" msgstr "_Fat" @@ -554,16 +562,19 @@ #: ../panels/color/color.ui.h:2 msgid "" -"Calibration will produce a profile that you can use to color manage your screen. " -"The longer you spend on calibration, the better the quality of the color profile." +"Calibration will produce a profile that you can use to color manage your " +"screen. The longer you spend on calibration, the better the quality of the " +"color profile." msgstr "" -"La calibradure e produsarà un profîl che tu puedis doprâ par gjestî i colôrs dal " -"visôr. Plui tu stâs a calibrâ miôr a sarà la cualitât dal profîl colôr." +"La calibradure e produsarà un profîl che tu puedis doprâ par gjestî i colôrs " +"dal visôr. Plui tu stâs a calibrâ miôr a sarà la cualitât dal profîl colôr." #: ../panels/color/color.ui.h:3 -msgid "You will not be able to use your computer while calibration takes place." +msgid "" +"You will not be able to use your computer while calibration takes place." msgstr "" -"Nol sarà pussibil doprâ il computer fintremai che le calibrazion e je in vore." +"Nol sarà pussibil doprâ il computer fintremai che le calibrazion e je in " +"vore." #. This is the approximate time it takes to calibrate the display. #: ../panels/color/color.ui.h:5 @@ -597,11 +608,11 @@ #: ../panels/color/color.ui.h:13 msgid "" -"Select a display target white point. Most displays should be calibrated to a D65 " -"illuminant." +"Select a display target white point. Most displays should be calibrated to a " +"D65 illuminant." msgstr "" -"Selezione un pont blanc prefissât par il visôr. La plui part dai visôrs a varessin " -"di sedi calibrâts tal illuminant D65." +"Selezione un pont blanc prefissât par il visôr. La plui part dai visôrs a " +"varessin di sedi calibrâts tal illuminant D65." #: ../panels/color/color.ui.h:14 msgid "Profile Whitepoint" @@ -609,19 +620,19 @@ #: ../panels/color/color.ui.h:15 msgid "" -"Please set the display to a brightness that is typical for you. Color management " -"will be most accurate at this brightness level." +"Please set the display to a brightness that is typical for you. Color " +"management will be most accurate at this brightness level." msgstr "" -"Impueste la luminositât dal visôr come chê che tu dopris normalmentri. La gjestion " -"dal colôr e sarà plui precise a chel nivel di luminositât." +"Impueste la luminositât dal visôr come chê che tu dopris normalmentri. La " +"gjestion dal colôr e sarà plui precise a chel nivel di luminositât." #: ../panels/color/color.ui.h:16 msgid "" -"Alternatively, you can use the brightness level used with one of the other profiles " -"for this device." +"Alternatively, you can use the brightness level used with one of the other " +"profiles for this device." msgstr "" -"In alternative al è pussibil doprâ il nivel di luminositât doprât cuntun di chei " -"altris profîi par chest dispositîf." +"In alternative al è pussibil doprâ il nivel di luminositât doprât cuntun di " +"chei altris profîi par chest dispositîf." #: ../panels/color/color.ui.h:17 msgid "Display Brightness" @@ -629,11 +640,11 @@ #: ../panels/color/color.ui.h:18 msgid "" -"You can use a color profile on different computers, or even create profiles for " -"different lighting conditions." +"You can use a color profile on different computers, or even create profiles " +"for different lighting conditions." msgstr "" -"Al è pussibil doprâ un profîl colôr su diviers computer, o ancje creâ profîi par " -"diviersis condizions di iluminazion." +"Al è pussibil doprâ un profîl colôr su diviers computer, o ancje creâ profîi " +"par diviersis condizions di iluminazion." #: ../panels/color/color.ui.h:19 msgid "Profile Name:" @@ -665,15 +676,16 @@ #: ../panels/color/color.ui.h:26 msgid "" -"You may find these instructions on how to use the profile on GNU/" -"Linux, Apple OS X and Microsoft " -"Windows systems useful." -msgstr "" -"A podaressin jessi utii chestis istruzions su ce mût doprâ il profîl su GNU/Linux, Apple OS X e Microsoft Windows." +"You may find these instructions on how to use the profile on GNU/Linux, Apple OS X and Microsoft Windows systems useful." +msgstr "" +"A podaressin jessi utii chestis istruzions su ce mût doprâ il profîl su GNU/Linux, Apple OS X e Microsoft Windows." -#: ../panels/color/color.ui.h:27 ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/color/color.ui.h:27 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Somari" @@ -685,25 +697,27 @@ msgid "_Import File…" msgstr "_Impuarte file..." -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 -#: ../panels/printers/new-printer-dialog.ui.h:3 ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 +#: ../panels/printers/new-printer-dialog.ui.h:3 +#: ../panels/region/input-chooser.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Zonte" #: ../panels/color/color.ui.h:32 msgid "" -"Problems detected. The profile may not work correctly. Show details." +"Problems detected. The profile may not work correctly. Show " +"details." msgstr "" -"Rilevât un probleme. Il profîl al podarès no lavorà ben. Mostre detais." -"" +"Rilevât un probleme. Il profîl al podarès no lavorà ben. Mostre " +"detais." #: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." msgstr "" -"Ogni dispositîf al scugne vê un profîl di colôr inzornât par podê gjestî il colôr." +"Ogni dispositîf al scugne vê un profîl di colôr inzornât par podê gjestî il " +"colôr." #: ../panels/color/color.ui.h:34 msgid "Learn more" @@ -837,16 +851,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Colôr" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 -msgid "Calibrate the color of your devices, such as displays, cameras or printers" -msgstr "Calibre il colôr dai tiei dispositîfs, come visôrs, fotocjamaris o stampantis" +msgid "Co­lor" +msgstr "Co­lôr" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 +msgid "" +"Calibrate the color of your devices, such as displays, cameras or printers" +msgstr "" +"Calibre il colôr dai tiei dispositîfs, come visôrs, fotocjamaris o stampantis" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Colôr;ICC;Profîll;Calibrazion;Stampant;Visôr;Schermi;" @@ -855,7 +872,8 @@ msgstr "Altri..." #: ../panels/common/cc-language-chooser.c:124 -#: ../panels/region/cc-format-chooser.c:271 ../panels/region/cc-input-chooser.c:169 +#: ../panels/region/cc-format-chooser.c:271 +#: ../panels/region/cc-input-chooser.c:169 msgid "More…" msgstr "Altri..." @@ -863,23 +881,23 @@ msgid "No languages found" msgstr "Nissune lenghe cjatade" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Vuê" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Îr" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b %Y" @@ -999,10 +1017,11 @@ msgid "December" msgstr "Dicembar" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" -msgstr "Date e ore" +msgstr "Da­te­ ­e­ ­o­re" #: ../panels/datetime/datetime.ui.h:14 msgid "Hour" @@ -1057,12 +1076,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Cambie date e ore, cussì ancje il fûs orari" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Orloi;Ore;Timp;Date;Fûs;Posizion;Orari;" @@ -1072,206 +1091,225 @@ #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2 msgid "To change time or date settings, you need to authenticate." -msgstr "Par cambiâ lis impostazions de ore e de date al è necessari autenticâsi." +msgstr "" +"Par cambiâ lis impostazions de ore e de date al è necessari autenticâsi." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tapon sierât" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Duplicâts" -#: ../panels/display/cc-display-panel.c:580 ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primari" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 #: ../panels/universal-access/cc-ua-panel.c:615 -#: ../panels/universal-access/cc-ua-panel.c:786 ../panels/universal-access/uap.ui.h:6 +#: ../panels/universal-access/cc-ua-panel.c:786 +#: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Distudât" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secondari" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Disponi visôrs cumbinâts" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Apliche" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Strissine i visôrs par tornâ a disponi" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Ribalte in sens antiorari di 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Ribalte di 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Ribalte in sens orari di 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Dimension" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Rapuart" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Risoluzion" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Juste par TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Frecuence di inzornament" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostre su chest visôr la sbare superiôr e la panoramiche ativitâts" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Visôr secondari" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Unìs chest visôr cuntun altri par creâ un spazi di lavôr in plui" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentazion" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostre dome presentazions e elements multimediâi" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Duplicât" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostre su ducj i doi i visôrs ce che tu âs visibil" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Stude" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "No sta doprâ chest visôr" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Impussibil vê informazions sul schermi" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Dispon visôrs cumbinâts" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Visôrs" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Vi­sôrs" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Sielç ce mût doprâ i visôrs e i proietôrs tacâts" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Proietôr;xrandr;Schermi;Risoluzion;Refresh;Visôr;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "No cognossût" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID di costruzion: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID di costruzion: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Domande ce fâ" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "No sta fâ nie" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Vierç cartele" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Vierç supuart" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Sielç une aplicazion par i CD audio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Sielç une aplicazion par i DVD video" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Sielç une aplicazion di eseguî cuant che al ven tacât un letôr musicâl" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Sielç une aplicazion di eseguî cuant che e ven tacade une fotocjamare" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Sielç une aplicazion par i CD di software" @@ -1280,93 +1318,93 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD audio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Disc Blu-ray vueit" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Disc CD vueit" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Disc DVD vueit" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Disc HD DVD vueit" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disc video Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Letôr e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disc video HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software Windows" -#: ../panels/info/cc-info-panel.c:1435 ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sezion" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Panoramiche" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicazions predefinidis" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Dispositîfs rimovibil" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Detais" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "De­tais" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Mostre informazions su chest sisteme" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" -"device;system;information;memory;processor;version;default;application;preferred;cd;" -"dvd;usb;audio;video;disc;removable;media;autorun;" +"device;system;information;memory;processor;version;default;application;" +"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" msgstr "" -"dispositîf;sisteme;informazions;memorie;procesôr;version;predefinît;aplicazion;" -"preferide;cd;dvd;usb;audio;video;disc;removibil;multimedie;esecuzion;autorun;" +"dispositîf;sisteme;informazions;memorie;procesôr;version;predefinît;" +"aplicazion;preferide;cd;dvd;usb;audio;video;disc;removibil;multimedie;" +"esecuzion;autorun;" #: ../panels/info/info.ui.h:1 msgid "Select how other media should be handled" @@ -1534,8 +1572,9 @@ msgid "Launch help browser" msgstr "Fâs partî il visualizadôr di manuâi" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Impostazions" @@ -1608,7 +1647,6 @@ msgstr "Bloche il schermi" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Acès universâl" @@ -1644,14 +1682,24 @@ msgid "High contrast on or off" msgstr "Ative o disative il contrast elevât" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Scurtis personalizadis" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Disativât" @@ -1675,126 +1723,138 @@ msgid "Modifiers-only switch to next source" msgstr "Dome i \"modificadôrs\" a passin ae sorzint sucessive" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastiere" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Torne met la scurte al so valôr predefinît" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s al è za doprât par %s. Se tu lu rimplacis, %s al vegnarà " +"disabilitât" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Stabilìs la scurte personalizade" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Met la scurte" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Inserìs la gnove scurte di cambiâ %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Zonte scurte personalizade" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tas­tie­re" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" -msgstr "Viôt e cambie la scurte di tastiere e impueste lis preferencis di digjitazion" +msgstr "" +"Viôt e cambie la scurte di tastiere e impueste lis preferencis di digjitazion" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Scurte;Ripet;Lampâ;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Scurte personalizade" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Non:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "C_omant:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Zonte scurte" +msgid "No keyboard shortcut found" +msgstr "Nissune scurte di tastiere cjatade" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Gjave scurte" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press Backspace to " -"clear." -msgstr "" -"Par modificâ une scurte fâs clic su la rie e sclice i gnûfs tascj o sclice " -"«Backspace» par scancelâle." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Scurtis personalizadis" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Prove une ricercje diferente" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Frache Esc par anulâ." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type using " -"this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Nol è pussibil doprâ \"%s\" come scurte parcè che al deventarès impussibil scrivi " -"doprant chest tast.\n" -"Prove dopre in cumbinazion un tast come Ctrl, Alt o Maiusc." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Non" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"La scurte \"%s\" e je za doprade par\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Comant" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Scurte" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Modifiche" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Se tu tornis a assegnâ le scurte a \"%s\", la scurte \"%s\" a vegnarà disativade." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Nissun" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Torne assegne" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Gjave" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Inserìs la gnove scurte" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to automatically " -"set it to \"%s\"?" -msgstr "" -"La scurte \"%s\" e je associade ae scurte \"%s\". Impuestâle in maniere automatiche " -"a \"%s\"?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Anule" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled if you " -"move forward." -msgstr "" -"\"%s\" e je atualmentri associade cun \"%s\", continuant chê scurte e vegnarà " -"disativade." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Zonte" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Assegne" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Rimplace" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Met" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Test _impostazions" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mouse & Touchpad" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 -msgid "Change your mouse or touchpad sensitivity and select right or left-handed" +msgid "Mouse & Touch­pad" +msgstr "Mou­se­ ­&­ ­Touch­pad" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 +msgid "" +"Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" -"Cambie la sensibilitât di mouse e touchpad e selezione se par man diestre o çampe" +"Cambie la sensibilitât di mouse e touchpad e selezione se par man diestre o " +"çampe" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" -"Trackpad;Cursôr;Cursôr;Clic;Tap;Dopli;Boton;Trackball;Cursôr;Scroll;Scoriment;" +"Trackpad;Cursôr;Cursôr;Clic;Tap;Dopli;Boton;Trackball;Cursôr;Scroll;" +"Scoriment;" #: ../panels/mouse/gnome-mouse-properties.ui.h:1 msgid "General" @@ -1850,10 +1910,15 @@ msgstr "Tap par fâ clic" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Scoriment a doi dêts" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Scor tal ôr" -#: ../panels/mouse/gnome-mouse-test.c:130 ../panels/mouse/gnome-mouse-test.ui.h:1 +#: ../panels/mouse/gnome-mouse-test.c:130 +#: ../panels/mouse/gnome-mouse-test.ui.h:1 msgid "Try clicking, double clicking, scrolling" msgstr "Prove a fâ clic, dopli-clic o scori" @@ -1887,11 +1952,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modalitât a_vion" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy di rêt" @@ -1899,17 +1964,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." -msgstr "Orpo, al semee che alc al è lât stuart. Contate il furnidôr di software." +msgstr "" +"Orpo, al semee che alc al è lât stuart. Contate il furnidôr di software." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager al à di jessi in esecuzion." @@ -1925,7 +1991,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1942,61 +2008,64 @@ msgid "page 2" msgstr "pagjine 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sigurece" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatic" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profîl %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nissune" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Mai" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2004,177 +2073,179 @@ msgstr[1] "%i diis indaûr" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nissune" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Debul" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Bon" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Ecelent" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detais" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitât" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Direzion" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Elimine direzion" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Zonte" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Elimine server DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrichis" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Elimine instradament" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatic (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 -#: ../panels/network/network-wifi.ui.h:26 ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 +#: ../panels/network/network-wifi.ui.h:26 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuâl" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Nome Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefìs" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatic" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatic, nome DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reset" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nissune" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Clâf WEP 40/128-bit(Hex o ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Passphrase WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinamic (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2189,29 +2260,32 @@ msgstr "Velocitât colegament" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 -#: ../panels/network/network-simple.ui.h:3 ../panels/network/network-wifi.ui.h:7 -#: ../panels/network/panel-common.c:695 +#: ../panels/network/net-device-ethernet.c:153 +#: ../panels/network/network-simple.ui.h:3 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Direzion IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 -#: ../panels/network/network-mobile.ui.h:4 ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-mobile.ui.h:4 +#: ../panels/network/network-simple.ui.h:4 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Direzion IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 -#: ../panels/network/network-simple.ui.h:2 ../panels/network/network-wifi.ui.h:9 +#: ../panels/network/net-device-ethernet.c:161 +#: ../panels/network/network-simple.ui.h:2 +#: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Direzion Hardware" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 -#: ../panels/network/network-mobile.ui.h:5 ../panels/network/network-simple.ui.h:5 +#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/network-mobile.ui.h:5 +#: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 msgid "Default Route" msgstr "Instradament predefinît" @@ -2219,8 +2293,9 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 -#: ../panels/network/network-mobile.ui.h:6 ../panels/network/network-simple.ui.h:6 +#: ../panels/network/net-device-ethernet.c:167 +#: ../panels/network/network-mobile.ui.h:6 +#: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 msgid "DNS" msgstr "DNS" @@ -2349,45 +2424,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Impussibil vierzi l'editor di conession" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Gnûf profîl" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Impussibil cjamâ i plugin VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Impuarte di file..." -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Zonte conession di rêt" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Zonte VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2395,21 +2450,23 @@ msgstr "_Reset" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 ../panels/network/network-wifi.ui.h:42 +#: ../panels/network/net-device-wifi.c:1536 +#: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Dismentee" #: ../panels/network/connection-editor/reset-page.ui.h:3 msgid "" -"Reset the settings for this network, including passwords, but remember it as a " -"preferred network" +"Reset the settings for this network, including passwords, but remember it as " +"a preferred network" msgstr "" -"Scancele lis impostazions par cheste rêt, comprindudis lis password, ma tegnile " -"come une rêt preferide" +"Scancele lis impostazions par cheste rêt, comprindudis lis password, ma " +"tegnile come une rêt preferide" #: ../panels/network/connection-editor/reset-page.ui.h:4 msgid "" -"Remove all details relating to this network and do not try to automatically connect" +"Remove all details relating to this network and do not try to automatically " +"connect" msgstr "Gjave ducj i detais di cheste rêt e no stâ cirî di coneti in automatic" #: ../panels/network/connection-editor/security-page.ui.h:1 @@ -2417,52 +2474,53 @@ msgid "S_ecurity" msgstr "Sigur_ece" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Impussibil impuartâ la conession VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" -"The file '%s' could not be read or does not contain recognized VPN connection " -"information\n" +"The file '%s' could not be read or does not contain recognized VPN " +"connection information\n" "\n" "Error: %s." msgstr "" -"Impussibil lei il file '%s' o nol ten informazions di conession VPN ricognossudis\n" +"Impussibil lei il file '%s' o nol ten informazions di conession VPN " +"ricognossudis\n" "\n" "Erôr: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Selezione un file di impuartâ" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Vierç" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Un file clamât \"%s\" al esist za." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Rimplace" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Âstu voie di rimplaçâ %s cun le conession VPN che tu stâs salvant?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Impussibil espuartâ la conession VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2473,7 +2531,7 @@ "\n" "Erôr: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Espuarte la conession VPN" @@ -2500,59 +2558,47 @@ msgid "Make available to _other users" msgstr "Rindi disponibil a chei _altris utents" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Rêt" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controle ce mût conetiti a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" -"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;" -"bridge;bond;DNS;" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" +"DNS;" msgstr "" -"Rêt;Network;Wireless;Wi-Fi;Wifi;IP;LANProxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;" -"bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond slave" +"Rêt;Network;Wireless;Cence fîl;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;" +"Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-bond.c:102 ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nissun)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge slave" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "mai" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "vuê" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "îr" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Direzions IP" -#: ../panels/network/net-device-ethernet.c:176 ../panels/network/network-wifi.ui.h:12 +#: ../panels/network/net-device-ethernet.c:172 +#: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Ultime volte doprât" @@ -2561,93 +2607,93 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 -#: ../panels/network/network-ethernet.ui.h:1 ../panels/network/network-simple.ui.h:1 +#: ../panels/network/net-device-ethernet.c:280 +#: ../panels/network/network-ethernet.ui.h:1 +#: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Fîl" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 ../panels/network/network-ethernet.ui.h:3 -#: ../panels/network/network-mobile.ui.h:8 ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 +#: ../panels/network/network-ethernet.ui.h:3 +#: ../panels/network/network-mobile.ui.h:8 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opzions..." -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Zonte gnove conession" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team slave" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1205 msgid "" -"If you have a connection to the Internet other than wireless, you can set up a " -"wireless hotspot to share the connection with others." +"If you have a connection to the Internet other than wireless, you can set up " +"a wireless hotspot to share the connection with others." msgstr "" -"Se tu âs une altre conession a internet oltri a chê wireless, tu puedis impuestâ un " -"hotspot wireless par condividi la conession cun altris." +"Se tu âs une altre conession a internet oltri a chê wireless, tu puedis " +"impuestâ un hotspot wireless par condividi la conession cun altris." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Piant il hotspot wireless tu ti gjavarâs de conession cun %s." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1213 msgid "" -"It is not possible to access the Internet through your wireless while the hotspot " -"is active." +"It is not possible to access the Internet through your wireless while the " +"hotspot is active." msgstr "" -"Al è impussibil conetisi a internet vie wireless fintremai che il hotspost al è " -"atîf." +"Al è impussibil conetisi a internet vie wireless fintremai che il hotspost " +"al è atîf." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Fermâ il hotspot e disconeti ducj i utents?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Ferme Hotspot" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "La politiche di sisteme e proibìs l'ûs come Hotspot" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Il dispositîf wireless nol supuarte la modalitât Hotspot" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1532 msgid "" -"Network details for the selected networks, including passwords and any custom " -"configuration will be lost." +"Network details for the selected networks, including passwords and any " +"custom configuration will be lost." msgstr "" -"A vegnaran pierdûts i detais par lis rêts selezionadis, includût lis password e " -"ogni configurazion personalizade." +"A vegnaran pierdûts i detais par lis rêts selezionadis, includût lis " +"password e ogni configurazion personalizade." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Cronologjie" -#: ../panels/network/net-device-wifi.c:1797 ../panels/printers/options-dialog.ui.h:2 +#: ../panels/network/net-device-wifi.c:1846 +#: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 msgid "_Close" msgstr "_Siere" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Dismentee" #. TRANSLATORS: this is when the use leaves the PAC textbox blank #: ../panels/network/net-proxy.c:67 -msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided." +msgid "" +"Web Proxy Autodiscovery is used when a Configuration URL is not provided." msgstr "" -"La individuazion automatiche dal proxy web e ven doprade cuant che nol ven dât " -"l'URL di configurazion." +"La individuazion automatiche dal proxy web e ven doprade cuant che nol ven " +"dât l'URL di configurazion." #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted #. * network, then anyone else on that network can tell your @@ -2673,6 +2719,10 @@ msgid "Provider" msgstr "Provider" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Rêt" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2779,15 +2829,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Password" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Nissun" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Mostre p_assword" @@ -2837,14 +2883,15 @@ "Reset the settings for this connection to their defaults, but remember as a " "preferred connection." msgstr "" -"Puarte lis impostazions par cheste conession ai valôr predefinîts, ma tegnile come " -"conession predefinide." +"Puarte lis impostazions par cheste conession ai valôr predefinîts, ma " +"tegnile come conession predefinide." #: ../panels/network/network-wifi.ui.h:44 msgid "" -"Remove all details relating to this network and do not try to automatically connect " -"to it." -msgstr "Gjave ducj i detais relatîfs a cheste rêt e no cîr di conetisi in automatic." +"Remove all details relating to this network and do not try to automatically " +"connect to it." +msgstr "" +"Gjave ducj i detais relatîfs a cheste rêt e no cîr di conetisi in automatic." #: ../panels/network/network-wifi.ui.h:45 msgid "reset" @@ -2879,7 +2926,6 @@ msgstr "_Conet a rêt platade..." #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Cronologjie" @@ -2901,360 +2947,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Password" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructure" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Stât no cognossût" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "No gjestît" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "No disponibil" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Daûr a coneti" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Autenticazion necessarie" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Tacât" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Daûr a distacâsi" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Conession falide" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Stât no cognossût (al mancje)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "No tacât" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Configurazion falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Configurazion IP falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Configurazion IP scjadude" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "A jerin domandâts segrets, ma no son stâts dâts" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Supplicant 802.1x distacât" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "configurazion supplicant 802.1x falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Supplicant 802.1x falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Le autenticazion dal supplicant 802.1x e à doprât masse timp" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Inviament dal servizi PPP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "servizi PPP no conetût" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Inviament dal client DHCP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Erôr client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Client DHCP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Inviament dal servizi di conession condividude falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Servizi conession condividude falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Inviament dal servizi AutoIP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Erôr servizi AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Servizi AutoIP falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linie ocupade" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nissun segnâl di clamade" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Impussibil stabilî cualchi puartant" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "La richieste di selezion e je scjadude" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Tentatîf di selezion falît" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Iniziazion modem falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Selezion dal APN specificât falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nissune ricercje di rêts ative" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Regjistrazion rêt neade" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Regjistrazion rêt scjadude" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Regjistrazion falide su le rêt domandade" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Verifiche PIN falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Al podarès mancjâ il firmware dal dispositîf" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Conession sparide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "A je stade considerade la conession esistente" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem no cjatât" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Conession Bluetooth falide" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Schede SIM no inseride" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Si domande codiç PIN de SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Si domande codiç PUK de SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Schede SIM falade/sbaliade" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Il dispositîf InfiniBand nol supuarte la modalitât colegade" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Dipendence de conession falide" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware mancjant" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Fil stacât" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nol è stât sielt nissun certificât di une Autoritât di Certificazion" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "Erôr no definît inte sigurece 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Nissun file selezionât" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections to " -"insecure, rogue Wi-Fi networks. Would you like to choose a Certificate Authority " -"certificate?" -msgstr "" -"Il no doprâ un certificât mitût fûr di une Autoritât di Certificazion (CA) al pues " -"portâ a conessions Wi-Fi no siguris. Sielzi un certificât di une Autoritât di " -"Certificazion?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignore" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Sielç certificât CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Clâfs privadis DER, PEM, o PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "Erôr no specificât tal validâ il file dal metodi eap" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Clâfs privadis DER, PEM, o PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificâts DER o PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "al mancje il file PAC di EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Sielç un file PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "File PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_File PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticazion _interne" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visioning PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3263,41 +3285,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonim" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticât" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ducj i doi" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_File PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticazion _interne" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Permet pro_visioning PAC automatic" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "al mancje il non utent EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "e mancje la password EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Non _utent" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Mostre pass_word" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "CA dal certificât EAP-PEAP no valit: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "CA dal certificât EAP-PEAP no valit: nissun certificât specificât" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Sielç un certificât di une Autoritât di Certificazion" @@ -3315,37 +3369,74 @@ msgid "C_A certificate" msgstr "Certificât C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "No covente la CA dal ce_rtificât" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Version PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Domande cheste password ogni volte" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "al mancje il non utent EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "e mancje la password EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "e mancje la identitât EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "CA dal certificât EAP-TLS no valit: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "CA dal certificât EAP-TLS no valit: nissun certificât specificât" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "password EAP-TLS no valide: e mancje" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "clâf privade EAP-TLS no valide: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificât utent EAP-TLS no valit: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Lis clâfs privadis no cifradis no son siguris" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" -"The selected private key does not appear to be protected by a password. This could " -"allow your security credentials to be compromised. Please select a password-" -"protected private key.\n" +"The selected private key does not appear to be protected by a password. " +"This could allow your security credentials to be compromised. Please select " +"a password-protected private key.\n" "\n" "(You can password-protect your private key with openssl)" msgstr "" -"La clâf privade selezionade no semee jessi protete di une password. Chest al pues " -"comprometi lis propris credenziâi di sigurece. Selezione une clâf privade protete " -"di password.\n" +"La clâf privade selezionade no semee jessi protete di une password. Chest al " +"pues comprometi lis propris credenziâi di sigurece. Selezione une clâf " +"privade protete di password.\n" "\n" "(Al è pussibil protezi lis propris clâfs privadis cun openssl.)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Sielzi il certificât personâl" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Sielzi la clâf privade personâl" @@ -3357,51 +3448,56 @@ msgid "_User certificate" msgstr "Certificât _utent" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Clâf privade" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Password clâf _privade" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "CA dal certificât EAP-TTLS no valit: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "CA dal certificât EAP-TTLS no valit: nissun certificât specificât" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "No stâ visâmi plui" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "No" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sì" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Erôr no cognossût tal validâ la sigurece 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS cun tunnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "PEAP (Protected EAP)" @@ -3411,6 +3507,51 @@ msgid "Au_thentication" msgstr "Au_tenticazion" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "al mancje il non utent leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "e mancje la password leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "e mancje la clâf wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"clâf wep no valide: une clâf di lungjece %zu e scugne contignî nome cifris " +"esadecimâi" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"clâf wep no valide: une clâf di lungjece %zu e scugne contignî nome caratars " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"clâf wep no valide: lungjece %zu de clâf sbaliade. Une clâf e scugne jessi o " +"di lungjece 5/13 (ascii) o 10/26 (esadecimâl)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "clâf wep no valide: la passphrase no pues jessi vueide" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"clâf wep no valide: la passphrase no pues jessi plui curte di 64 caratars" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Predefinît)" @@ -3447,13 +3588,28 @@ msgid "WEP inde_x" msgstr "Indi_ç WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk no valit: lungjece %zu de clâf no valide. E scugne jessi [8,63] " +"bytes o 64 cifris esadecimâi" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk no valit: impussibil interpretâ la clâf di 64 byte come esadecimâl" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Gjenar" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3495,16 +3651,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Mostrâ i c_ontignûts dal messaç sul schermi blocât" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Notifichis" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "No­ti­fi­chis" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controle cualis notifichis mostrâ e ce che a mostrin" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifichis;Banner;Messaç;Tray;Popup;" @@ -3517,97 +3674,88 @@ msgstr "Notifichis sul schermi b_locât" #. List of applications. -#: ../panels/notifications/notifications.ui.h:4 ../panels/privacy/privacy.ui.h:45 -#: ../panels/sound/gvc-mixer-dialog.c:1781 +#: ../panels/notifications/notifications.ui.h:4 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 msgid "Applications" msgstr "Aplicazions" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Altri" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Zonte account" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "E-mail" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendari" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contats" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Risorsis" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Erôr tal jentrâ tal account" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Lis credenziâi a son scjadudis." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Eseguìs acès par abilitâ chest account." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Jentre" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Erôr tal creâ l'account" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Erôr tal gjava l'account" # Metût plurâl par risolvi masculin/feminin -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Sigûrs di volê gjavâ chest account?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "In cheste maniere nol vegnarà gjavât l'account tal server." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Gjave" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Account online" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Ac­count­ ­on­line" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Conet ai tiei account online e decît par ce doprâju" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" msgstr "" -"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Conversazions;Calendari;Mail;E-mail;" -"Email;Pueste;Contat;Contats;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" +"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Conversazions;Calendari;Mail;E-" +"mail;Email;Pueste;Contat;Contats;ownCloud;Kerberos;IMAP;SMTP;Pocket;" +"ReadItLater;" #: ../panels/online-accounts/online-accounts.ui.h:1 msgid "No online accounts configured" msgstr "Nissun account online configurât" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Gjave account" @@ -3750,7 +3898,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batarie" @@ -3798,103 +3946,107 @@ msgid "When _idle" msgstr "Cuant _inatîf" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Risparmi energjetic" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Luminositât dal _schermi" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Luminositât automatiche" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Luminositât de _tastiere" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Scurî il schermi cuant che al è inatîf" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Schermi _neri" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Distude Wi-Fi par sparagnâ curint." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Bande largje _mobil" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Distude bande largje mobil (3G, 4G, LTE, ecc.) par sparagnâ energjie." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Cuant che si dopre la batarie" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Cuant che al è alimentât" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Sospindi" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Ibernâ" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nissune azion" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Sospension e boton par studâ" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Sospension _Automatiche" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Sospension automatiche" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Cuant che si frache il boton Studâ" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositîfs" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Alimentazion" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "A­li­men­ta­zion" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" -msgstr "Mostre il stât de batarie e cambie lis impostazions di sparagn energjetic" +msgstr "" +"Mostre il stât de batarie e cambie lis impostazions di sparagn energjetic" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 -msgid "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" -msgstr "Alimentazion;Sleep;Sospension;Ibernazion;Batarie;Luminositât;Visôr;Dim;DPMS;" +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 +msgid "" +"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" +msgstr "" +"Alimentazion;Sleep;Sospension;Ibernazion;Batarie;Luminositât;Visôr;Dim;DPMS;" #: ../panels/power/power.ui.h:3 msgid "45 minutes" @@ -3968,11 +4120,6 @@ msgid "Delay" msgstr "Ritart" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Anule" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autentiche" @@ -3982,138 +4129,138 @@ msgstr "Autenticazion necessarie" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Toner in esauriment" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Toner esaurît" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Developer in esauriment" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Developer esaurît" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Furnidure toner in esauriment" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Furnidure toner esauride" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Tapon viert" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Sportel viert" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Cjarte in esauriment" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Cjarte esauride" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Fûr rêt" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Ferme" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Bidon scovacis cuasi plen" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Bidon scovacis plen" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Il fotocondutôr otic al sta par terminâ il sô timp di operativitât" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Il fotocondutôr otic nol funzione plui" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "In configurazion" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Pronte" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "No acete lavôrs" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "In elaborazion" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nivel toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nivel ingjustri" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nivel consumabii" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instalazion" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4121,62 +4268,61 @@ msgstr[1] "%u atîfs" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Zonte de gnove stampant falide." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Selezione file PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" -"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" +"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." +"PPD.GZ)" msgstr "" -"File PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" +"File PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD." +"GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nissun driver adat cjatât" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Ricercje driver preferîts..." -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Selezione dal database..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Furnìs file PPD..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Pagjine di test" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Nissune stampant" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Impussibil cjariâ la interface: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Stampantis" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Stam­pan­tis" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Zonte stampantis, mostre i lavôrs di stampe e decît ce mût stampâ" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Stampant;Code;Stampe;Cjarte;Ingjustri;Toner;" @@ -4338,6 +4484,11 @@ msgid "Parallel Port" msgstr "Puarte paralele" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4548,13 +4699,17 @@ msgid "_Options" msgstr "_Opzions" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Nissune stampant" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Zonte une stampant" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4562,99 +4717,102 @@ "Il servizi di sisteme pe stampe\n" "al semee no jessi disponibil." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Bloc schermi" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "In ûs" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "On" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Off" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Servizis su la posizion" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Ûs e Cronologjie" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Disvuedâ le scovacere?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." -msgstr "Ducj i elements te scovacere a vegnaran eliminâts in maniere definitive." +msgstr "" +"Ducj i elements te scovacere a vegnaran eliminâts in maniere definitive." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Dis_vuede scovacere" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" -msgstr "Eliminâ ducj i file temporaniis?" +msgstr "Eliminâ ducj i file temporanis?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." -msgstr "Ducj i file temporaniis a vegnaran eliminâts in maniere definitive." +msgstr "Ducj i file temporanis a vegnaran eliminâts in maniere definitive." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" -msgstr "_Nete file temporaniis" +msgstr "_Nete file temporanis" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" -msgstr "Nete scovacere e file temporaniis" +msgstr "Nete scovacere e file temporanis" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Utilizazion software" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Segnalazion problemis" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data." msgstr "" -"Inviant lis segnalazions nus permet di miorâ %s. Lis segnalazions a vegnin inviadis " -"in anonim e cualsisei dât personâl al ven prime eliminât." +"Inviant lis segnalazions nus permet di miorâ %s. Lis segnalazions a vegnin " +"inviadis in anonim e cualsisei dât personâl al ven prime eliminât." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Informative su le privacy" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privacy" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Pri­va­cy" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" -"Protêç lis propris informazions personâi e controle ce che i altris a puedin viodi" +"Protêç lis propris informazions personâi e controle ce che i altris a puedin " +"viodi" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" -"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;" -"identity;" +"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" +"network;identity;" msgstr "" -"schermi;visôr;bloc;diagnostiche;crash;privât;recent;temporani;tmp;indiç;non;rêt;" -"identitât;" +"schermi;visôr;bloc;diagnostiche;crash;privât;recent;temporani;tmp;indiç;non;" +"rêt;identitât;" #: ../panels/privacy/privacy.ui.h:1 msgid "Screen Turns Off" @@ -4706,11 +4864,11 @@ #: ../panels/privacy/privacy.ui.h:20 msgid "" -"Remembering your history makes things easier to find again. These items are never " -"shared over the network." +"Remembering your history makes things easier to find again. These items are " +"never shared over the network." msgstr "" -"Tegnî une cronologjie al fâs diventâ plui facil cjatâ ce che al covente. Chescj " -"elements no saran mai condividûts in rêt." +"Tegnî une cronologjie al fâs diventâ plui facil cjatâ ce che al covente. " +"Chescj elements no saran mai condividûts in rêt." #: ../panels/privacy/privacy.ui.h:21 msgid "_Recently Used" @@ -4742,11 +4900,11 @@ #: ../panels/privacy/privacy.ui.h:30 msgid "" -"Automatically purge the Trash and temporary files to help keep your computer free " -"of unnecessary sensitive information." +"Automatically purge the Trash and temporary files to help keep your computer " +"free of unnecessary sensitive information." msgstr "" -"Nete in automatic la scovacere e i file temporaniis par tegnî il computer libar di " -"informazions sensibilis no necessaris." +"Nete in automatic la scovacere e i file temporanis par tegnî il computer " +"libar di informazions sensibilis no necessaris." #: ../panels/privacy/privacy.ui.h:31 msgid "Automatically empty _Trash" @@ -4754,7 +4912,7 @@ #: ../panels/privacy/privacy.ui.h:32 msgid "Automatically purge Temporary _Files" -msgstr "Nete in automatic i file _temporaniis" +msgstr "Nete in automatic i file _temporanis" #: ../panels/privacy/privacy.ui.h:33 msgid "Purge _After" @@ -4762,17 +4920,18 @@ #: ../panels/privacy/privacy.ui.h:37 msgid "" -"Sending us information about which software you use helps us provide you with more " -"accurate recommendations. It also helps us to improve our software.\n" +"Sending us information about which software you use helps us provide you " +"with more accurate recommendations. It also helps us to improve our " +"software.\n" "\n" -"All the information we collect is made anonymous, and we will never share your data " -"with third parties." +"All the information we collect is made anonymous, and we will never share " +"your data with third parties." msgstr "" -"Inviâ informazions sul software doprât nus jude a furnî conseis plui precîs e a " -"miorâ il stes software.\n" +"Inviâ informazions sul software doprât nus jude a furnî conseis plui precîs " +"e a miorâ il stes software.\n" "\n" -"Dutis lis informazions a vegnin cjapadis in maniere anonime: chei dâts no vegnaran " -"mai condividûts cun tiercis parts." +"Dutis lis informazions a vegnin cjapadis in maniere anonime: chei dâts no " +"vegnaran mai condividûts cun tiercis parts." #: ../panels/privacy/privacy.ui.h:40 msgid "_Send software usage statistics" @@ -4780,8 +4939,8 @@ #: ../panels/privacy/privacy.ui.h:43 msgid "" -"Location services allow applications to know your location. Using Wi-Fi and mobile " -"broadband increases accuracy." +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." msgstr "" "I servizis su la localizazion a permetin a lis aplicazions di cognossi la tô " "posizion. Doprant il Wi-Fi e la bande largje mobil e aumente la precision." @@ -4817,21 +4976,21 @@ msgid "Other" msgstr "Altri" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Al è necessari tornâ a inviâ la session par aplicâ lis modifichis" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Torne invie cumò" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nissune sorzint input selezionade" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Schermade di acès" @@ -4863,18 +5022,20 @@ msgid "Paper" msgstr "Cjarte" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Regjon e lenghe" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 -msgid "Select your display language, formats, keyboard layouts and input sources" +msgid "Re­gion & Lan­guage" +msgstr "Re­gjon­ ­e­ ­len­ghe" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 +msgid "" +"Select your display language, formats, keyboard layouts and input sources" msgstr "" -"Selezione la lenghe doprade, i formâts, lis disposizions de tastiere e lis sorzints " -"input" +"Selezione la lenghe doprade, i formâts, lis disposizions de tastiere e lis " +"sorzints input" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Lenghe;Disposizion;Layout;Tastiere;Input;" @@ -4931,7 +5092,7 @@ msgstr "Alt diestri + çampe" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Lenghe" @@ -4978,29 +5139,14 @@ #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" msgstr "" -"Lis impostazions di acès a vegnin dopradis di ducj i utents cuant che a fasin il " -"login" - -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Risorsis" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Segnelibris" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Altri" +"Lis impostazions di acès a vegnin dopradis di ducj i utents cuant che a " +"fasin il login" -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Selezione posizion" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5008,17 +5154,20 @@ msgid "No applications found" msgstr "Nissune aplicazion cjatade" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Cîr" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 -msgid "Control which applications show search results in the Activities Overview" +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 +msgid "" +"Control which applications show search results in the Activities Overview" msgstr "" -"Controle cualis aplicazions a mostrin risultâts di ricercje te panoramiche ativitâts" +"Controle cualis aplicazions a mostrin risultâts di ricercje te panoramiche " +"ativitâts" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Cîr;Cjate;Indiç;Plate;Privacy;Risultâts;" @@ -5026,6 +5175,18 @@ msgid "Search Locations" msgstr "Posizions di ricercje" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Risorsis" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Segnelibris" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Altri" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Sposte in sù" @@ -5038,12 +5199,18 @@ msgid "Preferences" msgstr "Preferencis" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nissune rêt selezionade pe condivision" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" msgstr "On" -#: ../panels/sharing/cc-sharing-panel.c:265 ../panels/sharing/cc-sharing-panel.c:292 +#: ../panels/sharing/cc-sharing-panel.c:265 +#: ../panels/sharing/cc-sharing-panel.c:292 msgctxt "service is disabled" msgid "Off" msgstr "Off" @@ -5065,51 +5232,62 @@ #: ../panels/sharing/cc-sharing-panel.c:680 #, c-format msgid "" -"Personal File Sharing allows you to share your Public folder with others on your " -"current network using: dav://%s" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" msgstr "" -"La condivision di file personâi e permet di condividi cun altris la proprie cartele " -"Publics su le rêt atuâl doprant: dav://%s" +"La condivision di file personâi e permet di condividi cun altris la proprie " +"cartele Publics su le rêt atuâl doprant: dav://%s" #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Permet a utents rimots di tacâsi doprant il comant Secure Shell:\n" +"Cuant che il login rimot al è abilitât, i utents rimots a puedin tacâsi " +"doprant il comant Secure Shell:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Permet a utent rimots di viodi o controlâ il propri schermi tacantsi a vnc://%s" +"La condivision dal visôr e permet ai utents rimots di viodi o controlâ il to " +"schermi tacantsi a vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copie" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Condivision" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Con­di­vi­sion" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controle ce che si vûl condividi cun altris" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" -"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;movies;" -"server;renderer;" +"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" +"movies;server;renderer;" msgstr "" -"condivision;share;ssh;host;non;rimot;desktop;scritori;medie;multimedie;audio;video;" -"imagjins;fotos;film;servidôr;server;renderer;" +"condivision;share;ssh;host;non;rimot;desktop;scritori;medie;multimedie;audio;" +"video;imagjins;fotos;film;servidôr;server;renderer;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Rêts" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5119,25 +5297,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "Al è necessari autenticâsi par abilitâ o no abilitâ l'acès rimot" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nissune rêt selezionade pe condivision" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Rêts" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Non _computer" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Condivision file _personâi" +msgid "_File Sharing" +msgstr "Condivision _file" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5156,8 +5322,8 @@ msgstr "Cualchi servizi nol è abilitât parcè che nol è acès di rêt." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Condivision file personâi" +msgid "File Sharing" +msgstr "Condivision file" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5172,8 +5338,8 @@ msgstr "Condivision schermi" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "_Permet control rimot" +msgid "_Allow connections to control the screen" +msgstr "_Permet conessions par controlâ il visôr" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5200,10 +5366,8 @@ msgstr "Condivision multimediâl" #: ../panels/sharing/sharing.ui.h:19 -msgid "Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"La condivision des risorsis multimediâi e permet di condividi musiche, foto e video " -"su le rêt." +msgid "Share music, photos and videos over the network." +msgstr "Condivît musiche, fotos e video su la rêt." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5220,7 +5384,8 @@ #. Translators: those are keywords for the sound control-center panel #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;" -msgstr "Schede;Microfon;Volum;Sfantâ;Belançament;Bluetooth;Auricolâr;Scufis;Sun;" +msgstr "" +"Schede;Microfon;Volum;Sfantâ;Belançament;Bluetooth;Auricolâr;Scufis;Sun;" #. Translators: This is the name of an audio file that sounds like the bark of a dog. #. You might want to translate it into the equivalent words of your language. @@ -5333,11 +5498,6 @@ msgid "Peak detect" msgstr "Rilevament pic" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Non" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositîf" @@ -5423,7 +5583,8 @@ msgid "Stop" msgstr "Ferme" -#: ../panels/sound/gvc-speaker-test.c:231 ../panels/sound/gvc-speaker-test.c:343 +#: ../panels/sound/gvc-speaker-test.c:231 +#: ../panels/sound/gvc-speaker-test.c:343 msgid "Test" msgstr "Test" @@ -5435,19 +5596,24 @@ msgid "Custom" msgstr "Personalizât" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "A­cès­ ­u­ni­ver­sâl" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Al fâs diventâ plui facil viodi, sintî, digjitâ e fâ clic" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" msgstr "" -"Tastiere;Mouse;ally;Acessibilitât;Contrast;Ingrandiment;Zoom;Screen;Reader;Letôr;" -"schermi; test;font;gjenar di caratar;dimension;AccessX;Tascj;Singui;Sticky;Lents;" -"Slow;Sbalçâts;Bounce;Slow;Mouse;" +"Tastiere;Mouse;ally;Acessibilitât;Contrast;Ingrandiment;Zoom;Screen;Reader;" +"Letôr;schermi; test;font;gjenar di caratar;dimension;AccessX;Tascj;Singui;" +"Sticky;Lents;Slow;Sbalçâts;Bounce;Slow;Mouse;" #: ../panels/universal-access/uap.ui.h:1 msgid "_Always Show Universal Access Menu" @@ -5539,8 +5705,9 @@ msgstr "Sun tascj" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Fâs un sun cuant che BlocNum o BlocMaiusc a vegnin ativâts." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Fâs un sun cuant che BlocNum o BlocMaiusc a vegnin ativâts o disativâts." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5921,95 +6088,67 @@ msgstr "Efiets colôr" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Zonte utent" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Non _complet" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Normâl" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Aministradôr" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Non _complet" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Gjenar di account" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Permet al utent di impostâ une password al prossim _acès" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Imposte une password _cumò" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verifiche" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Conferme" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" -"Enterprise login allows an existing centrally managed user account to be used on " -"this device." +"Enterprise login allows an existing centrally managed user account to be " +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "L'acès enterprise al permet di doprâ su chest dispositîf un account utent za " -"esistent ministrât in maniere centrâl." +"esistent ministrât in maniere centrâl. Tu puedis ancje doprâ chest account " +"par jentrâ tes risorsis de compagnie su internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domini" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Lâ online par zontâ\n" -"account di acès enterprise." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Account _enterprise" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Zonte utent" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Regjistre" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Acès aministradôr domini" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Par podê doprâ i acès aziendâi, il computer al à di sedi\n" -" regjistrât tal domini. Domandâ al aministradôr di rêt\n" -"di scrivi la password pal domini in chest cjamp." +msgid "You are Offline" +msgstr "Tu sês fûr rêt" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Non aministradôr" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Tu scugnis jessi in rêt par zontâ utents enterprise." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Password aministradôr" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Account _enterprise" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6044,7 +6183,7 @@ msgstr "Dêt piçul diestri" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Abilite acès cun impronte" @@ -6062,11 +6201,11 @@ #: ../panels/user-accounts/data/account-fingerprint.ui.h:13 msgid "" -"Your fingerprint was successfully saved. You should now be able to log in using " -"your fingerprint reader." +"Your fingerprint was successfully saved. You should now be able to log in " +"using your fingerprint reader." msgstr "" -"La tô impronte digjitâl e je stade salvade. Cumò tu puedis jentrâ doprant il letôr " -"di improntis." +"La tô impronte digjitâl e je stade salvade. Cumò tu puedis jentrâ doprant il " +"letôr di improntis." #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1 msgid "Users" @@ -6081,9 +6220,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Login;Acès;Non;Impronte;Avatar;Logo;Muse;Password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Cronologjie acès" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Regjistre" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Acès aministradôr domini" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Par podê doprâ i acès aziendâi, il computer al à di sedi\n" +" regjistrât tal domini. Domandâ al aministradôr di rêt\n" +"di scrivi la password pal domini in chest cjamp." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Non aministradôr" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Password aministradôr" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6106,38 +6268,30 @@ msgstr "_Password atuâl" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Permet al utent di impostâ une password al prossim acès" +msgid "Allow user to change their password on next login" +msgstr "Permet al utent di cambiâ la sô password al prossim acès" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Imposte une password cumò" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Zonte account utent" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Gjave account utent" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Zonte utent..." #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opzions di acès" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Acès automatic" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Acès cun impronte" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icone utent" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Ultin acès" @@ -6222,11 +6376,11 @@ #: ../panels/user-accounts/pw-utils.c:111 msgctxt "Password hint" msgid "" -"Try to avoid repeating the same type of character: you need to mix up letters, " -"numbers and punctuation." +"Try to avoid repeating the same type of character: you need to mix up " +"letters, numbers and punctuation." msgstr "" -"Cîr di evitâ di ripeti il stes gjenar di caratar: tu scugnis miscliçâ letaris, " -"numars e ponts." +"Cîr di evitâ di ripeti il stes gjenar di caratar: tu scugnis miscliçâ " +"letaris, numars e ponts." #: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" @@ -6240,37 +6394,44 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Misture letaris maiusculis e minusculis e dopre un numar o doi." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Misture letaris maiusculis e minusculis e cîr di doprâ un numar o doi." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" msgid "" -"Good password! Adding more letters, numbers and punctuation will make it stronger." +"Good password! Adding more letters, numbers and punctuation will make it " +"stronger." msgstr "" -"Password buine! Zontâ plui letaris, numars e ponts le fasarà diventâ plui robuste." +"Password buine! Zontâ plui letaris, numars e ponts le fasarà diventâ plui " +"robuste." -#: ../panels/user-accounts/pw-utils.c:141 ../panels/user-accounts/pw-utils.c:171 +#: ../panels/user-accounts/pw-utils.c:141 +#: ../panels/user-accounts/pw-utils.c:171 msgctxt "Password strength" msgid "Strength: Weak" msgstr "Robustece: Debule" -#: ../panels/user-accounts/pw-utils.c:145 ../panels/user-accounts/pw-utils.c:172 +#: ../panels/user-accounts/pw-utils.c:145 +#: ../panels/user-accounts/pw-utils.c:172 msgctxt "Password strength" msgid "Strength: Low" msgstr "Robustece: Basse" -#: ../panels/user-accounts/pw-utils.c:148 ../panels/user-accounts/pw-utils.c:173 +#: ../panels/user-accounts/pw-utils.c:148 +#: ../panels/user-accounts/pw-utils.c:173 msgctxt "Password strength" msgid "Strength: Medium" msgstr "Robustece: Medie" -#: ../panels/user-accounts/pw-utils.c:151 ../panels/user-accounts/pw-utils.c:174 +#: ../panels/user-accounts/pw-utils.c:151 +#: ../panels/user-accounts/pw-utils.c:174 msgctxt "Password strength" msgid "Strength: Good" msgstr "Robustece: Buine" -#: ../panels/user-accounts/pw-utils.c:154 ../panels/user-accounts/pw-utils.c:175 +#: ../panels/user-accounts/pw-utils.c:154 +#: ../panels/user-accounts/pw-utils.c:175 msgctxt "Password strength" msgid "Strength: High" msgstr "Robustece: Alte" @@ -6325,32 +6486,32 @@ msgstr "Erôr no cognossût" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Al varès di corispuindi ae direzion web dal propri account provider." +msgid "Should match the web address of your login provider." +msgstr "Al varès di corispuindi ae direzion web dal to furnidôr di acès." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Zonte dal account falide" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Lis password no corispuindin." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Regjistrazion account falide" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nissun mût supuartât par autenticâsi cun chest domini" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Falît a unîsi al domini" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6358,7 +6519,7 @@ "Non di acès no valit.\n" "Prove une altre volte." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6366,53 +6527,67 @@ "Password no valide.\n" "Prove une altre volte." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Acès al domini falît" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Impussibil cjatâ il domini. Forsit al è stât scrit mâl." -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 -msgid "You are not allowed to access the device. Contact your system administrator." -msgstr "L'acès al dispositîf nol è permetût. Contatâ l'aministradôr di sisteme." +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Normâl" -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Aministradôr" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 +msgid "" +"You are not allowed to access the device. Contact your system administrator." +msgstr "" +"L'acès al dispositîf nol è permetût. Contatâ l'aministradôr di sisteme." + +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "Il dispositîf al è za in ûs." -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Al è vignût fûr un erôr interni." -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Abilitât" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Eliminâ lis improntis digjitâi regjistradis?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Elimine improntis" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" -"Do you want to delete your registered fingerprints so fingerprint login is disabled?" +"Do you want to delete your registered fingerprints so fingerprint login is " +"disabled?" msgstr "" -"Eliminâ lis improntis digjitâi regjistradis cussì di disabilitâ l'acès vie impronte?" +"Eliminâ lis improntis digjitâi regjistradis cussì di disabilitâ l'acès vie " +"impronte?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Fat!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Impussibil acedi al dispositîf '%s'" @@ -6420,16 +6595,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Impussibil tacâ la cature de impronte sul dispositîf '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "No rivi a acedi a nissun letôr di improntis digjitâi" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contatâ l'aministradôr di sisteme par vê jutori." @@ -6438,20 +6613,20 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" -"To enable fingerprint login, you need to save one of your fingerprints, using the " -"'%s' device." +"To enable fingerprint login, you need to save one of your fingerprints, " +"using the '%s' device." msgstr "" -"Par abilitâ l'acès vie impronte digjitâl al covente salvâ une proprie impronte " -"digjitâl doprant il dispositîf '%s'." +"Par abilitâ l'acès vie impronte digjitâl al covente salvâ une proprie " +"impronte digjitâl doprant il dispositîf '%s'." -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Sielç dêt" -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Regjistre impronte" @@ -6505,14 +6680,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Fin session" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Inizi session" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Ativitât dal account" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Sielç une altre password." @@ -6574,7 +6756,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Impussibil tacâsi al domini %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Altris account" @@ -6599,11 +6781,11 @@ #: ../panels/user-accounts/um-user-panel.c:687 msgid "" -"Deleting a user while they are logged in can leave the system in an inconsistent " -"state." +"Deleting a user while they are logged in can leave the system in an " +"inconsistent state." msgstr "" -"Eliminâ un utent intant che la sô session e je ancjemò in cors, al pues lassâ il " -"sisteme in stât incoerent." +"Eliminâ un utent intant che la sô session e je ancjemò in cors, al pues " +"lassâ il sisteme in stât incoerent." #: ../panels/user-accounts/um-user-panel.c:696 #, c-format @@ -6612,11 +6794,11 @@ #: ../panels/user-accounts/um-user-panel.c:700 msgid "" -"It is possible to keep the home directory, mail spool and temporary files around " -"when deleting a user account." +"It is possible to keep the home directory, mail spool and temporary files " +"around when deleting a user account." msgstr "" -"Al è pussibil tegnî la cartele home, i spool di pueste e i varis file temporaniis " -"cuant che si elimine un account utent." +"Al è pussibil tegnî la cartele home, i spool di pueste e i varis file " +"temporanis cuant che si elimine un account utent." #: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" @@ -6654,15 +6836,15 @@ msgid "Logged in" msgstr "Acès eseguît" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Comunicazion cun servizi account falide" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Sigurâsi che AccountService al sedi instalât e abilitât." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6670,12 +6852,12 @@ "Par aplicâ cambiaments,\n" "fâs prime clic su le icone *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Cree un account utent" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6683,12 +6865,12 @@ "Par creâ un account utent,\n" "fas prime clic su le icone *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Elimine l'account utent selezionât" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6696,37 +6878,36 @@ "Par eliminâ l'account utent selezionât,\n" "fâs prime clic su le icone *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Account personâl" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Un utent cul non utent '%s' al esist za." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Mi displâs, chel non utent nol è disponibil. Prove cuntun altri." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Il non utent al è masse lunc." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Il non utent nol pues tacâ cuntun '-'." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, digits " -"and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Il non utent al à di sedi formât di letaris maiusculis e minusculis (de A ae Z), " -"numars e caratars '.', '-', '_'." +"Il non utent al à di jessi formât di letaris maiusculis e minusculis (de A " +"ae Z), numars e dai caratars chi daurman: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" -"Al vegnarà doprât par dâ un non ae tô cartele cjase (home) e nol podarâ jessi " -"cambiât." +"Al vegnarà doprât par dâ un non ae tô cartele cjase (home) e nol podarâ " +"jessi cambiât." #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" @@ -6741,16 +6922,17 @@ "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." msgstr "" -"Par modificâ une scurte, sielzi la azion \"Invie pression tascj\", scliçâ il boton " -"scurte de tastiere e tignî scliçâts i gnûfs tascj, o se no scliçâ Backspace par " -"scancelâle." +"Par modificâ une scurte, sielzi la azion \"Invie pression tascj\", scliçâ il " +"boton scurte de tastiere e tignî scliçâts i gnûfs tascj, o se no scliçâ " +"Backspace par scancelâle." #: ../panels/wacom/calibrator/calibrator-gui.c:83 msgid "" -"Please tap the target markers as they appear on screen to calibrate the tablet." +"Please tap the target markers as they appear on screen to calibrate the " +"tablet." msgstr "" -"Fâs \"tap\" sui segnepuest cuant che a vegnin fûr sul visôr par calibrâ la taulete " -"grafiche." +"Fâs \"tap\" sui segnepuest cuant che a vegnin fûr sul visôr par calibrâ la " +"taulete grafiche." #: ../panels/wacom/calibrator/calibrator-gui.c:87 msgid "Mis-click detected, restarting..." @@ -6813,19 +6995,19 @@ msgid "Button" msgstr "Boton" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Taulute Wacom" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Tau­lu­te­ ­Wa­com" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Imposte la mapadure dai botons e juste la sensibilitât de pene pe taulutis " "grafichis." #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;Taulete;Pene;Gome;" @@ -6857,6 +7039,10 @@ msgid "Bluetooth Settings" msgstr "Impostazions Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Taulute Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mape su visôr..." @@ -7042,6 +7228,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilitât de ponte" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Dutis lis impostazions" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centri di control GNOME" @@ -7052,11 +7243,11 @@ #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3 msgid "" -"The control center is GNOME's main interface for configuration of various aspects " -"of your desktop." +"The control center is GNOME's main interface for configuration of various " +"aspects of your desktop." msgstr "" -"Il centri di control GNOME e je la interface principâl par configurâ l'ambient " -"grafic." +"Il centri di control GNOME e je la interface principâl par configurâ " +"l'ambient grafic." #: ../shell/cc-application.c:45 msgid "Display version number" @@ -7098,22 +7289,18 @@ msgid "Quit" msgstr "Jes" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Dutis lis impostazions" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personâl" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sisteme" @@ -7152,6 +7339,194 @@ msgid "Cancel search" msgstr "Anule ricercje" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Scurte di tastiere par %s. Inserìs une gnove scurte par cambiâle." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Par modificâ une scurte fâs clic su la rie e sclice i gnûfs tascj o " +#~ "sclice «Backspace» par scancelâle." + +#~ msgid "Error logging into the account" +#~ msgstr "Erôr tal jentrâ tal account" + +#~ msgid "Credentials have expired." +#~ msgstr "Lis credenziâi a son scjadudis." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Eseguìs acès par abilitâ chest account." + +#~ msgid "_Sign In" +#~ msgstr "_Jentre" + +#~ msgid "_Name:" +#~ msgstr "_Non:" + +#~ msgid "Add Shortcut" +#~ msgstr "Zonte scurte" + +#~ msgid "Remove Shortcut" +#~ msgstr "Gjave scurte" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Nol è pussibil doprâ \"%s\" come scurte parcè che al deventarès " +#~ "impussibil scrivi doprant chest tast.\n" +#~ "Prove dopre in cumbinazion un tast come Ctrl, Alt o Maiusc." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "La scurte \"%s\" e je za doprade par\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Se tu tornis a assegnâ le scurte a \"%s\", la scurte \"%s\" a vegnarà " +#~ "disativade." + +#~ msgid "_Reassign" +#~ msgstr "_Torne assegne" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "La scurte \"%s\" e je associade ae scurte \"%s\". Impuestâle in maniere " +#~ "automatiche a \"%s\"?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" e je atualmentri associade cun \"%s\", continuant chê scurte e " +#~ "vegnarà disativade." + +#~ msgid "_Assign" +#~ msgstr "_Assegne" + +#~ msgid "Add User Account" +#~ msgstr "Zonte account utent" + +#~ msgid "Remove User Account" +#~ msgstr "Gjave account utent" + +#~ msgid "_Account Activity" +#~ msgstr "_Ativitât dal account" + +#~ msgid "Color" +#~ msgstr "Colôr" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Team" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Impussibil cjamâ i plugin VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Zonte conession di rêt" + +#~ msgid "Bond slaves" +#~ msgstr "Bond slave" + +#~ msgid "(none)" +#~ msgstr "(nissun)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge slave" + +#~ msgid "Team slaves" +#~ msgstr "Team slave" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Il dispositîf InfiniBand nol supuarte la modalitât colegade" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "" +#~ "Nol è stât sielt nissun certificât di une Autoritât di Certificazion" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Il no doprâ un certificât mitût fûr di une Autoritât di Certificazion " +#~ "(CA) al pues portâ a conessions Wi-Fi no siguris. Sielzi un certificât di " +#~ "une Autoritât di Certificazion?" + +#~ msgid "Ignore" +#~ msgstr "Ignore" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Sielç certificât CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Domande cheste password ogni volte" + +#~ msgid "Don't _warn me again" +#~ msgstr "No stâ visâmi plui" + +#~ msgid "No" +#~ msgstr "No" + +#~ msgid "Yes" +#~ msgstr "Sì" + +#~ msgid "Power" +#~ msgstr "Alimentazion" + +#~ msgid "Privacy" +#~ msgstr "Privacy" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Altri" + +#~ msgid "Personal File Sharing" +#~ msgstr "Condivision file personâi" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Permet control rimot" + +#~ msgid "_Verify" +#~ msgstr "_Verifiche" + +#~ msgid "Login History" +#~ msgstr "Cronologjie acès" + +#~ msgid "Login Options" +#~ msgstr "Opzions di acès" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Un utent cul non utent '%s' al esist za." + #~ msgid "Bluetooth is disabled" #~ msgstr "Bluetooth no abilitât" @@ -7183,9 +7558,6 @@ #~ msgid "S_peed:" #~ msgstr "_Velocitât:" -#~ msgid "Shortcuts" -#~ msgstr "Scurtis" - #~ msgid "Test Your Settings" #~ msgstr "Test impostazions" @@ -7224,9 +7596,6 @@ #~ msgid "Fast" #~ msgstr "Veloç" -#~ msgid "Two _finger scroll" -#~ msgstr "Scoriment a doi _dêts" - #~ msgid "Security key" #~ msgstr "Clâf di sigurece" @@ -7274,10 +7643,11 @@ #~ msgstr "Opzions" #~ msgid "" -#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled devices" +#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled " +#~ "devices" #~ msgstr "" -#~ "La condivision Bluetooth a permet di condividi file cun altris dispositîfs " -#~ "Bluetooth abilitâts" +#~ "La condivision Bluetooth a permet di condividi file cun altris " +#~ "dispositîfs Bluetooth abilitâts" #~ msgid "Only Receive From Trusted Devices" #~ msgstr "Ricêf dome di dispositîfs fidâts" diff -Nru gnome-control-center-3.20.2/po/gd.po gnome-control-center-3.22.1/po/gd.po --- gnome-control-center-3.20.2/po/gd.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/gd.po 2016-08-12 12:43:57.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-20 07:53+0000\n" -"PO-Revision-Date: 2016-04-20 15:15+0100\n" +"POT-Creation-Date: 2016-06-10 15:20+0000\n" +"PO-Revision-Date: 2016-06-11 08:22+0100\n" "Last-Translator: GunChleoc \n" "Language-Team: Fòram na Gàidhlig\n" "Language: gd\n" @@ -24,7 +24,6 @@ "X-Project-Style: gnome\n" #: ../panels/background/background.ui.h:1 -#| msgid "Background" msgid "_Background" msgstr "Cùlai_bh" @@ -35,7 +34,6 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -#| msgid "Lock Screen" msgid "_Lock Screen" msgstr "G_lais an sgrìn" @@ -95,7 +93,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Dhachaigh" @@ -112,24 +110,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1305 +#: ../panels/network/net-device-wifi.c:1542 #: ../panels/network/network-wifi.ui.h:1 #: ../panels/printers/cc-printers-panel.c:2052 #: ../panels/printers/new-printer-dialog.ui.h:2 #: ../panels/privacy/cc-privacy-panel.c:982 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 #: ../panels/user-accounts/data/account-dialog.ui.h:17 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 +#: ../panels/user-accounts/um-account-dialog.c:1472 #: ../panels/user-accounts/um-fingerprint-dialog.c:266 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 @@ -139,7 +137,6 @@ msgstr "_Sguir dheth" #: ../panels/background/cc-background-chooser-dialog.c:581 -#| msgid "Select" msgid "_Select" msgstr "_Tagh" @@ -162,16 +159,17 @@ msgid "Current background" msgstr "An cùlaibh làithreach" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Cùlaibh" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Cleachd pàipear-balla no dealbh mar chùlaibh" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Pàipear-balla;Sgrìn;Deasg;" @@ -212,18 +210,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Cuir suidse a' mhodh itealain dheth gus Bluetooth a chur an comas." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Cuir Bluetooth air is dheth is ceangail na h-uidheaman agad ris" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;co-roinn;co-roinneadh;" @@ -399,7 +396,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "A h-uile faidhle" @@ -442,7 +439,7 @@ msgstr "Sàbhail a' phròifil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Sàbhail" @@ -554,13 +551,11 @@ #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -#| msgid "Start" msgid "_Start" msgstr "_Tòisich" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -#| msgid "Resume" msgid "_Resume" msgstr "_Lean air" @@ -716,15 +711,14 @@ msgstr "Cuir ris pròifil" #: ../panels/color/color.ui.h:29 -#| msgid "Import File…" msgid "_Import File…" msgstr "_Ion-phortaich faidhle…" #: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/um-account-dialog.c:1473 msgid "_Add" msgstr "_Cuir ris" @@ -750,7 +744,6 @@ msgstr "Ionnsaich barrachd mu dheidhinn stiùireadh dath" #: ../panels/color/color.ui.h:36 -#| msgid "Set for all users" msgid "_Set for all users" msgstr "_Suidhich airson a h-uile cleachdaiche" @@ -761,17 +754,14 @@ "seo" #: ../panels/color/color.ui.h:38 -#| msgid "Enable" msgid "_Enable" msgstr "_Cuir an comas" #: ../panels/color/color.ui.h:39 -#| msgid "Add profile" msgid "_Add profile" msgstr "Cuir ris _pròifil" #: ../panels/color/color.ui.h:40 -#| msgid "Calibrate…" msgid "_Calibrate…" msgstr "_Cailbhrich…" @@ -780,12 +770,10 @@ msgstr "Cailbhrich an innleachd" #: ../panels/color/color.ui.h:42 -#| msgid "Remove profile" msgid "_Remove profile" msgstr "Thoi_r air falbh a' phròifil" #: ../panels/color/color.ui.h:43 -#| msgid "View details" msgid "_View details" msgstr "_Seall am mion-fhiosrachadh" @@ -882,11 +870,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Dath" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -894,13 +883,11 @@ "no clò-bhualadairean" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Dath;ICC;Pròifil;Cailbhrich:Clò-bhualadair;Taisbeanadh;" #: ../panels/common/cc-common-language.c:323 -#| msgctxt "Online Account" -#| msgid "Other" msgid "Other…" msgstr "Eile…" @@ -914,23 +901,23 @@ msgid "No languages found" msgstr "Cha deach cànan sam bith a lorg" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "An-diugh" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "An-dè" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b %Y" @@ -1050,8 +1037,9 @@ msgid "December" msgstr "An Dùbhlachd" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Ceann-là ⁊ Àm" @@ -1093,7 +1081,6 @@ msgstr "Ceann-là ⁊ an t-àm" #: ../panels/datetime/datetime.ui.h:24 -#| msgid "Time Zone" msgid "Time Z_one" msgstr "R_oinn-tìde" @@ -1109,12 +1096,12 @@ msgid "AM / PM" msgstr "m/f" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Atharraich an ceann-là 's an t-àm, a' gabhail a-steach na roinne-tìde" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Gleoc;Roinn-tìde;Ionad;" @@ -1128,23 +1115,23 @@ "Feumaidh tu dearbhadh a dhèanamh gus an t-am no roghainnean a' chinn-là " "atharrachadh." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Mullach dùinte" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Sgàthanaichte" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Prìomh-phanail" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 #: ../panels/privacy/cc-privacy-panel.c:172 #: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 @@ -1156,187 +1143,192 @@ msgid "Off" msgstr "Dheth" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Panail dhàrnach" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Cuir air gleus na co-thaisbeanaidhean" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "Cuir _an sàs" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "" "Slaod na h-uidheaman-taisbeanaidh mun cuairt gus an t-òrdugh atharrachadh" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Cuairtich gu tuathail le 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Cuairtich le 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Cuairtich gu deiseal le 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Meud" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Co-mheas an deilbh" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Dùmhlachd-bhreacaidh" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Gleus airson TBh" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Tricead an ath-nuadhachaidh" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Seall am bàr mullaich is foir-shealladh na gnìomhachd air an taisbeanadh seo" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Uidheam-taisbeanaidh dàrnach" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Cuir an taisbeanadh seo còmhla ri fear eile airson rum-obrach a bharrachd a " "chruthachadh" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Taisbeanadh" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Na seall ach taisbeanaidhean-shleamhnagan is meadhanan" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Sgàthanaich" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Seall an sealladh làithreach agad air an dà uidheam-taisbeanaidh" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Cuir dheth" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Na cleachd an t-uidheam-taisbeanaidh seo" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Cha b' urrainn dhuinn fiosrachadh na sgrìn fhaighinn" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Cuir _air gleus na co-thaisbeanaidhean" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Uidheaman-taisbeanaidh" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "" "Tagh mar a thèid monatairean is proiseactaran a tha ceangailte ris a " "chleachdadh" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;panail,proiseactar," "tilgear,sgrìn,dùmhlachd-bhreacaidh;ath-nuadhaich;ath-nuadhachadh;monatar;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Neo-aithnichte" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:433 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:435 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1115 msgid "Ask what to do" msgstr "Faighnich dhìom dè nithear" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1119 msgid "Do nothing" msgstr "Na dèan dad" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1123 msgid "Open folder" msgstr "Fosgail am pasgan" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1214 msgid "Other Media" msgstr "Meadhanan eile" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1245 msgid "Select an application for audio CDs" msgstr "Tagh aplacaid airson CDan fuaime" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1246 msgid "Select an application for video DVDs" msgstr "Tagh apalacaid airson DVDan video" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1247 msgid "Select an application to run when a music player is connected" msgstr "Tagh aplacaid a thèid a ruith nuair a cheanglar cluicheadair ciùil ris" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1248 msgid "Select an application to run when a camera is connected" msgstr "Tagh aplacaid a thèid a ruith nuair a cheanglar camara ris" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1249 msgid "Select an application for software CDs" msgstr "Tagh apalacaid airson CDan bathair-bhog" @@ -1345,88 +1337,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1261 msgid "audio DVD" msgstr "DVD fuaime" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1262 msgid "blank Blu-ray disc" msgstr "diosg Blu-ray bàn" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1263 msgid "blank CD disc" msgstr "diosg CD bàn" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1264 msgid "blank DVD disc" msgstr "diosg DVD bàn" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1265 msgid "blank HD DVD disc" msgstr "diosg DVD HD bàn" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1266 msgid "Blu-ray video disc" msgstr "diosg video Blu-ray bàn" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1267 msgid "e-book reader" msgstr "leughadair leabhair-d" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1268 msgid "HD DVD video disc" msgstr "diosg video HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1269 msgid "Picture CD" msgstr "CD dhealbhan" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1270 msgid "Super Video CD" msgstr "CD Super Video" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1271 msgid "Video CD" msgstr "CD video" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1272 msgid "Windows software" msgstr "Bathar-bog Windows" -#: ../panels/info/cc-info-panel.c:1435 +#: ../panels/info/cc-info-panel.c:1395 #: ../panels/keyboard/keyboard-shortcuts.c:1949 msgid "Section" msgstr "Earrann" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Foir-shealladh" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Apalacaidean bunaiteach" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Meadhan so-ghiùlain" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1440 #, c-format msgid "Version %s" msgstr "Tionndadh %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Mion-fhiosrachadh" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Seall fiosrachadh mun t-siostam agad" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1603,8 +1594,9 @@ msgid "Launch help browser" msgstr "Cuir gu dol brabhsair na cobharach" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:934 +#: ../shell/cc-window.c:1584 ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../shell/window.ui.h:3 msgid "Settings" msgstr "Roghainnean" @@ -1677,7 +1669,6 @@ msgstr "Glais an sgrìn" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Inntrigeadh uile-choitcheann" @@ -1744,18 +1735,19 @@ msgid "Modifiers-only switch to next source" msgstr "Gluaisidh na h-iuchraichean atharrachaidh dhan ath-thùs thu" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" msgstr "Meur-chlàr" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Seall is atharraich ath-ghoiridean a' mheur-chlàir agad is suidhich na " "roghainnean sgrìobhaidh agad" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Ath-ghoirid;Ath-dhèan;Priobadh;" @@ -1854,11 +1846,12 @@ msgid "Test Your _Settings" msgstr "Cuir na roghainnean agad fo dheuchainn" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "An luchag ⁊ am pada-suathaidh" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1866,7 +1859,7 @@ "deas- no chlì-làmhach" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Pada-suathaidh;Tomhaire;Briog;Gnogag;Dùbailte;Ball-lorgaire;Sgrolaich;" @@ -1877,7 +1870,6 @@ msgstr "Coitcheann" #: ../panels/mouse/gnome-mouse-properties.ui.h:2 -#| msgid "Primary _button" msgid "Primary Button" msgstr "Prìomh-phutan" @@ -1888,14 +1880,10 @@ "suathaidh." #: ../panels/mouse/gnome-mouse-properties.ui.h:4 -#| msgctxt "balance" -#| msgid "Left" msgid "Left" msgstr "Clì" #: ../panels/mouse/gnome-mouse-properties.ui.h:5 -#| msgctxt "balance" -#| msgid "Right" msgid "Right" msgstr "Deas" @@ -1904,7 +1892,6 @@ msgstr "Luchag" #: ../panels/mouse/gnome-mouse-properties.ui.h:7 -#| msgid "_Mouse Keys" msgid "Mouse Speed" msgstr "Luaths na luchaige" @@ -1914,12 +1901,10 @@ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. #: ../panels/mouse/gnome-mouse-properties.ui.h:10 -#| msgid "_Natural scrolling" msgid "Natural Scrolling" msgstr "Sgroladh nàdarra" #: ../panels/mouse/gnome-mouse-properties.ui.h:11 -#| msgid "This will not remove the account on the server." msgid "Scrolling moves the content, not the view." msgstr "Gluaisidh an sgroladh an t-susbaint 's cha ghluais an sealladh." @@ -1928,17 +1913,14 @@ msgstr "Pada-suathaidh" #: ../panels/mouse/gnome-mouse-properties.ui.h:13 -#| msgid "Touchpad" msgid "Touchpad Speed" msgstr "Luaths a' phada-shuathaidh" #: ../panels/mouse/gnome-mouse-properties.ui.h:14 -#| msgid "Tap to _click" msgid "Tap to Click" msgstr "Thoir gnogag airson briogadh" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 -#| msgid "Scroll Right" msgid "Edge Scrolling" msgstr "Sgroladh oir" @@ -1977,11 +1959,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modh ite_alain" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Progsaidh lìonraidh" @@ -1989,18 +1971,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ìoc, chaidh rudeigin cearr. Cuir fios gu reiceadair a' bhathair-bhog agad." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Feumaidh NetworkManager a bhith a' ruith." @@ -2016,7 +1998,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2033,64 +2015,64 @@ msgid "page 2" msgstr "duilleag 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:458 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Tèarainteachd" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "fèin-obrachail" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Pròifil %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Chan eil gin" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Chan ann idir" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2100,130 +2082,135 @@ msgstr[3] "%i latha air ais" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Chan eil gin" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Lag" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ceart ma-thà" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Math" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Fìor-mhath" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:236 +#: ../panels/network/network-wifi.ui.h:46 +msgid "Details" +msgstr "Mion-fhiosrachadh" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:215 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Dearbh-aithne" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Seòladh" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Bealach" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Sguab às an seòladh" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 msgid "Add" msgstr "Cuir ris" -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Frithealaiche" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Sguab às am frithealaiche DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Meatraigeachd" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Sguab às an t-slighe" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Fèin-obrachail (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 #: ../panels/privacy/cc-privacy-panel.c:199 msgid "Manual" msgstr "A làimh" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Link-Local a-mhàin" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Ro-leasachan" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 @@ -2232,47 +2219,47 @@ msgid "Automatic" msgstr "Fèin-obrachail" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Fèin-obrachail, DHCP a-mhàin" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:893 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:89 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Ath-shuidhich" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Chan eil gin" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Iuchair WEP 40/128-bit (Hex no ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Abairt-fhaire WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamic WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA ⁊ WPA2 pearsanta" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA ⁊ WPA2 Enterprise" @@ -2287,30 +2274,30 @@ msgstr "Astar a' cheangail" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Seòladh IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Seòladh IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Seòladh bathair-chruaidh" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2320,7 +2307,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2451,43 +2438,23 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Chan urrainn dhuinn deasaiche nan ceanglaichean fhosgladh" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Pròifil ùr" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:613 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bann" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Sgioba" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Drochaid" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Cha b' urrainn dhuinn na plugain VPN a luchdadh" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:795 msgid "Import from file…" msgstr "Ion-phortaich o fhaidhle…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 +#: ../panels/network/connection-editor/net-connection-editor.c:866 msgid "Add Network Connection" msgstr "Cuir ceangal lìonraidh ris" @@ -2497,7 +2464,7 @@ msgstr "_Ath-shuidhich" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 +#: ../panels/network/net-device-wifi.c:1543 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Dìochuimhnich" @@ -2523,11 +2490,11 @@ msgid "S_ecurity" msgstr "Tèaraint_eachd" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2540,38 +2507,38 @@ "\n" "Mearachd: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Tagh faidhle a thèid ion-phortadh" -#: ../panels/network/connection-editor/vpn-helpers.c:251 +#: ../panels/network/connection-editor/vpn-helpers.c:182 #: ../panels/printers/cc-printers-panel.c:2053 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "F_osgail" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Tha faidhle air a bheil \"%s\" ann mu thràth." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "Cui_r 'na àite" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "A bheil thu airson an ceangal VPN a tha thu a' sàbhaladh a chur an àite \"%s" "\"?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Chan urrainn dhuinn an ceangal VPN às-phortadh" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2582,7 +2549,7 @@ "\n" "Mearachd: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Às-phortaich ceangal VPN" @@ -2610,60 +2577,49 @@ msgid "Make available to _other users" msgstr "Cuir ri lài_mh chleachdaichean eile" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Lìonra" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Cum smachd air an dòigh a cheanglas tu ris an eadar-lìon" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +#| msgid "" +#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" +#| "vpn;vlan;bridge;bond;DNS;" msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;lìonra,uèirleas,progsaidh;bann-leathann;drochaid;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Tràillean banna" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(chan eil gin)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Tràillean drochaide" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;D" +"NS;lìonra,uèirleas,progsaidh;bann-leathann;drochaid;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "Chan ann idir" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "an-diugh" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "an-dè" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Seòladh IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Air a chleachdadh an turas mu dheireadh" @@ -2673,29 +2629,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Uèirichte" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1701 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Roghainnean…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Cuir ceangal ùr ris" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Tràillean sgioba" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1212 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2704,14 +2656,14 @@ "'s urrainn dhut hotspot uèirleas a shuidheachadh gus an ceangal agad a cho-" "roinneadh le daoine eile." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1216 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Ma chuireas tu air an hotspot uèirleas, thèid an ceangal ri %s a " "bhriseadh." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1220 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2719,27 +2671,27 @@ "Chan fhaigh thu cothrom air an eadar-lìon slighe a' cheangal uèirleas agad " "fhad 's a bhios an hotspot gnìomhach." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1303 msgid "Stop hotspot and disconnect any users?" msgstr "" "A bheil thu airson stad a chur air an hotspot is cleachdaiche sam bith eile " "a dhì-cheangal?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1306 msgid "_Stop Hotspot" msgstr "_Cuir stad air an hotspot" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1404 msgid "System policy prohibits use as a Hotspot" msgstr "" "Chan eil e ceadaichte a chleachdadh mar hotspot ri linn poileasaidh an t-" "siostaim" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1407 msgid "Wireless device does not support Hotspot mode" msgstr "Chan eil an t-uidheam uèirleas a' cur taic ris a' mhodh hotspot" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1539 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2747,11 +2699,11 @@ "Thèid fiosrachadh nan lìonraidhean a thagh thu, a' gabhail a-steach an " "fhacail-fhaire 's rèiteachadh gnàthaichte sam bith, air chall." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1849 msgid "History" msgstr "An eachdraidh" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1853 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2759,7 +2711,7 @@ msgstr "_Dùin" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1861 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Dìochuimhnich" @@ -2796,6 +2748,10 @@ msgid "Provider" msgstr "Sòlaraiche" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Lìonra" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2903,7 +2859,7 @@ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 #: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "_Password" msgstr "_Facal-faire" @@ -3004,7 +2960,7 @@ msgstr "_Ceangail ri lìonra falaichte…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14 msgid "_History" msgstr "An eachdraid_h" @@ -3031,355 +2987,334 @@ msgstr "Facal-faire" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Bun-structar" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Chan eil fhios dè an staid" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Gun stiùireadh" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Chan eil seo ri fhaighinn" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "A' ceangal" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Tha feum air dearbhadh" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Ceangailte" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "A' briseadh a' cheangail" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Dh'fhàillig an ceangal" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Chan eil fhios dè an staid (a dhìth)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Chan eil ceangal ann" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Dh'fhàillig an rèiteachadh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Dh'fhàillig rèiteachadh an IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Dh'fhalbh an ùine air rèiteachadh an IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Bha feum air rùintean ach cha dug thu seachad gin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Chaidh an ceangal ris an athchuingiche 802.1x a bhriseadh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Dh'fhàillig rèiteachadh an athchuingiche 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Dh'fhàillig an t-athchuingiche 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Thug dearbhadh an t-athchuingiche 802.1x ro fhada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Dh'fhàillig tòiseachadh na seirbheise PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Chaidh an ceangal ris an t-seirbheis PPP a bhriseadh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Dh'fhàillig PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Dh'fhàillig thòiseachadh a' chlianit DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Mearachd a' chliaint DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Dh'fhàillig an cliant DCHP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Dh'fhàillig tòiseachadh seirbheis a' cheangail cho-roinnte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Dh'fhàillig seirbheis a' cheangail cho-roinnte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Dh'fhàillig tòiseachadh na seirbheise AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Mearachd na seirbheise AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Dh'fhàillig an t-seirbheis AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Tha an loidhne trang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Chan eil fuaim daithealaidh ann" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Cha b' urrainn giùlanair a stèidheachadh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Dh'fhalbh an ùine air an iarrtas daithealaidh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Dh'fhàillig an oidhirp daithealaidh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Dh'fhàillig tòiseachadh a' mhòdaim" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Dh'fhàillig taghadh an APN a shònraich thu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Chan eilear a' sireadh lìonraidhean" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Chaidh clàradh an lìonraidh a dhiùltadh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Dh'fhalbh an ùine air clàradh an lìonraidh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Cha b' urrainn dhuinn clàradh aig an lìonra a dh'iarr thu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Dh'fhàillig sgrùdadh a' PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Dh'fhaoidte gu bheil am bathar-an-sàs airson an uidheim a dhìth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Dh'fhalbh an ceangal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Chaidh ceangal a bha ann a ghabhail os làimh" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Cha deach am mòdam a lorg" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Dh'fhàillig an ceangal Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Cha deach cairt SIM a chur a-steach" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Tha feum air PIN an SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Tha feum air PUK an SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Tha an SIM cearr" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Chan eil an t-uidheam InfiniBand a' cur taic ris a' mhodh cheangailte" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Dh'fhàillig eisimeileachd a' cheangail" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Tha bathar-an-sàs a dhìth" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Chan eil an càball a-staigh" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Cha deach ùghdarras theisteanasan a thaghadh" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "mearachd gun sònrachadh san tèarainteachd 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +#| msgid "No input source selected" +msgid "no file selected" +msgstr "cha deach faidhle a thaghadh" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Mur an cleachd thu teisteanas le ùghdarras theisteanasan, tha cunnart gun " -"dèan thu ceangal ri lìonraidhean WiFi droch-rùnach. A bheil thu airson " -"ùghdarras theisteanasan a thaghadh?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Leig seachad" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Tagh ùghdarras theisteanasan" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM no iuchraichean prìobhaideach PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "mearachd gun sònrachadh le dearbhadh an fhaidhle eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "" +"Iuchraichean prìobhaideach DER, PEM no PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER no teisteanasan PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "tha faidhle EAP-FAST PAC a dhìth" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Tagh faidhle PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Faidhlichean PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Faidhle PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "De_arbhadh a-staigh" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visioning PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3388,41 +3323,75 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Gun urra" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Air a dhearbhadh" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "An dà chuid" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Faidhle PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "De_arbhadh a-staigh" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#| msgid "PAC pro_visioning" +msgid "Allow automatic PAC pro_visioning" +msgstr "Ceadaich PAC _Provisioning fèin-obrachail" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "tha ainm-cleachdaiche EAP-LEAP a dhìth" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "tha facal-faire EAP-LEAP a dhìth" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:1 msgid "_Username" msgstr "_Ainm-cleachdaiche" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Seall a_m facal-faire" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "teisteanas EAP-PEAP CA mì-dhligheach: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"teisteanas EAP-PEAP CA mì-dhligheach: cha deach teisteanas a shònrachadh" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Tagh seirbheis ùghdarras theisteanasan" @@ -3440,19 +3409,58 @@ msgid "C_A certificate" msgstr "Teiste_anas le ùghdarras theisteanasan" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#| msgid "Authentication required" +msgid "No CA certificate is _required" +msgstr "Chan eil teisteanas CA _riatanach" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "Tionndadh _PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Iarr am facal-faire seo gach _turas" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "tha ainm-cleachdaiche EAP a dhìth" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +#| msgid "Change Password" +msgid "missing EAP password" +msgstr "tha facal-faire EAP a dhìth" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "tha dearbh-aithne EAP-TLS a dhìth" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "teisteanas EAP-TLS CA mì-dhligheach: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "teisteanas EAP-TLS CA mì-dhligheach: cha deach teisteanas a shònrachadh" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "facal-faire EAP-TLS mì-dhligheach: chan eil gin ann" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "iuchair phrìobhaideach EAP-TLS mhì-dhligheach: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "teisteanas cleachdaiche EAP-TLS mì-dhligheach: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Chan eil iuchraichean prìobhaideach gun chrioptachadh tèarainte" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3466,11 +3474,11 @@ "\n" "('S urrainn dhut an iuchair phrìobhaideach agad a dhìon le openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Tagh an teisteanas prìobhaideach agad" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Tagh an iuchair phrìobhaideach agad" @@ -3482,51 +3490,57 @@ msgid "_User certificate" msgstr "_Teisteanas cleachdaiche" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "I_uchair phrìobhaideach" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Facal-faire na _h-iuchrach phrìobhaideach" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "teisteanas EAP-TTLS CA mì-dhligheach: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"teisteanas EAP-TTLS CA mì-dhligheach: cha deach teisteanas a shònrachadh" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Na thoir _rabhadh dhomh a-rithist" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Chan eil" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Tha" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Mearachd nach aithne dhuinn le dearbhadh tèarainteachd 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunneled TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Protected EAP (PEAP)" @@ -3536,6 +3550,53 @@ msgid "Au_thentication" msgstr "D_earbhadh" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "tha ainm-cleachdaiche leap a dhìth" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "tha facal-faire leap a dhìth" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "tha iuchair wep a dhìth" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"tha an iuchair wep mì-dhligheach: chan fhaod ach figearan sia-dheicheach a " +"bhith am broinn iuchair a tha %zu a dh'fhaid" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"tha an iuchair wep mì-dhligheach: chan fhaod ach caractaran ASCII a bhith am " +"broinn iuchair a tha %zu a dh'fhaid" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"tha an iuchair wep mì-dhligheach: tha faide na iuchrach %zu cearr. Feumaidh " +"iuchair a bith 5/13 (ascii) no 10/26 (sia-dheicheach) a dh'fhaid" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "" +"tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith falamh" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"tha an iuchair wep mì-dhligheach: chan fhaod an abairt-fhaire a bhith nas " +"giorra na 64 caractar" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Bun-roghainn)" @@ -3572,12 +3633,27 @@ msgid "WEP inde_x" msgstr "Inneacs _WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk mì-dhligheach: tha faide na h-iuchrach %zu mì-dhligheach. Feumaidh i " +"bhith [8,63] baidht no 64 figear sia-dheicheach" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk mì-dhligheach: cha ghabh an iuchair tuigsinn mar àireamh shia-" +"dheicheach a tha 43 baidht a dh'fhaid" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Seòrsa" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 #: ../panels/privacy/cc-privacy-panel.c:172 #: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 @@ -3590,71 +3666,58 @@ #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 -#| msgctxt "notifications" -#| msgid "Notifications" msgctxt "notifications" msgid "_Notifications" msgstr "Bratha_n" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 -#| msgctxt "notifications" -#| msgid "Sound Alerts" msgctxt "notifications" msgid "Sound _Alerts" msgstr "C_aismeachdan fuaime" #: ../panels/notifications/edit-dialog.ui.h:5 -#| msgctxt "notifications" -#| msgid "Notification Banners" msgctxt "notifications" msgid "Notification _Banners" msgstr "_Brataich bhrathan" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 -#| msgctxt "notifications" -#| msgid "Show Message Content in Banners" msgctxt "notifications" msgid "Show Message _Content in Banners" msgstr "Seall susbaint nan tea_chdaireachdan ann am brataich" #: ../panels/notifications/edit-dialog.ui.h:8 -#| msgctxt "notifications" -#| msgid "Lock Screen Notifications" msgctxt "notifications" msgid "_Lock Screen Notifications" msgstr "Brathan na sgrìn-g_lasaidh" #: ../panels/notifications/edit-dialog.ui.h:9 -#| msgctxt "notifications" -#| msgid "Show Message Content on Lock Screen" msgctxt "notifications" msgid "Show Message C_ontent on Lock Screen" msgstr "Seall s_usbaint nan teachdaireachdan air an sgrìn-ghlasaidh" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Brathan" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Stiùirich na brathan a chithear agus na sheallas iad" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Notifications;Banner;Message;Tray;Popup;brathan;bratach;teachdaireachd;" "treidhe;priob-uinneag" #: ../panels/notifications/notifications.ui.h:1 -#| msgid "Notification Banners" msgid "Notification _Banners" msgstr "_Brataich bhrathan" #: ../panels/notifications/notifications.ui.h:2 -#| msgid "Lock Screen Notifications" msgid "_Lock Screen Notifications" msgstr "Brathan na sgrìn-g_lasaidh" @@ -3664,30 +3727,35 @@ msgid "Applications" msgstr "Aplacaidean" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Eile" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Cuir cunntas ris" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Post" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +#| msgid "_Calendar" +msgid "Calendar" +msgstr "Mìosachan" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Luchd-aithne" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Cabadaich" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Goireasan" @@ -3728,18 +3796,19 @@ msgid "_Remove" msgstr "_Thoir air falbh" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Cunntasan air loidhne" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Ceangail ris na cunntasan air loidhne 's cuir romhad mar a thèid an " "cleachdadh" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3903,7 +3972,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Bataraidh" @@ -3951,106 +4020,105 @@ msgid "When _idle" msgstr "Nua_ir a bhios e 'na thàmh" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Caomhnadh cumhachd" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Soilleireachd na sgrìn" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Soilleireachd fhèin-obrachail" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Soilleireachd a' _mheur-chlàir" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Doilleirich an sgrìn mur eil gnìomhachd sam bith" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Sgrìn _bhàn" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_WiFi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Cuir WiFi dheth gus cumhachd a shàbhaladh." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Bann-leathann _mobile" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Cuir am bann-leathan mobile (3G, 4G, LTE, is msaa.) dheth gus cumhachd a " "shàbhaladh." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Nuair a bhithear air cumhachd bataraidh" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Nuair a bhios e air a phlugadh a-steach" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Cuir 'na dhàil" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Dèan cadal-geamhraidh" -#: ../panels/power/cc-power-panel.c:2025 -#| msgid "Do nothing" +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Na dèan dad" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 -#| msgid "Suspend & Power Off" +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Putan cur 'na dhàil ⁊ na cumhachd" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Cuir 'n_a dhàil gu fèin-obrachail" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Cur 'na dhàil fèin-obrachail" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Nuair a bhios putan na cumhachd 'ga bhrùthadh" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 msgid "Devices" msgstr "Innleadan" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Cumhachd" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "A' chumhachd" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Seall ìre a' bhataraidh agad is atharraich roghainnean caomhnadh na cumhachd" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4318,34 +4386,34 @@ msgstr "Solair faidhle PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2613 +#: ../panels/printers/cc-printers-panel.c:2636 msgid "Test page" msgstr "Duilleag deuchainne" -#: ../panels/printers/cc-printers-panel.c:2743 -#| msgid "Printers" +#: ../panels/printers/cc-printers-panel.c:2749 msgid "No printers" msgstr "Chan eil clò-bhualadair ann" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3095 #, c-format msgid "Could not load ui: %s" msgstr "Cha b' urrainn dhuinn an eadar-aghaidh %s a luchdadh" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Clò-bhualadairean" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Cuir clò-bhualadairean, seall obraichean a' chlò-bhualadair is cuir romhad " "mar a thèid clò-bhualadh" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Clò-bhualadair;Ciudha;Clò-bhualadh;Pàipear;Inc;Tònair;" @@ -4356,7 +4424,6 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -#| msgid "%s Active Jobs" msgid "No Active Printer Jobs" msgstr "Chan eil obair clò-bhualaidh gnìomhach" @@ -4452,7 +4519,6 @@ #. Translators: Job's state (job is held for printing) #: ../panels/printers/pp-jobs-dialog.c:107 -#| msgid "Last used" msgctxt "print job" msgid "Paused" msgstr "'Na stad" @@ -4490,7 +4556,6 @@ #. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -#| msgid "%s Active Jobs" msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" msgstr "%s - Obraichean gnìomhach" @@ -4510,6 +4575,11 @@ msgid "Parallel Port" msgstr "Port co-shìnte" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4724,7 +4794,6 @@ #. Translators: This button adds new printer. #: ../panels/printers/printers.ui.h:24 -#| msgid "Add Printer" msgid "Add a Printer" msgstr "Cuir clò-bhualadair ris" @@ -4746,19 +4815,16 @@ msgstr "'Ga chleachdadh" #: ../panels/privacy/cc-privacy-panel.c:425 -#| msgid "On" msgctxt "Location services status" msgid "On" msgstr "Air" #: ../panels/privacy/cc-privacy-panel.c:426 -#| msgid "Off" msgctxt "Location services status" msgid "Off" msgstr "Dheth" #: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 -#| msgid "_Location Services" msgid "Location Services" msgstr "Seirbheisean ionaid" @@ -4817,16 +4883,17 @@ msgid "Privacy Policy" msgstr "Am poileasaidh prìobhaideachd" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Prìobhaideachd" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Dìon am fiosrachadh pearsanta agad is cum smachd air na chì càch" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4999,24 +5066,23 @@ msgid "Other" msgstr "Eile" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1073 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Feumaidh tu an seisean ath-thòiseachadh gus bi buaidh aig na dh'atharraich " "thu" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1077 msgid "Restart Now" msgstr "Ath-thòisich an-dràsta" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Cha deach tùs ion-chuir a thaghadh" -#: ../panels/region/cc-region-panel.c:1807 -#| msgid "Login Screen" +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Sgrìn a' chlàraidh a-steach" @@ -5048,17 +5114,18 @@ msgid "Paper" msgstr "Pàipear" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Dùthaich ⁊ cànan" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Roinn-dùthcha ⁊ cànan" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Tagh an cànan-taisbeanaidh, fòrmatan, meur-chlàran is tùsan ion-chuir" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "" "cànan;co-dhealbhachd;meur-chlàr;ion-chur;Language;Layout;Keyboard;Input;" @@ -5118,7 +5185,7 @@ msgstr "Alt clì + deas" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 msgid "_Language" msgstr "_Cànan" @@ -5127,7 +5194,6 @@ msgstr "Beurla (An Rìoghachd Aonaichte)" #: ../panels/region/region.ui.h:3 -#| msgid "Formats" msgid "_Formats" msgstr "_Fòrmatan" @@ -5169,26 +5235,11 @@ "Thèid roghainnean a' chlàraidh a-steach a chleachdadh leis a h-uile " "cleachdaiche nuair a chlàraicheas iad a-steach air an t-siostam" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Àitichean" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Comharran-lìn" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Eile" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Tagh ionad" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Ceart ma-tha" @@ -5196,11 +5247,12 @@ msgid "No applications found" msgstr "Cha deach aplacaid sam bith a lorg" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Lorg" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5208,7 +5260,7 @@ "gnìomhachd" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Search;Find;Index;Hide;Privacy;Results;lorg;inneacs;clàr-amais;falaich;" @@ -5218,6 +5270,24 @@ msgid "Search Locations" msgstr "Ionadan luirg" +#: ../panels/search/search-locations-dialog.ui.h:2 +#| msgctxt "Search Location" +#| msgid "Places" +msgid "Places" +msgstr "Àitichean" + +#: ../panels/search/search-locations-dialog.ui.h:3 +#| msgctxt "Search Location" +#| msgid "Bookmarks" +msgid "Bookmarks" +msgstr "Comharran-lìn" + +#: ../panels/search/search-locations-dialog.ui.h:4 +#| msgctxt "Online Account" +#| msgid "Other" +msgid "Other" +msgstr "Eile" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Gluais suas" @@ -5289,16 +5359,20 @@ msgstr "Dèan lethbhreac" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Co-roinneadh" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Co-roinneadh" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Cum smachd air na cho-roinneas tu le daoine eile" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5329,27 +5403,22 @@ msgstr "Lìonraidhean" #: ../panels/sharing/sharing.ui.h:1 -#| msgid "Computer Name" msgid "_Computer Name" msgstr "Ainm a' _choimpiutair" #: ../panels/sharing/sharing.ui.h:2 -#| msgid "Personal File Sharing" msgid "_Personal File Sharing" msgstr "Co-roinneadh fhaidhlichean _pearsanta" #: ../panels/sharing/sharing.ui.h:3 -#| msgid "Screen Sharing" msgid "_Screen Sharing" msgstr "Co-roinneadh _sgrìnichean" #: ../panels/sharing/sharing.ui.h:4 -#| msgid "Media Sharing" msgid "_Media Sharing" msgstr "Co-roinneadh _mheadhanan" #: ../panels/sharing/sharing.ui.h:5 -#| msgid "Remote Login" msgid "_Remote Login" msgstr "Clà_radh a-steach cèin" @@ -5364,7 +5433,6 @@ msgstr "Co-roinneadh fhaidhlichean pearsanta" #: ../panels/sharing/sharing.ui.h:8 -#| msgid "Require Password" msgid "_Require Password" msgstr "Ia_rr facal-faire" @@ -5377,17 +5445,14 @@ msgstr "Co-roinneadh sgrìnichean" #: ../panels/sharing/sharing.ui.h:12 -#| msgid "Allow Remote Control" msgid "_Allow Remote Control" msgstr "Ce_adaich smachd cèin" #: ../panels/sharing/sharing.ui.h:13 -#| msgid "_Password" msgid "_Password:" msgstr "_Facal-faire:" #: ../panels/sharing/sharing.ui.h:14 -#| msgid "Show Password" msgid "_Show Password" msgstr "_Seall am facal-faire" @@ -5396,12 +5461,10 @@ msgstr "Roghainnean inntrigidh" #: ../panels/sharing/sharing.ui.h:16 -#| msgid "New connections must ask for access" msgid "_New connections must ask for access" msgstr "Feumaidh ceanglaichean ùra cead-i_nntrigidh iarraidh" #: ../panels/sharing/sharing.ui.h:17 -#| msgid "Require a password" msgid "_Require a password" msgstr "Ia_rr facal-faire" @@ -5654,14 +5717,19 @@ msgid "Custom" msgstr "Gnàthaichte" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Inntrigeadh uile-choitcheann" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "" "Dèan nas fhasa e rudan fhaicinn, a chluinntinn, a sgrìobhadh, a thomhadh 's " "a bhriogadh" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5713,12 +5781,10 @@ msgstr "Meur-_chlàr air sgrìn" #: ../panels/universal-access/uap.ui.h:13 -#| msgid "Repeat Keys" msgid "R_epeat Keys" msgstr "_Putain ath-dhèanaimh" #: ../panels/universal-access/uap.ui.h:14 -#| msgid "Cursor Blinking" msgid "Cursor _Blinking" msgstr "Prio_badh a' chùrsair" @@ -5739,12 +5805,10 @@ msgstr "Taic le _briogadh" #: ../panels/universal-access/uap.ui.h:19 -#| msgid "_Double-click" msgid "_Double-Click Delay" msgstr "_Dàil air a' bhriogadh dùbailte" #: ../panels/universal-access/uap.ui.h:20 -#| msgid "_Double-click" msgid "Double-Click Delay" msgstr "Dàil air a' bhriogadh dùbailte" @@ -5766,8 +5830,8 @@ msgstr "Iuchraichean fuaime" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Dèan bìd nuair a bhios NumLock no CapsLock air." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Dèan bìd nuair a thèid NumLock no CapsLock a chur air no dheth." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5794,17 +5858,14 @@ msgstr "Putain ath-dhèanaimh" #: ../panels/universal-access/uap.ui.h:32 -#| msgid "Key presses _repeat when key is held down" msgid "Key presses repeat when key is held down." msgstr "Thèid brùthadh na h-iuchrach ath-dhèanamh ma chumar shìos an iuchair." #: ../panels/universal-access/uap.ui.h:34 -#| msgid "Repeat keys speed" msgid "Repeat keys delay" msgstr "Dàil nam putan ath-dhèanaimh" #: ../panels/universal-access/uap.ui.h:35 -#| msgid "_Speed:" msgid "Speed" msgstr "Luaths" @@ -5817,12 +5878,10 @@ msgstr "Priobadh a' chùrsair" #: ../panels/universal-access/uap.ui.h:38 -#| msgid "Cursor _blinks in text fields" msgid "Cursor blinks in text fields." msgstr "Bidh an cùrsair a' priobadh ann an raointean teacsa." #: ../panels/universal-access/uap.ui.h:39 -#| msgid "Cursor blink speed" msgid "Cursor blinking speed" msgstr "Luaths priobadh a' chùrsair" @@ -5892,9 +5951,7 @@ #: ../panels/universal-access/uap.ui.h:55 msgid "Ignores fast duplicate keypresses" -msgstr "" -"Ma chuireas tu air seo, cha dèid feart a thoirt do dh'iuchraichean a thèid " -"ath-bhrùthadh gu luath" +msgstr "Leigidh seo seachad iuchraichean a thèid ath-bhrùthadh gu luath" #: ../panels/universal-access/uap.ui.h:56 msgctxt "bounce keys delay" @@ -5916,8 +5973,7 @@ #: ../panels/universal-access/uap.ui.h:60 msgid "Turn accessibility features on and off using the keyboard" -msgstr "" -"Cuiridh seo feartan na so-ruigsinneach air no dheth leis a' mheur-chlàr" +msgstr "Cuiridh seo gleusan na so-ruigsinneach air no dheth leis a' mheur-chlàr" #: ../panels/universal-access/uap.ui.h:61 msgid "Click Assist" @@ -6031,37 +6087,30 @@ msgstr "Roghainnean an t-sùm" #: ../panels/universal-access/zoom-options.ui.h:8 -#| msgid "Magnification:" msgid "_Magnification:" msgstr "_Meudachadh:" #: ../panels/universal-access/zoom-options.ui.h:9 -#| msgid "Follow mouse cursor" msgid "_Follow mouse cursor" msgstr "_Lean ri cùrsair na luchaige" #: ../panels/universal-access/zoom-options.ui.h:10 -#| msgid "Screen part:" msgid "_Screen part:" msgstr "A' phàirt dhen _sgrìn:" #: ../panels/universal-access/zoom-options.ui.h:11 -#| msgid "Magnifier extends outside of screen" msgid "Magnifier _extends outside of screen" msgstr "Thèid am m_eudaichear a-mach air an sgrìn" #: ../panels/universal-access/zoom-options.ui.h:12 -#| msgid "Keep magnifier cursor centered" msgid "_Keep magnifier cursor centered" msgstr "_Cum cùrsair a' mheudaicheir sa mheadhan" #: ../panels/universal-access/zoom-options.ui.h:13 -#| msgid "Magnifier cursor pushes contents around" msgid "Magnifier cursor _pushes contents around" msgstr "_Gluaisidh cùrsair a' mheudaicheir susbaint mun cuairt" #: ../panels/universal-access/zoom-options.ui.h:14 -#| msgid "Magnifier cursor moves with contents" msgid "Magnifier cursor moves with _contents" msgstr "Gluaisidh cùrsair a' mheudaicheir mun _cuairt leis an t-susbaint" @@ -6074,7 +6123,6 @@ msgstr "Am meudaichear" #: ../panels/universal-access/zoom-options.ui.h:17 -#| msgid "Thickness:" msgid "_Thickness:" msgstr "_Tiughad:" @@ -6089,23 +6137,19 @@ msgstr "Tiugh" #: ../panels/universal-access/zoom-options.ui.h:20 -#| msgid "Length:" msgid "_Length:" msgstr "_Faid:" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -#| msgid "Color:" msgid "Co_lor:" msgstr "_Dath:" #: ../panels/universal-access/zoom-options.ui.h:23 -#| msgid "Crosshairs:" msgid "_Crosshairs:" msgstr "_Crois-ribeachan:" #: ../panels/universal-access/zoom-options.ui.h:24 -#| msgid "Overlaps mouse cursor" msgid "_Overlaps mouse cursor" msgstr "A' dol a-steach air cùrsair na _luchaige" @@ -6114,17 +6158,14 @@ msgstr "Crois-ribeachan" #: ../panels/universal-access/zoom-options.ui.h:26 -#| msgid "White on black:" msgid "_White on black:" msgstr "_Geal air dubh:" #: ../panels/universal-access/zoom-options.ui.h:27 -#| msgid "Brightness:" msgid "_Brightness:" msgstr "_Soilleireachd:" #: ../panels/universal-access/zoom-options.ui.h:28 -#| msgid "Contrast:" msgid "_Contrast:" msgstr "_Iomsgaradh:" @@ -6172,71 +6213,84 @@ msgid "Color Effects" msgstr "Èifeachdan dhathan" -#: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +msgid "_Full Name" +msgstr "Ainm _slàn" + +#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/um-user-panel.c:900 +#| msgctxt "Account type" +#| msgid "Standard" msgid "Standard" msgstr "Stannardach" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:4 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 +#: ../panels/user-accounts/um-user-panel.c:898 +#| msgctxt "Account type" +#| msgid "Administrator" msgid "Administrator" msgstr "Rianaire" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Ainm _slàn" - #: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "Account _Type" msgstr "_Seòrsa a' chunntais" #: ../panels/user-accounts/data/account-dialog.ui.h:7 -#| msgid "Allow user to set a password when they next login" msgid "Allow user to set a password when they next _login" msgstr "" "Leig leis a' chleachdaiche facal-faire a thaghadh nuair a ch_làraicheas iad " "a-steach an ath-thuras" #: ../panels/user-accounts/data/account-dialog.ui.h:8 -#| msgid "Set a password now" msgid "Set a password _now" msgstr "Suidhich facal-faire a_n-dràsta" #: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "Dear_bh" +#| msgctxt "printer state" +#| msgid "Configuring" +msgid "_Confirm" +msgstr "_Dearbhaich" #: ../panels/user-accounts/data/account-dialog.ui.h:11 +#| msgid "" +#| "Enterprise login allows an existing centrally managed user account to be " +#| "used on this device." msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Bheir clàradh a-steach Enterprise comas do chlàradh a-steach dhan uidheam " -"agad slighe cunntas cleachdaiche stiùirichte." +"Le clàradh a-steach enterprise, gabhaidh cunntas-cleachdaiche fo stiùireadh " +"meadhanaichte a chleachdadh air an uidheam seo. 'S urrainn dhut an cunntas " +"seo a chleachdadh cuideachd gus goireasan na companaidh inntrigeadh air an " +"eadar-lìn." #: ../panels/user-accounts/data/account-dialog.ui.h:12 msgid "_Domain" msgstr "_Àrainn" #: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Rach air loidhne gus cunntasan\n" -"enterprise a chur ris." +#| msgctxt "printer state" +#| msgid "Offline" +msgid "You are Offline" +msgstr "Tha thu far loidhne" + +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +#| msgid "" +#| "Go online to add\n" +#| "enterprise login accounts." +msgid "You must be online in order to add enterprise users." +msgstr "Feumaidh tu bhith air loidhne gus cleachdaichean enterprise a chur ris." #: ../panels/user-accounts/data/account-dialog.ui.h:15 msgid "_Enterprise Login" msgstr "Clàradh a-steach _Enterprise" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 +#: ../panels/user-accounts/um-account-dialog.c:1462 msgid "Add User" msgstr "Cuir ris Cleachdaiche" @@ -6365,15 +6419,28 @@ msgstr "Am _facal-faire làithreach" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +#| msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" -"Leig leis a' chleachdaiche facal-faire a thaghadh nuair a chlàraicheas iad a-" -"steach an ath-thuras" +"Leig leis a' chleachdaiche am facal-faire atharrachadh nuair a chlàraicheas " +"iad a-steach an ath-thuras" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Suidhich facal-faire an-dràsta" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Stannardach" + +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Rianaire" + #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Add User Account" msgstr "Cuir cunntas cleachdaiche ris" @@ -6382,23 +6449,19 @@ msgid "Remove User Account" msgstr "Thoir air falbh cunntas a' chleachdaiche" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Roghainnean a' chlàraidh a-steach" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "A_utomatic Login" msgstr "Clàradh a-steach fèin-_obrachail" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "_Fingerprint Login" msgstr "Clàradh a-steach le _meur-lorg" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "User Icon" msgstr "Ìomhaigheag a' chleachdaiche" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "Last Login" msgstr "An clàradh a-steach mu dheireadh" @@ -6502,9 +6565,12 @@ msgstr "Feuch is cleachd barrachd litrichean, àireamhan is chomharran." #: ../panels/user-accounts/pw-utils.c:117 +#| msgctxt "Password hint" +#| msgid "Mix uppercase and lowercase and use a number or two." msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Feuch is cleachd litrichean mòra 's beaga agus àireamh no dhà." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Cleachd litrichean mòra 's beaga agus feuch an cleachd thu àireamh no dhà." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6597,35 +6663,37 @@ msgstr "Mearachd neo-aithnichte" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +#| msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "" -"Bu chòir dha a bhith co-ionnann ri seòladh-lìn solaraiche a' chunntais agad." +"Bu chòir dha a bhith co-ionnann ri seòladh-lìn solaraiche a' chlàraidh " +"a-steach agad." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Cha b' urrainn dhuinn an cunntas a chur ris" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Chan eil an dà fhacal-faire co-ionnann." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:729 +#: ../panels/user-accounts/um-account-dialog.c:775 +#: ../panels/user-accounts/um-account-dialog.c:796 msgid "Failed to register account" msgstr "Cha b' urrainn dhuinn an cunntas a chlàradh" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:919 msgid "No supported way to authenticate with this domain" msgstr "" "Chan eil dòigh sam bith ann ris a bheil taic agus leis an urrainnear " "dearbhadh a dhèanamh air an àrainn seo" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:978 msgid "Failed to join domain" msgstr "Cha b' urrainn dhuinn ceangal ris an àrainn" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1039 msgid "" "That login name didn't work.\n" "Please try again." @@ -6633,7 +6701,7 @@ "Cha do dh'obraich an t-ainm sin.\n" "Feuch ris a-rithist." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1046 msgid "" "That login password didn't work.\n" "Please try again." @@ -6641,11 +6709,11 @@ "Cha do dh'obraich am facal-faire sin.\n" "Feuch ris a-rithist." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1054 msgid "Failed to log into domain" msgstr "Cha b' urrainn dhuinn clàradh a-steach aig an àrainn" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1112 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "" "Chan fhaigh sinn greim air an àrainn. Saoil a bheil e air a dheagh-" @@ -6942,15 +7010,15 @@ msgid "Logged in" msgstr "Air clàradh a-steach" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1276 msgid "Failed to contact the accounts service" msgstr "Cha b' urrainn dhuinn fios a chur gu seirbheis nan cunntasan" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1278 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Dèan cinnteach gun deach AccountService a stàladh agus an comas." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1319 msgid "" "To make changes,\n" "click the * icon first" @@ -6958,12 +7026,12 @@ "Gus atharraichean a dhèanamh,\n" "briog an ìomhaigheag * an toiseach" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1357 msgid "Create a user account" msgstr "Cruthaich cunntas cleachdaiche" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1368 +#: ../panels/user-accounts/um-user-panel.c:1680 msgid "" "To create a user account,\n" "click the * icon first" @@ -6971,12 +7039,12 @@ "Gus cunntas cleachdaiche a chruthachadh,\n" "briog air an ìomhaigheag * an toiseach" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1378 msgid "Delete the selected user account" msgstr "Sguab às cunntas a' chleachdaiche a thagh thu" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1390 +#: ../panels/user-accounts/um-user-panel.c:1685 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6984,34 +7052,37 @@ "Gus cunntas a' chleachdaiche a thagh thu a sguabadh às,\n" "briog air an ìomhaigheag * an toiseach" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1594 msgid "My Account" msgstr "An cunntas agam" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." +msgid "Sorry, that user name isn't available. Please try another." msgstr "" -"Tha cleachdaiche air a bheil an t-ainm-cleachdaiche \"%s\" ann mar-tha." +"Tha sinn duilich ach chan eil an t-ainm-cleachdaiche seo ri fhaighinn. Feuch " +"fear eile." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Tha an t-ainm-cleachdaiche ro fhada." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Chan fhaod an t-ainm-cleachdaiche tòiseachadh le \"-\"." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 +#| msgid "" +#| "The username should only consist of lower and upper case letters from a-" +#| "z, digits and any of characters '.', '-' and '_'." msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Cha bu chòir a bhith am broinn ainm-cleachdaiche ach litrichean mòra 's " -"beaga o a-z, àireamhan agus gin dhe na caractaran \".\", \"-\" agus \"_\"." +"beaga o a-z, àireamhan agus gin dhe na caractaran seo: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Thèid seo a chleachdadh gus ainm a chur air a' phasgan dachaigh agad is cha " @@ -7103,19 +7174,19 @@ msgid "Button" msgstr "Putan" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablaid Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Suidhich mapadh nam putanan is cuir air gleus mothalachd an staidhleis " "airson tablaidean grafaigeachd" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablaid;Wacom;Staidhleas;Suathan:Luchag;" @@ -7147,6 +7218,10 @@ msgid "Bluetooth Settings" msgstr "Roghainnean Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablaid Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapaich ri monatair…" @@ -7332,6 +7407,11 @@ msgid "Tip Pressure Feel" msgstr "Faireachdainn brùthadh a' chinn" +#: ../shell/alt/cc-window.c:882 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Na h-uile roghainn" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Ionad smachd GNOME" @@ -7346,7 +7426,7 @@ "aspects of your desktop." msgstr "" "'S e a' phrìomh eadar-aghaidh aig GNOME a tha san ionad smachd gus iomadh " -"fheart dhen deasg agad a rèiteachadh." +"gleus dhen deasg agad a rèiteachadh." #: ../shell/cc-application.c:45 msgid "Display version number" @@ -7388,22 +7468,18 @@ msgid "Quit" msgstr "Fàg an-seo" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Na h-uile roghainn" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Pearsanta" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Bathar-cruaidh" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Siostam" @@ -7413,19 +7489,16 @@ msgstr "Roghainnean;" #: ../shell/help-overlay.ui.h:1 -#| msgid "General" msgctxt "shortcut window" msgid "General" msgstr "Coitcheann" #: ../shell/help-overlay.ui.h:2 -#| msgid "Quit" msgctxt "shortcut window" msgid "Quit" msgstr "Fàg an-seo" #: ../shell/help-overlay.ui.h:3 -#| msgid "Search" msgctxt "shortcut window" msgid "Search" msgstr "Lorg" @@ -7436,18 +7509,117 @@ msgstr "Panailean" #: ../shell/help-overlay.ui.h:5 -#| msgid "Show the overview" msgctxt "shortcut window" msgid "Go back to the overview" msgstr "Till dhan fhoir-shealladh" #: ../shell/help-overlay.ui.h:6 -#| msgctxt "print job" -#| msgid "Canceled" msgctxt "shortcut window" msgid "Cancel search" msgstr "Sguir dhen lorg" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +#| msgid "_Stop Hotspot" +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#: ../shell/window.ui.h:1 +#| msgid "GNOME Control Center" +msgid "Welcome to the Control Center" +msgstr "Fàilte gun ionad smachd" + +#: ../shell/window.ui.h:2 +msgid "Select a panel in the sidelist to see the available options" +msgstr "" +"Tagh panail air an liosta-thaoibh gus na roghainnean a shealltainn a tha ri " +"am faighinn" + +#~ msgid "Bond" +#~ msgstr "Bann" + +#~ msgid "Team" +#~ msgstr "Sgioba" + +#~ msgid "Bridge" +#~ msgstr "Drochaid" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Cha b' urrainn dhuinn na plugain VPN a luchdadh" + +#~ msgid "Bond slaves" +#~ msgstr "Tràillean banna" + +#~ msgid "(none)" +#~ msgstr "(chan eil gin)" + +#~ msgid "Bridge slaves" +#~ msgstr "Tràillean drochaide" + +#~ msgid "Team slaves" +#~ msgstr "Tràillean sgioba" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "" +#~ "Chan eil an t-uidheam InfiniBand a' cur taic ris a' mhodh cheangailte" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Cha deach ùghdarras theisteanasan a thaghadh" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Mur an cleachd thu teisteanas le ùghdarras theisteanasan, tha cunnart gun " +#~ "dèan thu ceangal ri lìonraidhean WiFi droch-rùnach. A bheil thu airson " +#~ "ùghdarras theisteanasan a thaghadh?" + +#~ msgid "Ignore" +#~ msgstr "Leig seachad" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Tagh ùghdarras theisteanasan" + +#~ msgid "As_k for this password every time" +#~ msgstr "Iarr am facal-faire seo gach _turas" + +#~ msgid "Don't _warn me again" +#~ msgstr "Na thoir _rabhadh dhomh a-rithist" + +#~ msgid "No" +#~ msgstr "Chan eil" + +#~ msgid "Yes" +#~ msgstr "Tha" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Eile" + +#~ msgid "_Verify" +#~ msgstr "Dear_bh" + +#~ msgid "Login Options" +#~ msgstr "Roghainnean a' chlàraidh a-steach" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "" +#~ "Tha cleachdaiche air a bheil an t-ainm-cleachdaiche \"%s\" ann mar-tha." + +#~ msgid "Color" +#~ msgstr "Dath" + +#~ msgid "Power" +#~ msgstr "Cumhachd" + +#~ msgid "Privacy" +#~ msgstr "Prìobhaideachd" + #~ msgid "Done" #~ msgstr "Deiseil" diff -Nru gnome-control-center-3.20.2/po/gl.po gnome-control-center-3.22.1/po/gl.po --- gnome-control-center-3.20.2/po/gl.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/gl.po 2016-09-27 12:37:36.000000000 +0000 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: gnome-control-center-master-po-gl-72290.merged\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-19 18:59+0100\n" -"PO-Revision-Date: 2016-03-19 19:00+0200\n" +"POT-Creation-Date: 2016-09-10 01:03+0200\n" +"PO-Revision-Date: 2016-09-10 01:06+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: Galician\n" "Language: gl\n" @@ -100,7 +100,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Cartafol persoal" @@ -115,25 +115,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -164,16 +163,17 @@ msgid "Current background" msgstr "Fondo actual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fondo" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Cambie a súa imaxe de fondo a un fondo de pantalla ou foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Fondo de pantalla;Pantalla;Escritorio;" @@ -215,18 +215,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Apague o modo avión para activar o Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Active ou desactive o Bluetooth e conecte os seus dispositivos" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "compartir;compartición;bluetooth;obex;" @@ -398,7 +397,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Todos os ficheiros" @@ -437,7 +436,7 @@ msgstr "Gardar perfil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Gardar" @@ -695,7 +694,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Resumo" @@ -707,11 +706,11 @@ msgid "_Import File…" msgstr "_Importar ficheiro…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Engadir" @@ -861,18 +860,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Cor" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibre o cor dos seus dispositivos, como as pantallas, cámaras ou impresoras" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Cor;ICC;Perfil;Calibrado;Impresora;Pantalla;" @@ -890,23 +890,23 @@ msgid "No languages found" msgstr "Non se atoparon idiomas" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hoxe" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Onte" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e de %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e de %b de %Y" @@ -1026,8 +1026,9 @@ msgid "December" msgstr "Decembro" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data e hora" @@ -1084,12 +1085,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Cambie a data e hora, incluíndo o fuso horario" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Reloxo;Fuso horario;Localización;" @@ -1101,210 +1102,225 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Para cambiar as preferencias de data e hora debe autenticarse." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tapa pechada" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Espellada" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primaria" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Desactivado" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundaria" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Ordenar pantallas combinadas" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplicar" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arrastre as pantallas para reordenalas" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Rotar ao contrario do reloxo 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Rotar 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Rotar no sentido do reloxo 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Tamaño" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporción de aspecto" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolución" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Axustar para TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Taxa de refresco" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostrar a barra superior e a Vista de actividades nesta pantalla" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Pantalla secundaria" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Unir esta pantalla con outra para crear un espazo de traballo adicional" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentación" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostrar só as presentacións e os multimedias" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Espello" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostra a súa vista existente nas dúas pantallas" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Apagar" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Non usar este monitor" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Non foi posíbel obter a información da pantalla" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Ordenar pantallas combinadas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Pantallas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Escolla como usar os monitores conectados e proxectores" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Proxector;xrandr;Pantalla;Resolución;Refresco;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Descoñecido" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID de construción: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID de construción: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Preguntar que facer" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Non facer nada" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Abrir cartafol" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Outros soportes" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Seleccione un aplicativo para os CD de son" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Seleccione un aplicativo para os DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Seleccione un aplicativo que executar cando se conecta un reprodutor de " "música" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Seleccione un aplicativo que executar cando se conecta unha cámara" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Seleccione un aplicativo para os CD de software" @@ -1313,88 +1329,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD de son" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "disco Blu-ray virxe" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "CD virxe" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "DVD virxe" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "disco HD DVD virxe" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disco Blu-ray de vídeo" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "lector de libros electrónicos" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disco HD DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD de imaxes" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Vídeo CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Vídeo CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software de Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sección" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Visión xeral" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicativos predeterminados" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Soportes extraíbeis" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versión %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalles" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Ver información sobre o seu sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1569,8 +1583,9 @@ msgid "Launch help browser" msgstr "Iniciar o visor de axuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Preferencias" @@ -1643,7 +1658,6 @@ msgstr "Bloquear a pantalla" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Acceso universal" @@ -1679,11 +1693,21 @@ msgid "High contrast on or off" msgstr "Contraste alto activado ou desactivado" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Personalizar os atallos" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1710,117 +1734,125 @@ msgid "Modifiers-only switch to next source" msgstr "Só modificadores cambian á seguinte orixe" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Teclado" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Restabelecer o atallo ao valor predeterminado" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s xa está sendo usado para %s. Se o substitúe, %s desactivarase" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Estabelecer atallo personalizado" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Estabelecer atallo" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Escriba o novo atallo para cambiar %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Engadir atallo personalizado" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Teclado" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Vexa e cambie os atallos do teclado e estabeleza as preferencias de escritura" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Atallo;Repetir;Pestanexar;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Combinación personalizada" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nome:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "_Orde:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Engadir atallo" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Retirar atallo" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Para editar unha tecla de atallo prema na fila correspondente e prema unha " -"combinación de teclas nova, ou prema a tecla de «Retroceso» para limpar todo." +msgid "No keyboard shortcut found" +msgstr "Non se atopou ningún atallo de teclado" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Personalizar os atallos" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Probe unha busca diferente" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Prema Esc para cancelar." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Non é posíbel utilizar o atallo «%s» porque sería imposíbel escribir usando " -"esta tecla.\n" -"Ténteo de novo cunha tecla como Control, Alt ou Maiús ao mesmo tempo." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nome" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"O atallo «%s» xa se está usando para\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Orde" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Atallo" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Editar" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Se reasigna o atallo para «%s», desactivarase o atallo «%s»." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ningunha" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Reasignar" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Eliminar" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Escriba o novo atallo" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"O atallo «%s» ten un atallo «%s» asociado. Desexa estabelecelo a «%s» " -"automaticamente?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Cancelar" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"«%s» está asociado actualmente con «%s», este atallo desactivarase se sigue." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Engadir" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Asignar" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Substituír" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Estabelecer" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Comprobar a súa _configuración" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Rato e área táctil" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1828,7 +1860,7 @@ "ou zurdo" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "área táctil;punteiro;premer;dobre;pulsación;botón;desprazamento;" @@ -1886,6 +1918,10 @@ msgstr "Tocar para facer clic" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Desprazamento con dous dedos" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Desprazamento no bordo" @@ -1924,11 +1960,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modo a_vión" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy da rede" @@ -1936,17 +1972,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN «%s»" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Recoiro, algo foi mal. Contacte co seu fabricante de software." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Requírese que NetworkManager estea en execución." @@ -1962,7 +1998,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1979,59 +2015,64 @@ msgid "page 2" msgstr "páxina 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Seguranza" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automático" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Perfil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Empresarial" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ningunha" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nunca" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2039,179 +2080,179 @@ msgstr[1] "Hai %i días" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Ningunha" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Débil" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Aceptábel" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Boa" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excelente" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detalles" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identidade" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Enderezo" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Máscara de rede" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Pasarela" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Eliminar enderezo" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Engadir" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Servidor" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Quitar servidor DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Métrico" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Quitar ruta" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automático (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Só ligazón local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefixo" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automático" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automático, só DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Restabelecer" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ningunha" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Chave WEP de 40/128 bits (Hexadecimal ou ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Frase de paso WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinámica (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Persoal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Empresarial" @@ -2226,30 +2267,30 @@ msgstr "Velocidade da ligazón" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Enderezo IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Enderezo IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Enderezo hardware" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2259,7 +2300,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2342,13 +2383,13 @@ msgid "Firewall _Zone" msgstr "_Zona da devasa" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Predeterminada" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "A zona define o nivel de confianza da conexión" @@ -2390,45 +2431,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Non foi posíbel abrir o editor de conexións" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Novo perfil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Equipo" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Non foi posíbel cargar os engadidos de VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importar desde ficheiro…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Engadir conexión de rede" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Engadir VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2436,7 +2457,7 @@ msgstr "_Restabelecer" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Esquecer" @@ -2462,11 +2483,11 @@ msgid "S_ecurity" msgstr "S_eguranza" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Non foi posíbel importar a conexión VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2479,36 +2500,36 @@ "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Seleccione o ficheiro para importar" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Abrir" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Xa existe un ficheiro chamado «%s\"." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "S_ubstituír" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Quere substituír %s coa conexión VPN que está gardando?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Non é posíbel exportar a conexión VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2519,7 +2540,7 @@ "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportar conexión VPN" @@ -2546,60 +2567,46 @@ msgid "Make available to _other users" msgstr "Facer dispoñíbel a _outros usuarios" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Rede" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controle como se conecta a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Rede;Sen fíos;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Banda larga;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Escravos Bond" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ningún)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Escravos Bridge" +"DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nunca" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hoxe" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "onte" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Enderezo IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Última vez usada" @@ -2609,34 +2616,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Con fíos" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opcións…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Perfil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Engadir nova conexión" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Escravos do equipo" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2644,12 +2642,12 @@ "Se ten unha conexión a Internet aparte da sen fíos, pode configurar un punto " "de acceso sen fíos para compartir a súa conexión a Internet con outros." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Cambiar ao «hotspot» sen fíos desconectaralle de %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2657,23 +2655,23 @@ "Non é posíbel acceder á internet usando a conexión sen fíos mentres o " "«hotspot» está activado." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Desexa deter o «hotspot» e desconectar aos usuarios?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Deter «hotspot»" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "A normativa do sistema prohibe o uso un «Hotspot»" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "O dispositivo Wireless non é compatíbel co modo «Hotspot»" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2681,11 +2679,11 @@ "Perderase a información das redes seleccionadas, incluíndo os contrasinals e " "calquera configuración personalizada." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historial" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2693,7 +2691,7 @@ msgstr "_Pechar" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Esquecer" @@ -2730,6 +2728,10 @@ msgid "Provider" msgstr "Fornecedor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Rede" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2835,16 +2837,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Contrasinal:" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ningunha" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Mostrar contr_asinal" @@ -2938,7 +2936,6 @@ msgstr "_Conectar a unha rede oculta…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historial" @@ -2960,360 +2957,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Contrasinal" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraestrutura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Estado descoñecido" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Sen xestionar" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Non dispoñíbel" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Conectando" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Requírese autenticación" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Conectado" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Desconectado" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "A conexión fallou" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Estado descoñecido (ausente)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Non conectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Fallou a configuración" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Fallou a configuración IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "A configuración IP expirou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Precísanse segredos, pero non se forneceron" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Suplicante de 802.1x desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Fallou a configuración do suplicante de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Fallou o suplicante de 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "O suplicante de 802.1x tardou moito tempo en autenticarse" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Produciuse un erro ao iniciar o servizo de PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Servizo PPP desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP fallou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Produciuse un erro ao iniciar o cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Erro no cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "O cliente DHCP fallou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Produciuse un erro ao iniciar o servizo de conexión compartida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "O servizo de conexión compartida fallou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Produciuse un erro ao iniciar o servizo AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Erro no servizo AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "O servizo AutoIP fallou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Liña ocupada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Non hai ton de chamada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Non foi posíbel estabelecer o «carrier»" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Expirou o tempo de solicitude de chamada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Intento de chamada fallado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Fallou a inicialización do módem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Produciuse un erro ao seleccionar o APN especificado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Non se están buscando redes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Rexistro da rede rexeitado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "O rexistro na rede superou o tempo de espera" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Produciuse un erro ao rexistrarse na rede solicitada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Produciuse un fallo na comprobación do PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "É posíbel que falte o firmware do dispositivo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "A conexión desapareceu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Asumiuse unha conexión existente" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Módem non atopado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Fallou a conexión Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Tarxeta SIM non insertada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Requírese o PIN da SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Requírese o PUK da SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM errónea" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "O dispositivo InfiniBand non admite o modo conectado" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Fallou a dependencia da conexión" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "falta o «firmware»" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cable desconectado" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Non se seleccionou unha Autoridade de Certificación" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "erro non definido na seguridde 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "non se seleccionou un ficheiro" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Non usar un certificado dunha Autoridade de Certificación (CA) pode dar " -"lugar a conexións inseguras a redes sen fíos promíscuas. Desexa seleccionar " -"un certificado dunha Autoridade de Certificación (CA)?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorar" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Seleccionar un certificado de CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "erro non especificado ao validar o ficheiro eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "falta o ficheiro EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Seleccione un ficheiro PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Ficheiros PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "Ficheiro _PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticación i_nterna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visionamento PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3322,41 +3295,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anónimo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticado" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ambos" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "Ficheiro _PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticación i_nterna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Permite o pro_visionado automático PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "falta o nome de usuario EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "falta o contrasinal EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nome de u_suario" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Mostrar _contrasinal" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "Certificado EAP-PEAP da CA non válido: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "Certificado EAP-PEAP da CA non válido: certificado non especificado" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Seleccionar un certificado de Autoridade de Certificación" @@ -3374,19 +3379,56 @@ msgid "C_A certificate" msgstr "Certificado C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Requírese o certificado da CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versión de PEAP:" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Preguntar este contrasinal cada vez" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "falta o nome de usuario EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "falta o contrasinal EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "falta a identidade EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificado EAP-TLS da CA non válido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificado EAP-TLS da CA non válido: certificado non especificado" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "contrasinal EAP-TLS non válido: falta" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "chave privada EAP-TLS non válida: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificado de usuario EAP-TLS non válido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "As chaves privadas sen cifrar son inseguras" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3400,11 +3442,11 @@ "\n" "(Pode protexer a súa chave privada con un contrasinal con openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Seleccione o seu certificado persoal" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Seleccione a súa chave privada" @@ -3416,51 +3458,56 @@ msgid "_User certificate" msgstr "Certificado de _usuario" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Chave privada" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Xerar unha chave _privada" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificado EAP-TTLS da CA non válido: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificado EAP-TTLS da CA non válido: certificado non especificado" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Non a_visar de novo" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Non" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Si" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Produciuse un erro descoñecido ao validar a seguridade 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS por medio de túnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP protexido (PEAP)" @@ -3470,6 +3517,51 @@ msgid "Au_thentication" msgstr "_Autenticación" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "falta o usuario leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "falta o contrasinal leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "falta a chave wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"falta a chave wep: a chave con unha lonxitude %zu debe conter só díxitos " +"hexadecimais" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"falta a chave wep: a chave con unha lonxitude %zu debe conter só díxitos " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"chave wep non válida: lonxitude %zu da chave non válida. A chave debe ter " +"unha lonxitude 5/13 (ascii) ou 10/26 (hexadecimal)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "chave wep non válida: a frase de paso non debe estar baleira" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"chave wep non válida: a frase de paso debe ser máis curta que 64 caracteres" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Predeterminada)" @@ -3506,19 +3598,34 @@ msgid "WEP inde_x" msgstr "Índic_e WEP:" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk non válido: a lonxitude de chave %zu non é valida. Debe ser [8,63] " +"bytes ou 64 dixitos hexadecimais" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk non válido: non se pode interpretar a chave con 64 bytes como " +"hexadecimais" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipo" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Activado" @@ -3555,16 +3662,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Mostrar c_ontido das mensaxes na pantalla de bloqueo" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificacións" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controle que notificacións se mostran e que contido mostran" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notificacións;Anuncio;Mensaxe;Bandexa;Emerxente;" @@ -3582,79 +3690,68 @@ msgid "Applications" msgstr "Aplicativos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Outra" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Engadir conta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Correo" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendario" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contactos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Recursos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Produciuse un erro ao iniciar a sesión na conta" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "As credenciais caducaron." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Inicie a sesión para activar esta conta." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Iniciar sesión" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Produciuse un erro ao crear a conta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Produciuse un erro ao quitar a conta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Ten certeza que quere retirar a conta?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Isto non retirará a conta do servidor." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Retirar" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Contas en liña" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Conéctese ás súas contas en liña a decida para que usalas" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3667,6 +3764,7 @@ msgstr "Non hai contas en liña configuradas" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Retirar conta" @@ -3809,7 +3907,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batería" @@ -3857,102 +3955,103 @@ msgid "When _idle" msgstr "Ao estar _inactivo" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Aforro de enerxí­a" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Brillo da pantall_a" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Brillo automático" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Brillo do _teclado" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Escurecer a pantalla se está inactivo" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Pantalla en _branco" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wifi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Apagar WiFi para aforrar enerxía." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Banda larga _móbil" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Apagar a banda larga móbil (3G, 4G, WiMax, etc.) para aforrar enerxía" -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Ao usar enerxía da batería" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Ao estar enchufado" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Suspender" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernar" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Non facer nada" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Botón de suspender e apagar" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Suspensión _automática" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Suspensión automática" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Ao premer o botón de acendido" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositivos" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Enerxía" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Vexa o estado da súa batería e cambie as preferencias de aforro de enerxía" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4031,11 +4130,6 @@ msgid "Delay" msgstr "Retraso" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Cancelar" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autenticar" @@ -4045,138 +4139,138 @@ msgstr "Requírese autenticación" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Toner baixo" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Sen tóner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Nivel de revelador baixo" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Sen revelador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Cartucho con pouca tinta" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Cartucho esgotado" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Abrir cuberta" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Abrir porta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Nivel de papel baixo" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Sen papel" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Desconectada" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Detida" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "O recipiente de refugallos está case cheo" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "O recipiente dos refugallos está cheo" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "O condutor óptico está perto do final da súa vida" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "O condutor óptico xa non funciona" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Configurando" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Lista" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Non aceptar traballos" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Procesando" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nivel do tóner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nivel de tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nivel do suministro" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instalando" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4184,15 +4278,15 @@ msgstr[1] "%u activos" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Produciuse un erro ao engadir unha nova impresora." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Seleccionar ficheiro PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4200,50 +4294,47 @@ "Ficheiros de descrición de impresora PostScript (*.ppd, *.PPD, *.ppd.gz, *." "PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Non se atopou ningún controlador axeitado" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Buscando controladores prefiridos…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Seleccionar da base de datos…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Fornecer ficheiro PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Páxina de proba" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Non hai impresoras" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Non foi posíbel cargar a IU: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Impresoras" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Engadir impresoras, vexa os traballos de impresión e decida que quere " "imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Impresora;Cola;Imprimir;Papel;Tinta;Tóner;" @@ -4405,6 +4496,11 @@ msgid "Parallel Port" msgstr "Porto paralelo" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4617,13 +4713,17 @@ msgid "_Options" msgstr "_Opcións" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Non hai impresoras" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Engadir unha impresora" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4631,70 +4731,70 @@ "O servizo do sistema de impresión\n" "semella que non está dispoñíbel." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Bloqueo de pantalla" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "En uso" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Activado" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Desactivado" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Servizos de localización" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Uso e historial" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Desexa baleirar todos os elementos do lixo?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Pérdese permanentemente todos os elementos do lixo." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Baleirar o lixo" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Desexa eliminar todos os ficheiros temporais?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Todos os ficheiros temporais eliminaranse de forma permanente." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Eliminar os ficheiros temporais" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Limpar o lixo e ficheiros temporais" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Uso do software" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Informe de erros" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4703,20 +4803,21 @@ "Ao enviar informes de problemas técnicos axudaranos a mellorar %s. Os " "informes envíanse de forma anónima e límpanse de datos persoais." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Política de privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Protexa a súa información persoal e controle que poden ver outros" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4887,21 +4988,21 @@ msgid "Other" msgstr "Outra" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "A súa sesión debe reiniciarse para que se apliquen os cambios" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Reiniciar agora" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Non se atopou ningunha orixe de entrada" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Pantalla de inicio de _sesión" @@ -4933,11 +5034,12 @@ msgid "Paper" msgstr "Papel" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Rexión e idioma" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4945,7 +5047,7 @@ "de entrada" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Idioma:Distribución;Teclado;Entrada;" @@ -5002,7 +5104,7 @@ msgstr "Alt esquerdo+dereito" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Idioma:" @@ -5052,26 +5154,11 @@ "As preferencias de inicio de sesión úsanas todos os usuarios ao iniciar a " "sesión no sistema" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Lugares" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Outra" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Seleccionar localización" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Aceptar" @@ -5079,18 +5166,19 @@ msgid "No applications found" msgstr "Non se atoparon aplicativos" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Buscar" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Controle que aplicativos mostran resultados de busca na Vista de actividades" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Buscar;Atopar;Índice;Oculto;Privacidade;Resultados;" @@ -5098,6 +5186,18 @@ msgid "Search Locations" msgstr "Buscar localizacións" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Lugares" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Outra" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Subir" @@ -5110,6 +5210,11 @@ msgid "Preferences" msgstr "Preferencias" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Non hai ningunha rede seleccionada para compartir" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5135,21 +5240,54 @@ msgid "Choose a Folder" msgstr "Seleccione un cartafol" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"A compartición de ficheiros persoais permítelle compartir o seu cartafol " +"Público con outros na súa rede actual usando: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Cando está activado o acceso remoto, os usuarios remotos poden conectarse " +"usando a orde de Shell segura: ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"A compatición de pantalla permítelle aos usuarios remotos ver ou controlar a " +"súa pantalla conectándose a: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copiar" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Compartición" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Compartición" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controle que quere compartir con outros" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5157,6 +5295,10 @@ "compartir;compartición;ssh:equipo;nome;remoto;escritorio;son;vídeo;imaxes;" "fotos;filmes;servidor;renderizador;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Redes" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Activar ou desactivar o inicio de sesión remoto" @@ -5166,25 +5308,13 @@ msgstr "" "Requírese autenticación para activar ou desactivar o inicio de sesión remoto" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Non hai ningunha rede seleccionada para compartir" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Redes" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nome do _computador" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Compartición de ficheiros _persoais" +msgid "_File Sharing" +msgstr "Compartición de _ficheiros" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5203,85 +5333,54 @@ msgstr "Algúns servizos están desactivados devido a que non ten acceso á rede." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Compartición de ficheiros persoais" +msgid "File Sharing" +msgstr "Compartición de ficheiros" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"A compartición de ficheiros persoais permítelle compartir o seu cartafol " -"Público con outros na súa rede actual usando: dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Requirir _contrasinal" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Inicio de sesión remoto" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Permitir a usuarios remotos conectarse usando a orde de Shell segura: ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Compartición de pantalla" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Permitir a usuarios remotos ver ou controlar a súa pantalla conectándose a: " -"vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Permitir o control _remoto" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Permitir as conexións para controlar a pantalla" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Contrasinal:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Mo_strar contrasinal" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Opcións de acceso" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "As _novas conexións deben solicitar acceso" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Requirir un _contrasinal" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Compartición de multimedia" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"A compartición multimedia permítelle compartir música, fotos e vídeos pola " -"rede." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Compartir música, fotos e vídeos pola rede." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Cartafoles" @@ -5409,11 +5508,6 @@ msgid "Peak detect" msgstr "Detección de picos" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nome" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositivo" @@ -5508,16 +5602,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personalizado" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Acceso universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Faga máis doado ver, escoitar, escribir, apuntar e clicar" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5615,8 +5714,8 @@ msgstr "Teclas de son" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pitar cando o Bloq Num ou Maius Bloq están activados." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pitar cando o Bloq Num ou Maius Bloq se activen ou desactiven." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5998,97 +6097,69 @@ msgstr "Efectos de cor" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Engadir usuario" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Nome _completo" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Estándar" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrador" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Nome _completo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipo de conta" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Permitirlle ao usuario estabelecer o contrasinal no seguinte _inicio de " "sesión" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Estabelecer un contrasinal _agora" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verificar" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirmar" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "O inicio de sesión corporativo permítelle xestionar unha conta de usuario " -"xestionada de forma centralizada para usala neste dispositivo." +"xestionada de forma centralizada para usala neste dispositivo. Tamén pode " +"usar esta conta para acceder a recursos corporativos en internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Dominio" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Conéctese para engadir contas\n" -"de inicio de sesión corporativo." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Inicio de s_esión corporativo" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Engadir usuario" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Unirse" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Inicio de sesión do administrador do dominio" +msgid "You are Offline" +msgstr "Vostede está desconectado" -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Para usar inicios de sesión corporativos, este equipo precisa \n" -"formar parte dun dominio. Pida ao administrador do seu sistema \n" -"que escriba aquí o contrasinal do dominio." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nome do administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Debe estar en liña para engadir usuarios corporativos." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Contrasinal do administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Inicio de s_esión corporativo" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6123,7 +6194,7 @@ msgstr "Dedo maimiño dereito" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Activar o Inicio con pegadas dixitais" @@ -6160,9 +6231,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Inicio de sesión;Nome;Pegada dixital;Avatar;Logotipo;Cara;Contrasinal;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Historial de inicio de sesión" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Unirse" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Inicio de sesión do administrador do dominio" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Para usar inicios de sesión corporativos, este equipo precisa \n" +"formar parte dun dominio. Pida ao administrador do seu sistema \n" +"que escriba aquí o contrasinal do dominio." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nome do administrador" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Contrasinal do administrador" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6185,39 +6279,31 @@ msgstr "_Contrasinal actual" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" -"Permitirlle ao usuario estabelecer o contrasinal no seguinte inicio de sesión" +"Permitirlle ao usuario cambiar o seu contrasinal no seguinte inicio de sesión" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Estabelecer un contrasinal agora" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Engadir conta de usuario" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Retirar conta de usuario" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Engadir usuario…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Preferencias de inicio de sesión" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "_Inicio de sesión automático" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Inicio de sesión con _pegadas dixitais" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icona de usuario" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Último inicio de sesión" @@ -6320,8 +6406,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Misture letras en maiúsculas e minúsculas, e use un número ou dous." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Mesture letras en maiúsculas e minúsculas e use un número ou dous." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6412,32 +6498,32 @@ msgstr "Erro descoñecido" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Debería coincidir co enderezo web do seu fornecedor de conta." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Produciuse un erro ao engadir a conta" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Os contrasinais non coinciden." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Produciuse un erro ao rexistrar a conta" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Non hai unha maneira admitida de autenticar con este dominio" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Produciuse un erro ao unirse ao dominio" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6445,7 +6531,7 @@ "Ese nome de inicio de sesión non funcionou.\n" "Ténteo de novo." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6453,14 +6539,24 @@ "Ese contrasinal de inicio de sesión non funcionou.\n" "Ténteo de novo." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Produciuse un erro ao iniciar sesión no dominio" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Non foi posíbel atopar o dominio. Pode ser que o escribira mal?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Estándar" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrador" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6480,15 +6576,15 @@ msgid "Enabled" msgstr "Activado" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Desexa eliminar as pegadas dixitais rexistradas?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Eliminar pegadas dixitais" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6496,15 +6592,15 @@ "Desexa eliminar as súas pegadas dixitais rexistradas para desactivar o " "inicio de sesión con pegadas dixitais?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Feito" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Non foi posíbel acceder ao dispositivo «%s»" @@ -6512,16 +6608,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Non foi posíbel iniciar a captura do dedo no dispositivo «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Non foi posíbel acceder a ningún lector de pegadas dixitais" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contacte co administrador do seu sistema para obter axuda." @@ -6530,7 +6626,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6539,11 +6635,11 @@ "Para activar o inicio de sesión con pegadas dixitais debe gardar unha das " "súas pegadas dixitais usando o dispositivo «%s»." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Seleccionando dedo" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Rexistrando pegadas dixitais" @@ -6597,14 +6693,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sesión rematada" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sesión iniciada" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Actividade da conta" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Seleccione outro contrasinal." @@ -6666,7 +6769,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Non foi posíbel conectarse ao dominio %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Outras contas" @@ -6746,15 +6849,15 @@ msgid "Logged in" msgstr "Conectado" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Produciuse un erro ao contactar co servizo de contas" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Asegúrese de que o servizo de contas está instalado e activado." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6762,12 +6865,12 @@ "Para realizar os cambios,\n" "primeiro prema na icona *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Crear unha conta de usuario" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6775,12 +6878,12 @@ "Para crear unha conta de usuario,\n" "primeiro prema na icona *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Eliminar a conta de usuario seleccionada" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6788,33 +6891,32 @@ "Para eliminar a conta de usuario seleccionada,\n" "primeiro prema na icona *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "A miña conta" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Xa existe un usuario co nome de usuario «%s»." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Desculpe, o nome de usuario non está dispoñíbel. Probe outro." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "O nome de usuario é demasiado longo." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "O nome de usuario non pode comezar con «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "O nome de usuario debe estar formado por letras en maiúsculas e minúsculas " -"desde o «a» ao «z», díxitos, e calquera dos caracteres «.», «-» e «_»." +"desde o «a» ao «z», díxitos, e o caracteres: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Usarase como nome para o seu cartafol persoal e non pode cambiarse." @@ -6904,19 +7006,19 @@ msgid "Button" msgstr "Botón" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tableta Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Estabeleza a asignación de botóns e axuste a sensibilidade do seu bolígrafo " "dixital nas tabletas gráficas" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tableta;Wacom;Stylus;Borrador;Rato;" @@ -6948,6 +7050,10 @@ msgid "Bluetooth Settings" msgstr "Preferencias de Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tableta Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapa que monitorizar…" @@ -7041,22 +7147,22 @@ msgid "Mode Switch #%d" msgstr "Modo conmutador #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Botón esquerdo #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Botón dereito #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Botón superior #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Botón inferior #%d" @@ -7133,6 +7239,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilidade de presión do lapis" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Todas as preferencias" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centro de control de GNOME" @@ -7189,22 +7300,18 @@ msgid "Quit" msgstr "Saír" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Todas as preferencias" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Persoal" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7243,6 +7350,189 @@ msgid "Cancel search" msgstr "Cancelar a busca" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Atallo de teclado para %s. Escriba un novo atallo para cambialo." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Para editar unha tecla de atallo prema na fila correspondente e prema " +#~ "unha combinación de teclas nova, ou prema a tecla de «Retroceso» para " +#~ "limpar todo." + +#~ msgid "Color" +#~ msgstr "Cor" + +#~ msgid "_Name:" +#~ msgstr "_Nome:" + +#~ msgid "Add Shortcut" +#~ msgstr "Engadir atallo" + +#~ msgid "Remove Shortcut" +#~ msgstr "Retirar atallo" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Non é posíbel utilizar o atallo «%s» porque sería imposíbel escribir " +#~ "usando esta tecla.\n" +#~ "Ténteo de novo cunha tecla como Control, Alt ou Maiús ao mesmo tempo." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "O atallo «%s» xa se está usando para\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Se reasigna o atallo para «%s», desactivarase o atallo «%s»." + +#~ msgid "_Reassign" +#~ msgstr "_Reasignar" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "O atallo «%s» ten un atallo «%s» asociado. Desexa estabelecelo a «%s» " +#~ "automaticamente?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "«%s» está asociado actualmente con «%s», este atallo desactivarase se " +#~ "sigue." + +#~ msgid "_Assign" +#~ msgstr "_Asignar" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Equipo" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Non foi posíbel cargar os engadidos de VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Engadir conexión de rede" + +#~ msgid "Bond slaves" +#~ msgstr "Escravos Bond" + +#~ msgid "(none)" +#~ msgstr "(ningún)" + +#~ msgid "Bridge slaves" +#~ msgstr "Escravos Bridge" + +#~ msgid "Team slaves" +#~ msgstr "Escravos do equipo" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "O dispositivo InfiniBand non admite o modo conectado" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Non se seleccionou unha Autoridade de Certificación" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Non usar un certificado dunha Autoridade de Certificación (CA) pode dar " +#~ "lugar a conexións inseguras a redes sen fíos promíscuas. Desexa " +#~ "seleccionar un certificado dunha Autoridade de Certificación (CA)?" + +#~ msgid "Ignore" +#~ msgstr "Ignorar" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Seleccionar un certificado de CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Preguntar este contrasinal cada vez" + +#~ msgid "Don't _warn me again" +#~ msgstr "Non a_visar de novo" + +#~ msgid "No" +#~ msgstr "Non" + +#~ msgid "Yes" +#~ msgstr "Si" + +#~ msgid "Error logging into the account" +#~ msgstr "Produciuse un erro ao iniciar a sesión na conta" + +#~ msgid "Credentials have expired." +#~ msgstr "As credenciais caducaron." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Inicie a sesión para activar esta conta." + +#~ msgid "_Sign In" +#~ msgstr "_Iniciar sesión" + +#~ msgid "Power" +#~ msgstr "Enerxía" + +#~ msgid "Privacy" +#~ msgstr "Privacidade" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Outra" + +#~ msgid "Personal File Sharing" +#~ msgstr "Compartición de ficheiros persoais" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Permitir o control _remoto" + +#~ msgid "_Verify" +#~ msgstr "_Verificar" + +#~ msgid "Login History" +#~ msgstr "Historial de inicio de sesión" + +#~ msgid "Add User Account" +#~ msgstr "Engadir conta de usuario" + +#~ msgid "Remove User Account" +#~ msgstr "Retirar conta de usuario" + +#~ msgid "Login Options" +#~ msgstr "Preferencias de inicio de sesión" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Xa existe un usuario co nome de usuario «%s»." + #~ msgid "Used to determine your geographical location" #~ msgstr "Usado para determinar a súa localización xeográfica" @@ -7274,9 +7564,6 @@ #~ msgid "S_peed:" #~ msgstr "_Velocidade:" -#~ msgid "Shortcuts" -#~ msgstr "Atallos de teclado" - #~ msgid "Test Your Settings" #~ msgstr "Comprobar a súa configuración" @@ -7315,9 +7602,6 @@ #~ msgid "Fast" #~ msgstr "Rápido" -#~ msgid "Two _finger scroll" -#~ msgstr "Despra_zamento con dous dedos" - #~ msgid "No printers available" #~ msgstr "No hai impresoras dispoñíbeis" @@ -7718,9 +8002,6 @@ #~ msgid "Show Status When _Inactive" #~ msgstr "Mostrar o estado ao estar _inactivo" -#~ msgid "_Confirm Password" -#~ msgstr "_Confirmar contrasinal" - #~ msgid "_Login Name" #~ msgstr "Nome de _usuario" @@ -7743,9 +8024,6 @@ #~ msgid "Domain not found." #~ msgstr "Dominio non atopado." -#~ msgid "Wrong password" -#~ msgstr "Contrasinal incorrecto" - #~ msgctxt "Password hint" #~ msgid "Try to add more characters." #~ msgstr "Tente engadir máis caracteres." diff -Nru gnome-control-center-3.20.2/po/gu.po gnome-control-center-3.22.1/po/gu.po --- gnome-control-center-3.20.2/po/gu.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/gu.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2014-09-22 11:54+0530\n" "Last-Translator: \n" "Language-Team: American English \n" -"Language: \n" +"Language: gu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/he.po gnome-control-center-3.22.1/po/he.po --- gnome-control-center-3.20.2/po/he.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/he.po 2016-09-27 12:37:36.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: gnome-control-center.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-05 19:54+0200\n" -"PO-Revision-Date: 2016-03-05 19:56+0200\n" +"POT-Creation-Date: 2016-09-10 22:43+0300\n" +"PO-Revision-Date: 2016-09-10 22:45+0300\n" "Last-Translator: Yosef Or Boczko \n" "Language-Team: עברית <>\n" "Language: he\n" @@ -92,7 +92,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "בית" @@ -105,27 +105,26 @@ #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 -#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:29 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 #: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2023 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:1995 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:1003 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -156,16 +155,17 @@ msgid "Current background" msgstr "הרקע הנוכחי" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "רקע" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "החלפת תמונת הרקע שלך לצילום או ליצירת אומנות" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "רקע;תמונת רקע;צג;מסך;" @@ -205,18 +205,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "יש לכבות את מצב הטיסה על מנת לאפשר Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "הפעלה וכיבוי של ה־Bluetooth והתחברות להתקנים שלך" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "שיתוף;לשתף;Bluetooth;obex;" @@ -385,7 +384,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "כל הקבצים" @@ -424,7 +423,7 @@ msgstr "שמירת הפרופיל" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_שמירה" @@ -675,176 +674,181 @@ "\">Microsoft Windows יביאו לך תועלת." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "תקציר" #: ../panels/color/color.ui.h:28 +msgid "Add profile" +msgstr "הוספת פרופיל" + +#: ../panels/color/color.ui.h:29 msgid "_Import File…" msgstr "_יבוא קובץ…" -#: ../panels/color/color.ui.h:30 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "הו_ספה" -#: ../panels/color/color.ui.h:31 +#: ../panels/color/color.ui.h:32 msgid "" "Problems detected. The profile may not work correctly. Show " "details." msgstr "" "התגלו בעיות. יתכן שהפרופיל לא יעבוד כראוי. הצגת פרטים." -#: ../panels/color/color.ui.h:32 +#: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." msgstr "לכל התקן דרוש פרופיל צבע עדכני כדי שניתן יהיה לנהל אותו לפי צבע." -#: ../panels/color/color.ui.h:33 +#: ../panels/color/color.ui.h:34 msgid "Learn more" msgstr "מידע נוסף" -#: ../panels/color/color.ui.h:34 +#: ../panels/color/color.ui.h:35 msgid "Learn more about color management" msgstr "מידע נוסף בנוגע לניהול צבעים" -#: ../panels/color/color.ui.h:35 +#: ../panels/color/color.ui.h:36 msgid "_Set for all users" msgstr "ה_גדרה לכל המשתמשים" -#: ../panels/color/color.ui.h:36 +#: ../panels/color/color.ui.h:37 msgid "Set this profile for all users on this computer" msgstr "הגדרת פרופיל זה לכל המשתמשים במחשב זה" -#: ../panels/color/color.ui.h:37 +#: ../panels/color/color.ui.h:38 msgid "_Enable" msgstr "ה_פעלה" -#: ../panels/color/color.ui.h:38 +#: ../panels/color/color.ui.h:39 msgid "_Add profile" msgstr "הו_ספת פרופיל" -#: ../panels/color/color.ui.h:39 +#: ../panels/color/color.ui.h:40 msgid "_Calibrate…" msgstr "_כיול…" -#: ../panels/color/color.ui.h:40 +#: ../panels/color/color.ui.h:41 msgid "Calibrate the device" msgstr "כיול ההתקן" -#: ../panels/color/color.ui.h:41 +#: ../panels/color/color.ui.h:42 msgid "_Remove profile" msgstr "ה_סרת פרופיל" -#: ../panels/color/color.ui.h:42 +#: ../panels/color/color.ui.h:43 msgid "_View details" msgstr "_צפייה בפרטים" -#: ../panels/color/color.ui.h:43 +#: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" msgstr "לא ניתן לזהות התקנים כלשהם שניתן לנהל בהם את הצבע" -#: ../panels/color/color.ui.h:44 +#: ../panels/color/color.ui.h:45 msgid "LCD" msgstr "LCD" -#: ../panels/color/color.ui.h:45 +#: ../panels/color/color.ui.h:46 msgid "LED" msgstr "LED" -#: ../panels/color/color.ui.h:46 +#: ../panels/color/color.ui.h:47 msgid "CRT" msgstr "CRT" -#: ../panels/color/color.ui.h:47 +#: ../panels/color/color.ui.h:48 msgid "Projector" msgstr "מקרן" -#: ../panels/color/color.ui.h:48 +#: ../panels/color/color.ui.h:49 msgid "Plasma" msgstr "פלזמה" -#: ../panels/color/color.ui.h:49 +#: ../panels/color/color.ui.h:50 msgid "LCD (CCFL backlight)" msgstr "‏LCD ‏(CCFL תאורה אחורית)" -#: ../panels/color/color.ui.h:50 +#: ../panels/color/color.ui.h:51 msgid "LCD (RGB LED backlight)" msgstr "‏LCD ‏(RGB LED תאורה אחורית)" -#: ../panels/color/color.ui.h:51 +#: ../panels/color/color.ui.h:52 msgid "LCD (white LED backlight)" msgstr "‏LCD (תאורת LED אחורית)" -#: ../panels/color/color.ui.h:52 +#: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" msgstr "טווח צבעים רחב LCD ‏(CCLF תאורה אחורית)" -#: ../panels/color/color.ui.h:53 +#: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" msgstr "טווח צבעים רחב LCD ‏(RGB LED תאורה אחורית)" -#: ../panels/color/color.ui.h:54 +#: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" msgid "High" msgstr "גבוהה" -#: ../panels/color/color.ui.h:55 +#: ../panels/color/color.ui.h:56 msgid "40 minutes" msgstr "40 דקות" -#: ../panels/color/color.ui.h:56 +#: ../panels/color/color.ui.h:57 msgctxt "Calibration quality" msgid "Medium" msgstr "בינונית" -#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:2 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 #: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "חצי שעה" -#: ../panels/color/color.ui.h:58 +#: ../panels/color/color.ui.h:59 msgctxt "Calibration quality" msgid "Low" msgstr "נמוכה" -#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:1 +#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1 msgid "15 minutes" msgstr "רבע שעה" -#: ../panels/color/color.ui.h:60 +#: ../panels/color/color.ui.h:61 msgid "Native to display" msgstr "טבעי לתצוגה" -#: ../panels/color/color.ui.h:61 +#: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" msgstr "D50 (הדפסה והוצאה לאור)" -#: ../panels/color/color.ui.h:62 +#: ../panels/color/color.ui.h:63 msgid "D55" msgstr "D55" -#: ../panels/color/color.ui.h:63 +#: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" msgstr "D65 (צילום וגרפיקה)" -#: ../panels/color/color.ui.h:64 +#: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "צבע" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "כיול הצבע של ההתקנים שלך כגון צגים, מצלמות או מדפסות" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "צבע;ICC;פרופיל;כיול;מדפסת;תצוגה;" @@ -862,23 +866,23 @@ msgid "No languages found" msgstr "לא נמצאו שפות" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "היום" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "אתמול" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e ב%b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e ב%b, 2013" @@ -998,8 +1002,9 @@ msgid "December" msgstr "דצמבר" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "תאריך ושעה" @@ -1056,12 +1061,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "החלפת השעה והתאריך לרבות אזור הזמן" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "שעון;אזור זמן;מיקום;" @@ -1083,20 +1088,20 @@ msgstr "שכפול צגים" #: ../panels/display/cc-display-panel.c:578 -#: ../panels/display/cc-display-panel.c:2195 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "ראשי" #: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "כבוי" @@ -1111,7 +1116,7 @@ msgstr "סידור תצוגה משולבת" #: ../panels/display/cc-display-panel.c:1562 -#: ../panels/display/cc-display-panel.c:2024 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" @@ -1121,142 +1126,174 @@ msgid "Drag displays to rearrange them" msgstr "יש לגרור את התצוגות כדי לסדר אותן מחדש" -#: ../panels/display/cc-display-panel.c:2073 +#. translators: example string is "60 Hz (NTSC)" +#. * NTSC is https://en.wikipedia.org/wiki/NTSC +#: ../panels/display/cc-display-panel.c:1793 +#, c-format +msgid "%d Hz (NTSC)" +msgstr "%d הרץ (NTSC)" + +#. translators: example string is "60 Hz" +#: ../panels/display/cc-display-panel.c:1799 +#, c-format +msgid "%d Hz" +msgstr "%d הרץ" + +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "סיבוב נגד כיוון השעון ב־90°" -#: ../panels/display/cc-display-panel.c:2091 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "סיבוב ב־180°" -#: ../panels/display/cc-display-panel.c:2109 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "סיבוב עם כיוון השעון ב־90°" -#: ../panels/display/cc-display-panel.c:2130 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "גודל" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2143 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "יחס גובה" -#: ../panels/display/cc-display-panel.c:2165 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "הבחנה" -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "התאמה לטלויזיה" + +#: ../panels/display/cc-display-panel.c:2398 +msgid "Refresh Rate" +msgstr "תדירות ר_ענון:" + +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "הצגת הלוח העליון וסקירת פעילויות בתצוגה זו" -#: ../panels/display/cc-display-panel.c:2202 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "השהיית לחיצה משנית" -#: ../panels/display/cc-display-panel.c:2203 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "צירוף תצוגה זו עם אחרת ליצירת שולחן עבודה נוסף" -#: ../panels/display/cc-display-panel.c:2210 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "כיוון" -#: ../panels/display/cc-display-panel.c:2211 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "הצגת מצגות ומדיה בלבד" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2216 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "שגיאה" -#: ../panels/display/cc-display-panel.c:2217 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "הצגת התצוגה הקיימת שלך בשתי התצוגות" -#: ../panels/display/cc-display-panel.c:2223 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "ה_פעלה" -#: ../panels/display/cc-display-panel.c:2224 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "לא ניתן להשתמש בתצוגה זו" -#: ../panels/display/cc-display-panel.c:2525 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "לא ניתן לקבל את פרטי הצג" -#: ../panels/display/cc-display-panel.c:2556 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "סידור _תצוגה משולבת" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "תצוגות" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "בחירה כיצד להשתמש בצגים ובמקרנים" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "לוח;מקרן;xrandr;צג;מסך;רזולוציה;רענון;צג;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "לא ידוע" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "‏%s ‏%d סיביות (מזהה בנייה: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d סיביות (מזהה בנייה: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" -msgstr "%s %d-סיביות" +msgstr "‏%s %d סיביות" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" -msgstr "%d-סיביות" +msgstr "%d סיביות" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "הצגת שאלה בנוגע להמשך" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "לא לעשות דבר" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "פתיחת תיקייה" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "מדיה אחרת" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "נא לבחור יישום לתקליטורי שמע" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "נא לבחור יישום לתקליטורי וידאו DVD" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "נא לבחור יישום להפעלה בעת חיבור נגן מוזיקה" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "נא לבחור יישום להפעלה בעת חיבור המצלמה" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "נא לבחור יישום לתקליטורי תכנה" @@ -1265,88 +1302,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "תקליטור DVD שמע" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "תקליטור Blu-ray ריק" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "תקליטור CD ריק" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "תקליטור DVD ריק" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "תקליטור HD DVD ריק" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "תקליטור וידאו Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "מציג ספרים אלקטרוניים" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "תקליטור וידאו HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "תקליטור תמונות" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "סופר תקליטור וידאו (SVCD)" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "תקליטור וידאו (VCD)" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "תכנה של Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "אגף" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "סקירה" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "יישומי בררת המחדל" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "מדיה נתיקה" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "גרסה %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "פרטים" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "צפייה בפרטים על המערכת שלך" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1520,8 +1555,9 @@ msgid "Launch help browser" msgstr "הפעלת דפדפן העזרה" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "הגדרות" @@ -1594,7 +1630,6 @@ msgstr "נעילת המסך" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "גישה אוניברסלית" @@ -1630,11 +1665,21 @@ msgid "High contrast on or off" msgstr "ביטול/הפעלה של ניגודיות גבוהה" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "קיצורי דרך מותאמים אישית" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1661,119 +1706,129 @@ msgid "Modifiers-only switch to next source" msgstr "העברה באמצעות מקשי החלפה בלבד למקור הבא" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "מקלדת" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "איפוס צירופי המקשים לערך ברירת המחדל" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "‏%s כבר משויך אל %s. אם ברצונך להחליף בו, %s יושבת" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "הגדרת צירופי מקשים מותמים אישית" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "הגדרת צירופי מקשים" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "יש להקיש צירופי מקשים חדשים לשינוי ‏%s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "הוספת צירוף מקשים חדש" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "מקלדת" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "הצגה ושינוי קיצורי מקשים להעדפות ההקלדה שלך" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "קיצור דרך;חזרה;הבהוב;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "קיצור דרך מותאם אישית" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_שם:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "פקו_דה:" +msgid "No keyboard shortcut found" +msgstr "לא נמצאו צירופי מקשים" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "הוספת קיצור דרך" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "הסרת קיצור דרך" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"כדי לערוך מקש קיצור דרך, יש ללחוץ על השורה המתאימה ולהחזיק את צירוף המקשים " -"החדש או ללחוץ על Backspace כדי למחוק." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "קיצורי דרך מותאמים אישית" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "יש לנסות חיפוש שונה" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<פעולה לא ידועה>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "יש להקיש Esc לביטול." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"לא ניתן להשתמש בקיצור הדרך „%s“ מכיוון שלא ניתן יהיה להקליד באמצעות מקש זה.\n" -"נא לנסות מקש או צירוף מקשים שונה כגון לחיצה על Ctrl, Alt או Shift יחדיו." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "שם" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"קיצור הדרך „%s“ כבר משמש ל:\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "פקודה" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "קיצור" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "עריכה" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "אם קיצור הדרך יוקצה מחדש אל „%s“, קיצור הדרך „%s“ יבוטל." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "ללא" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "הקצאה _מחדש" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "הסרה" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "יש להקיש על צירוף המקשים החדש" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"הקיצור „%s” משויך לקיצור „%s”. האם ברצונך להגדיר אותו באופן אוטומטי ל־„%s”?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "ביטול" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "‏„%s” משויך כעת אל „%s”, קיצור זה יושבת אם אפשרות זו תיבחר." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "הוספה" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "ה_קצאה" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "החלפה" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "הגדרה" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "ב_דיקת ההגדרות שלך" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "עכבר ומשטח מגע" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "שינוי העכבר שלך או רגישות משטח מגע ובחירת לחצן ראשי ימני או שמאלי" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "משטח מגע;סמן;לחיצה;טפיחה;כפולה;לחצן;כדור שליטה;" @@ -1831,6 +1886,10 @@ msgstr "הקשה היא לחיצה" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "גלילה בשתי אצבעות" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "קצה גלילה" @@ -1869,11 +1928,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "מצב _טיסה" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "מתווך הרשת" @@ -1881,17 +1940,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "אופס, משהו השתבש. נא ליצור קשר עם ספק התכנה שלך." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager צריך לפעול" @@ -1907,7 +1966,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1924,59 +1983,64 @@ msgid "page 2" msgstr "עמוד 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "אבטחה" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "אוטומטית" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "פרופיל %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "ארגוני" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "ללא" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "לעולם לא" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -1985,179 +2049,179 @@ msgstr[2] "שלשום" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d מסל״ש" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "ללא" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "חלש" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "טוב" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "טוב" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "מצוין" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "פרטים" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "זהות" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "כתובת" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "מסכת רשת" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "שער גישה" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "מחיקת כתובת" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "הוספה" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "שרת" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "מחיקת שרת DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "מטרית" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "מחיקת נתיב" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "אוטומטי (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "ידני" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "קישור מקומי בלבד" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "קידומת" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "אוטומטי" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "אוטומטי, DHCP בלבד" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "איפוס" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "ללא" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "מפתח WEP 40‏/128-סיביות (הקסדצימלי או ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "מילת צופן WEP‏ 128-סיביות" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "‏WEP דינמי (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 אישי" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA ו־ WPA2 ארגוני" @@ -2172,30 +2236,30 @@ msgstr "מהירות הקישור" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "כתובת IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "כתובת IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "כתובת חומרה" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2205,7 +2269,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2288,13 +2352,13 @@ msgid "Firewall _Zone" msgstr "אזור _חומת אש" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "בררת מחדל" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "האזור מגדיר את רמת המהימנות של החיבור" @@ -2336,45 +2400,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "לא ניתן לפתוח את עורך החיבורים" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "פרופיל חדש" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "מאגד" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "צוות" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "גשר" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "רשת וירטואלית" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "לא ניתן לטעון את תוספי ה־VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "יבוא מקובץ…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "הוספת חיבור לרשת" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "הוספת VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2382,7 +2426,7 @@ msgstr "_איפוס" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "הת_עלמות" @@ -2404,11 +2448,11 @@ msgid "S_ecurity" msgstr "_אבטחה" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "לא ניתן לייבא חיבור VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2420,36 +2464,36 @@ "\n" "שגיאה: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "נא לבחור קובץ לייבוא" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:1996 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_פתיחה" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "כבר קיים קובץ בשם „%s“." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "ה_חלפה" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "האם ברצונך להחליף את %s עם חיבור ה־VPN שנשמר כעת?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "לא ניתן לייצא את חיבור ה־VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2460,7 +2504,7 @@ "\n" "שגיאה: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "יצוא חיבור VPN" @@ -2487,60 +2531,46 @@ msgid "Make available to _other users" msgstr "לאפשר גישה גם למשתמשים _אחרים" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "רשת" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "שליטה באופן החיבור לאינטרנט" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "רשת;אלחוטי;אלחוטית;וייפיי;IP;רשת מקומית;מתווך;פרוקסי;אינטרנט;רשת רחבה;רוחב " -"פס;מודם;בלוטות׳;DNS;" +"פס;מודם;בלוטות׳;DNS;vpn;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "שותפים במאגד" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(אף אחד)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "שותפים במאגד" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "מעולם לא" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "היום" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "אתמול" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "כתובת IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "שימוש אחרון" @@ -2550,34 +2580,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "קווי" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "אפשרויות…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "פרופיל %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "הוספת התחברות חדשה" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "שותפים בצוות" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2585,44 +2606,44 @@ "אם יש לך חיבור לאינטרנט שאינו אלחוטי, ניתן להשתמש בכלי זה כדי לשתף את חיבור " "האינטרנט שלך עם אחרים." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "מעבר למצב נקודה אלחוטית תנתק אותך מהרשת %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "לא ניתן לגשת לאינטרנט דרך החיבור האלחוטי בזמן שהנקודה האלחוטית פעילה." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "האם לעצור את נקודת הגישה ולנתק את כל המשתמשים ?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_עצירת נקודת הגישה" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "מדיניות המערכת אוסרת שימוש בנקודה חמה" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "התקן הרשת האלחוטית אינו תומך במצב נקודה חמה" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "פרטי הרשתות הנבחרות, לרבות ססמאות וכל תצורה אחרת שהותאמה אישית יאבדו." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "היסטוריה" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2630,7 +2651,7 @@ msgstr "ס_גירה" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "הת_עלמות" @@ -2665,6 +2686,10 @@ msgid "Provider" msgstr "ספק" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "רשת" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2770,16 +2795,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_ססמה" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "ללא" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "הצגת _ססמה" @@ -2869,7 +2890,6 @@ msgstr "התחברות לרשת _נסתרת…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "היס_טוריה" @@ -2891,359 +2911,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "ססמה" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "ייעודית" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "תשתית" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "המצב אינו ידוע" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "לא מנוהל" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "לא זמין" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "בהתחברות" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "נדרש אימות" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "מחובר" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "מתבצע ניתוק" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "החיבור נכשל" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "המצב אינו ידוע (חסר)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "לא מחובר" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "התצורה נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "תצורת ה־IP נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "תצורת ה־IP פגה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "נדרשו סודות אך לא סופקו" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "משלים ה־802.1x מנותק" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "תצורת משלים ה־802.1x נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "משלים ה־802.1x נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "למשלים ה־802.1x לקח זמן רב מדי ליצור אימות" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "הפעלת שירות ה־PPP נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "שירות ה־PPP מנותק" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "ה־PPP נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "הפעלת לקוח ה־DHCP נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "שגיאת לקוח DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "לקוח ה־DHCP נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "הפעלת שירות שיתוף החיבורים נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "שירות החיבור השיתופי נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "הפעלת שירות ה־AutoIP נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "שגיאה בשירות AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "שירות ה־AutoIP נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "הקו תפוס" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "אין צליל חיוג" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "לא ניתן ליצור קשר עם אף ספק" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "הזמן שהוקצב לבקשת החיוג פג" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "ניסיון החיוג נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "הפעלת המודם נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "הבחירה ב־APN הזה נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "לא מחפש אחר רשתות" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "הרישום ברשת נדחה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "הזמן שהוקצב לרישום לרשת פג" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "הרישום לרשת המבוקשת נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "בדיקת ה־PIN נכשלה" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "ייתכן שחסרה קושחה עבור ההתקן" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "החיבור נעלם" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "החיבור הנוכחי התבצע לפי הנחות" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "המודם לא נמצא" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "חיבור ה־Bluetooth נכשל" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "לא הוכנס כרטיס SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "נדרש ה־Pin של ה־SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "נדרש ה־Puk של ה־SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "ה־SIM שגוי" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "התקן InfiniBand אינו תומך במצב מחובר" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "תלות החיבור נכשלה" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "הקושחה חסרה" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "הכבל מנותק" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "לא נבחר אישור של רשות אישורים" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "שגיאה לא מוגדרת באבטחת 802.1x ‏(wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "לא נבחר קובץ" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"חוסר אישור של רשות אישורים (CA) יכול לגרום להתחברויות לא בטוחות, רשתות " -"אלחוטיות מזויפות. האם ברצונך לבחור אישור של רשות אישורים?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "התעלמות" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "נא לבחור באישור רשות אישורים" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "מפתחות פרטיים מסוג DER, PEM,או PKCS#12 ‏(‎*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "שגיאה לא ידועה באימות קובץ eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "מפתחות פרטיים מסוג DER, PEM או PKCS#12 ‏(‎*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "אישורי DER או PEM‏ (‎*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "חסרים הקבצים EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "בחירת קובץ PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "קובצי PAC‏ (‎*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_קובץ PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "אימות _פנימי" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "ה_קצאת PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3252,41 +3249,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "אלמוני" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "עם אימות" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "שניהם" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_קובץ PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "אימות _פנימי" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "אפשור הקצאת PAC _אוטומטית" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "חסר שם משתמש EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "חסרה ססמת EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_שם משתמש" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "ה_צגת ססמה" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "אישור EAP-PEAP CA לא תקף: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "אישור EAP-PEAP CA לא תקף: לא סופקו אישורים" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "בחירת אישור של רשות אישורים" @@ -3304,19 +3333,56 @@ msgid "C_A certificate" msgstr "אישור C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "לא נ_דרש אישור CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_גרסת PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "יש ל_בקש ססמה זו בכל פעם מחדש" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "חסר שם משתמש EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "חסרה ססמת EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "חסר מזהה EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "אישור EAP-TLS CA לא תקף: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "אישור EAP-TLS CA לא תקף: לא סופק אישור" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "ססמת EAP-TLS לא תקפה: חסרה" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "מפתח פרטי EAP-TLS לא תקף: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "משתמש אישור EAP-TLS לא תקף: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "מפתחות פרטיים בלתי מוצפנים אינם בטוחים" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3329,11 +3395,11 @@ "\n" "(ניתן להגן על המפתח הפרטי שלך עם openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "נא לבחור את האישור האישי שלך" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "בחירת המפתח הפרטי שלך" @@ -3345,51 +3411,56 @@ msgid "_User certificate" msgstr "_אישור המשתמש" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "מפתח _פרטי" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "ססמה למפתח ה_פרטי" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "אישור EAP-TTLS CA לא תקף: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "אישור EAP-TTLS CA לא תקף: לא סופקו אישורים" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "לא לה_זהיר אותי שוב" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "לא" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "כן" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "שגיאת אימות אבטחת 802.1x לא ידועה" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS מתועל" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP מאובטח (PEAP)" @@ -3399,6 +3470,46 @@ msgid "Au_thentication" msgstr "_אימות" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "חסר שם משתמש leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "חסרה ססמת leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "חסר מפתח wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "מפתח wep לא תקף: מפתח באורך %zu חייב להכיל ספרות הקסדצימליות בלבד" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "מפתח wep לא תקף: מפתח באורך %zu חייב להכיל אך ורך תווי ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"מפתח wep לא תקף: אורך מפתח %zu שגוי. מפתח חייב להיות או באורך 5/13 (‏ascii) " +"או 10/26 (הקסדצימלי)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "מפתח wep לא תקף: ססמה לא יכולה להיות ריקה" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "מפתח wep לא תקף: ססמה חייבת להיות קצרה מ־64 תווים" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (בררת מחדל)" @@ -3435,19 +3546,32 @@ msgid "WEP inde_x" msgstr "מ_פתח ה־WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"‏wpa-psk לא תקף: %zu אורך מפתח לא תקף. חייב להיות [8,63] בתים או 64 ספרות " +"הקסדצימליות" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "‏wpa-psk לא תקף: לא נתן לפענח מפתח עם 64 בתים כהקסדצילמי" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_סוג" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "פעיל" @@ -3484,16 +3608,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "הצגת _תוכן הודעה במסך נעילה" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "התרעות" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "שליטה בהתרעות שתוצגנה ומה הן תצגנה" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "התרעות;באנר;הודעה;אזור דיווחים;הודעה קופצת;" @@ -3511,79 +3636,68 @@ msgid "Applications" msgstr "יישומים" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "אחר" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "הוספת חשבון" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "דוא״ל" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "לוח שנה" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "אנשי קשר" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "צ׳אט" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "משאבים" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "אירעה שגיאה בעת הכניסה לחשבון" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "תוקף פרטי הגישה פג." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "יש להיכנס כדי להפעיל חשבון זה." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_כניסה" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "שגיאה בעת יצירת החשבון" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "אירעה שגיאה בעת הסרת החשבון" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "האם אכן ברצונך להסיר את החשבון?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "פעולה זו לא תסיר את החשבון מהשרת." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "הס_רה" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "חשבונות מקוונים" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "התחברות לחשבונות המקוונים שלך ולהחליט למה לשמש אותם" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3596,6 +3710,7 @@ msgstr "לא הוגדרו חשבונות מקוונים" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "הסרת חשבון" @@ -3742,7 +3857,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "סוללה" @@ -3790,101 +3905,102 @@ msgid "When _idle" msgstr "ב_חוסר פעילות" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "חיסכון בחשמל" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "בהירות המ_סך" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "בהירות אוטומטית" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "בהירות המ_סך" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_עמעום המסך בחוסר פעילות" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "ה_חשכת המסך" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "רשת _אלחוטית" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "יש לכבות את הרשת האל־חוטי על מנת לשמור סוללה." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "רשת ס_לולרית" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "יש לכבות פס רחב נייד (3G, 4G, LTE וכו׳) על מנת לשמור סוללה." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "(_ב)Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "בעת הפעלה מהסוללה" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "כאשר מחובר לחשמל" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "השהיה" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "מצב תרדמת" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "לא לעשות דבר" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "השהיה וכפתור כיבוי" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "ה_שהיה אוטומטית" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "השהיה אוטומטית" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "כאשר כפתור ה_כיבוי נלחץ" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "התקנים" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "חשמל" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "הצגת מצב הסוללה שלך ושינוי הגדרות חיסכון בחשמל" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -3962,11 +4078,6 @@ msgid "Delay" msgstr "השהיה" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "ביטול" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "אימות" @@ -3976,138 +4087,138 @@ msgstr "נדרש אימות" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:621 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "הטונר כמעט נגמר" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:623 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "נגמר הטונר" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:626 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "נותר מעט נייר צילום" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:629 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "נגמר נייר הצילום" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:631 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "נותרה מעט אספקת צבע" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:633 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "נגמרה אספקת הצבע" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:635 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "הכיסוי פתוח" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:637 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "הדלת פתוחה" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:639 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "נותר מעט נייר" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:641 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "נגמר הנייר" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:643 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "מנותקת" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:645 -#: ../panels/printers/cc-printers-panel.c:836 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "נעצרה" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:647 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "כלי קיבול הפסולת כמעט מלא" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:649 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "כלי קיבול הפסולת מלא" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:651 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "הפוטו מוליך האופטי עומד לסיים את חייו" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:653 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "הפוטו מוליך האופטי אינו מתפקד עוד" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:763 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "מתבצעת הגדרה" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:822 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "מוכנה" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:827 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "אין עבודות" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:832 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "מעבדת" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:952 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "רמת הטונר" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:955 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "רמת הדיו" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:958 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "רמת האספקה" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:976 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "מתבצעת התקנה" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1484 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4116,63 +4227,60 @@ msgstr[2] "2 פעילות" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1825 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "הוספת המדפסת החדשה נכשלה." -#: ../panels/printers/cc-printers-panel.c:1992 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "בחירת קובץ PPD" -#: ../panels/printers/cc-printers-panel.c:2001 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "קובצי הגדרות מדפסת של PostScript ‏(‎*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2308 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "לא נמצא מנהל התקן מתאים" -#: ../panels/printers/cc-printers-panel.c:2379 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "מתבצע חיפוש אחר מנהלי ההתקנים המועדפים…" -#: ../panels/printers/cc-printers-panel.c:2400 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "בחירה ממסד הנתונים…" -#: ../panels/printers/cc-printers-panel.c:2409 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "אספקת קובץ PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2560 -#: ../panels/printers/cc-printers-panel.c:2583 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "דף בדיקה" -#: ../panels/printers/cc-printers-panel.c:2696 -msgid "No printers" -msgstr "אין מדפסות בנמצא" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3042 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "לא ניתן לטעון את מנשק המשתמש: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "מדפסות" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "הוספת מדפסות, הצגת עבודות מדפסת ולהחליט כיצד ברצונך להדפיס" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "מדפסת;תור;הדפסה;דף;דיו;טונר;" @@ -4334,6 +4442,11 @@ msgid "Parallel Port" msgstr "יציאה מקבילית" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4544,13 +4657,17 @@ msgid "_Options" msgstr "א_פשרויות" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "אין מדפסות בנמצא" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "הוספת מדפסת" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4558,70 +4675,70 @@ "כפי הנראה, שירותי ההדפסה של המערכת\n" "אינם זמינים, עמך הסליחה!" -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "נעילת מסך" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "בשימוש" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "פועל" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "כבוי" -#: ../panels/privacy/cc-privacy-panel.c:783 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "שירותי איכון" -#: ../panels/privacy/cc-privacy-panel.c:897 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "שימוש והיסטוריה" -#: ../panels/privacy/cc-privacy-panel.c:1022 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "לרוקן את כל הפריטים באשפה?" -#: ../panels/privacy/cc-privacy-panel.c:1023 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "כל הפריטים באשפה ימחקו לצמיתות." -#: ../panels/privacy/cc-privacy-panel.c:1024 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_פינוי האשפה" -#: ../panels/privacy/cc-privacy-panel.c:1047 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "למחוק את כל הקבצים הזמניים?" -#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "כל הקבצים הזמניים ימחקו לצמיתות." -#: ../panels/privacy/cc-privacy-panel.c:1049 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "מחיקת קבצים _זמניים" -#: ../panels/privacy/cc-privacy-panel.c:1071 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "ניקוי הזבל והקבצים הזמניים" -#: ../panels/privacy/cc-privacy-panel.c:1111 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "שימוש בתכנה" -#: ../panels/privacy/cc-privacy-panel.c:1152 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "דיווח על בעיות" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1166 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4630,20 +4747,21 @@ "שליחת דיווחים על בעיות טכניות תעזור לנו לשפר את %s. הדיווחים נשלחים בעילום " "שם וללא מידע אישי." -#: ../panels/privacy/cc-privacy-panel.c:1178 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "מדיניות פרטיות" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "פרטיות" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "הגנה על המידע האישי שלך ושליטה במה שאחרים יכולים לראות" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4775,11 +4893,11 @@ #: ../panels/privacy/privacy.ui.h:43 msgid "" -"Location services allow applications to determine your geographical " -"position. Accuracy is increased by enabling WiFi and GPS." -msgstr "שירותי האיכון מאפשרים ליישום לזהות את המיקום הגאוגרפי שלך. \n" -"הדיוק גדל עם הפעלת אינטרנט אלחוטי ו־GPS." - +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" +"שירותי האיכון מאפשרים ליישומים לזהות את המיקום שלך. \n" +"הדיוק גדל עם הפעלת אינטרנט אלחוטי ופס רחב נייד." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4812,22 +4930,22 @@ msgid "Other" msgstr "אחר" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "יש להפעיל מחדש את ההפעלה שלך כדי שהשינויים ייכנסו לתוקף (יש לצאת ולהיכנס)" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "הפעלה מחדש כעת" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "לא נבחר מקור קלט" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_מסך כניסה" @@ -4859,17 +4977,18 @@ msgid "Paper" msgstr "נייר" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "אזור ושפה" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "ניתן לבחור את שפת התצוגה, התבניות, פריסות המקלדת ומקורות הקלט" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "שפה;פריסה;מקלדת;פלט;" @@ -4926,7 +5045,7 @@ msgstr "שמאלי+Alt ימני" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_שפה" @@ -4974,26 +5093,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "הגדרות כניסה נמצאות בשימוש על ידי כל המשתמשים בעת כניסה למערכת" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "מיקומים" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "סימניות" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "אחר" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "בחירת מיקום" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_אישור" @@ -5001,17 +5105,18 @@ msgid "No applications found" msgstr "לא נמצאו יישומים" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "חיפוש" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "שליטה באילו יישומים יציגו תוצאות חיפוש בסקירת פעילויות" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "חיפוש;מציאה;חפש;מצא;למצוא;לחפש;אינדקס;מפתח;הסתרה;החבאה;פרטיות;תוצאות;" @@ -5019,6 +5124,18 @@ msgid "Search Locations" msgstr "מקומות לחיפוש" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "מיקומים" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "סימניות" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "אחר" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "הזזה למעלה" @@ -5031,6 +5148,11 @@ msgid "Preferences" msgstr "העדפות" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "לא נבחרו רשתות לשיתוף" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5056,21 +5178,54 @@ msgid "Choose a Folder" msgstr "נא לבחור בתיקייה" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"שיתוף קבצים אישי מאפשר לך לשתף את התיקייה ציבורי שלך עם משתמשים נוספים ברשת " +"הנוכחית שלך באמצעות: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"כאשר התחברות מרוחקת מאופשרת, משתמשים מרוחקים יכולים להתחבר באמצעות פקודה " +"במעטפת מאובטחת: \n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"שיתוף מסך מאפשר למשתמשים מרוחקים לצפות או לשלוח במסך שלך על ידי התחברות אל " +"vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "העתקה" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "שיתוף" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "שיתוף" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "שליטה במה שברצונך לשתף עם אחרים" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5078,33 +5233,25 @@ "שיתוף;מארח;שרת;שם;מרוחק;רחוק;מרחוק;שולחן עבודה;מדיה;שמע;אודיו;קול;צליל;וידאו;" "סרטון;סרט;תמונות;צילומים;תצלומים;עיבוד;מעבד;" -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 -msgid "Enable or disable remote login" -msgstr "הפעלה או נטרול של כניסה מרוחקת" - -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 -msgid "Authentication is required to enable or disable remote login" -msgstr "נדרש אימות כדי להפעיל או לנטרל כניסה מרחוק" - -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "לא נבחרו רשתות לשיתוף" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. #: ../panels/sharing/networks.ui.h:1 msgid "Networks" msgstr "רשתות" +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 +msgid "Enable or disable remote login" +msgstr "הפעלה או נטרול של כניסה מרוחקת" + +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 +msgid "Authentication is required to enable or disable remote login" +msgstr "נדרש אימות כדי להפעיל או לנטרל כניסה מרחוק" + #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "שם ה_מחשב" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "שיתוף קבצים _פרטי" +msgid "_File Sharing" +msgstr "שיתוף _קבצים" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5123,82 +5270,54 @@ msgstr "יתכן שחלק מהשירותים ינוטרלו עקב ניתוק הגישה לרשת." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "שיתוף קבצים פרטי" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"שיתוף קבצים אישי מאפשר לך לשתף את התיקייה ציבורי שלך עם משתמשים נוספים ברשת " -"הנוכחית שלך באמצעות: dav://%s" +msgid "File Sharing" +msgstr "שיתוף קבצים" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "ד_רישת ססמה" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "כניסה מרוחקת" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"לאפשר למשתמשים מרוחקים להתחבר באמצעות פקודת SSH:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "שיתוף מסך" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"לאפשר למשתמשים מרוחקים לצפות או לשלוט במסך שלך ע״י התחברות לכתובת: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "לא_פשר שליטה מרחוק" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "ל_אפשר להתחברויות לשלוט במסך" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_ססמה:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "ה_צגת ססמה" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "אפשרויות גישה" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "התחברויות ח_דשות מחייבות בקשת גישה" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_דרושה ססמה" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "שיתוף מדיה" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "שיתוף מדיה מאפשר לך לשתף מוזיקה, תמונות וסרטי וידאו ברשת." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "שיתוף מוזיקה, תמונות וסרטים ברשת." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "תיקיות" @@ -5329,11 +5448,6 @@ msgid "Peak detect" msgstr "זיהוי עצמה מרבית" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "שם" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "התקן" @@ -5428,16 +5542,21 @@ msgid "Subwoofer" msgstr "סאבוופר" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "התאמה אישית" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "גישה אוניברסלית" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "להקל ראייה, שמיעה, הקלדה, הצבעה ולחיצה" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5535,8 +5654,8 @@ msgstr "צלילי מקשים" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "צפצוף כאשר Num Lock או Caps Lock מופעלים." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "צפצוף כאשר Num Lock או Caps Lock מופעלים או מושבתים." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5917,93 +6036,66 @@ msgstr "אפקטים של צבע" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "הוספת משתמש" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "שם מ_לא" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "רגיל" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "מנהל" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "שם מ_לא" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_סוג החשבון" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "בחירת ססמה ב_כניסה הבאה" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "הגדרת ססמה _כעת" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "אי_מות" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_אישור" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." -msgstr "התחברות ארגונית מאפשרת ניהול חשבון משתמש מרוכז לשימוש בהתקן זה." - -#: ../panels/user-accounts/data/account-dialog.ui.h:12 -msgid "_Domain" -msgstr "מ_תחם" - -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"יש להיכנס לאינטרנט להוספת\n" -"חשבונות התחברות ארגונית." +"התחברות ארגונית מאפשרת ניהול חשבון משתמש מרוכז לשימוש בהתקן זה. נתן גם " +"להשתמש בחשבון זה לגישה למשאבי חברות באינטרנט." #: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_כניסה ארגונית" +#: ../panels/user-accounts/data/join-dialog.ui.h:9 +msgid "_Domain" +msgstr "מ_תחם" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "הוספת משתמש" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "ה_רשמה" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "כניסת מנהל המתחם" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"כדי להשתמש בכניסה ארגונית, על מחשב זה להיות רשום\n" -"במתחם. נא לבקש ממנהל הרשת להקליד את ססמת המתחם\n" -"שלו להלן." +msgid "You are Offline" +msgstr "התנתקת" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_שם המנהל" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "יש להיות מחובר לאינטרנט על מנת להוסיף משתמש ארגוני." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "ססמת מנהל" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_כניסה ארגונית" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6038,7 +6130,7 @@ msgstr "זרת ימנית" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "הפעלת התחברות באמצעות טביעת אצבע" @@ -6075,9 +6167,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "כניסה;שם;טביעת אצבע;תמונה אישית;לוגו;פרצוף;פנים;ססמה;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "היסטוריית כניסה" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "ה_רשמה" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "כניסת מנהל המתחם" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"כדי להשתמש בכניסה ארגונית, על מחשב זה להיות רשום\n" +"במתחם. נא לבקש ממנהל הרשת להקליד את ססמת המתחם\n" +"שלו להלן." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_שם המנהל" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "ססמת מנהל" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6100,38 +6215,30 @@ msgstr "ססמה _נוכחית" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "בחירת ססמה בכניסה הבאה" +msgid "Allow user to change their password on next login" +msgstr "לאפשר למשתמש לשנות את הססמה בהתחברות הבאה" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "הגדרת ססמה כעת" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "הוספת חשבון משתמש" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "הסרת חשבון משתמש" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "הו_ספת משתמש…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "אפשרויות כניסה" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "כניסה _אוטומטית" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "כניסה באמצעות _טביעת אצבע" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "סמל משתמש" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "כניסה _אחרונה" @@ -6234,7 +6341,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "יש לערבב אותיות רישיות וקטנות ולהשתמש במספר או שניים." #: ../panels/user-accounts/pw-utils.c:119 @@ -6243,7 +6350,7 @@ "Good password! Adding more letters, numbers and punctuation will make it " "stronger." msgstr "" -"ססמה טובה! הוספת עוד תווים, מספרים וסימני פיסוק תחזק את הססמה עוד יותר." +"ססמה טובה! הוספת תווים נוספים, מספרים וסימני פיסוק תחזק את הססמה עוד יותר." #: ../panels/user-accounts/pw-utils.c:141 #: ../panels/user-accounts/pw-utils.c:171 @@ -6325,32 +6432,32 @@ msgstr "שגיאה בלתי ידועה" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "צריך להתאים את כתובת האינטרנט של ספק החשבון שלך." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "הוספת החשבון נכשלה" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "הססמאות אינן תואמות." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "הרשמת החשבון נכשלה" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "אין שיטה נתמכת לאימות עם מתחם זה (domain)" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "ההצטרפות למתחם נכשלה" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6358,7 +6465,7 @@ "ססמה שגויה.\n" "נא לנסות שוב." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6366,14 +6473,24 @@ "ססמה שגויה.\n" "נא לנסות שוב." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "הכניסה למתחם נכשלה" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "לא ניתן למצוא את המתחם. אולי שגית?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "רגיל" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "מנהל" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6391,15 +6508,15 @@ msgid "Enabled" msgstr "פעיל" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "האם למחוק את טביעות האצבע הרשומות?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_מחיקת טביעות אצבע" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6407,15 +6524,15 @@ "האם ברצונך למחוק את טביעות האצבעות הרשומות שלך כדי לבטל את ההתחברות באמצעות " "טביעת אצבע?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "בוצע!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "אין אפשרות לגשת אל התקן '%s'" @@ -6423,16 +6540,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "לא ניתן להפעיל את לכידת האצבע על ההתקן '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "לא ניתן לגשת לקוראי טביעות האצבעות" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "נא ליצור קשר עם מנהל המערכת שלך לקבלת עזרה." @@ -6441,7 +6558,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6450,11 +6567,11 @@ "כדי לאפשר התחברות באמצעות טביעת אצבע, עליך לשמור את אחת מטביעות האצבעות שלך, " "באמצעות ההתקן '%s'." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "נבחרת אצבע" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "נרשמות טביעות אצבעות עבור" @@ -6508,14 +6625,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "הפעלה הסתיימה" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "הפעלה התחילה" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "‏%s – הפעלת חשבון" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "נא לבחור בססמה אחרת." @@ -6577,7 +6701,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "לא ניתן להתחבר אל המתחם %s:‏ %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "חשבונות אחרים" @@ -6655,15 +6779,15 @@ msgid "Logged in" msgstr "נכנסת" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "לא ניתן ליצור קשר עם שירות החשבונות" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "נא לוודא ששירות החשבונות (AccountService) מותקן ומופעל." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6671,12 +6795,12 @@ "כדי לערוך שינויים,\n" "ראשית יש ללחוץ על הסמל *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "יצירת חשבון משתמש" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6684,12 +6808,12 @@ "כדי ליצור משתמש,\n" "ראשית יש ללחוץ על הסמל *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "מחיקת חשבון המשתמש הנבחר" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6697,33 +6821,32 @@ "כדי למחוק את המשתמש הנבחר\n" "ראשית יש ללחוץ על הסמל *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "החשבון שלי" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "משתמש בשם '%s' כבר קיים." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "למרבה הצער, שם משתמש זה אינו זמין. יש לנסות שם אחר." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "שם המשתמש ארוך מדי." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "שם המשתמש לא יכול להתחיל ב־'-'." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"שם המשתמש יכול להכיל רק אותיות קטנות ורישיות מהאלפבית האנגלי, ספרות ואחד " -"מהתווים '.', '-' או '_'." +"שם המשתמש יכול להכיל רק אותיות קטנות ורישיות מהאלפבית האנגלי, ספרות ואחד " +"מהתווים: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "שם זה ישמש לשם תיקיית הבית שלך ולא יהיה ניתן לשנותו." @@ -6810,17 +6933,17 @@ msgid "Button" msgstr "לחצן" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "לוח מגע" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "הגדרת מיפויי כפתור והתאמת רגישות עט עבור לוח ציור" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "לוח;Wacom;עט מגע;מחק;מוחק;עכבר;משטח מגע;לוח מגע; מגע;" @@ -6852,6 +6975,10 @@ msgid "Bluetooth Settings" msgstr "הגדרות Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "לוח מגע" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "מיפוי לצג…" @@ -6945,22 +7072,22 @@ msgid "Mode Switch #%d" msgstr "מתג מצב מס׳ %d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "לחצן שמאלי מס׳ %d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "לחצן ימני מס׳ %d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "לחצן עליון מס׳ %d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "לחצן תחתון מס׳ %d" @@ -7037,6 +7164,11 @@ msgid "Tip Pressure Feel" msgstr "תחושת לחץ החוד" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "כל ההגדרות" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME מרכז הבקרה" @@ -7093,22 +7225,18 @@ msgid "Quit" msgstr "יציאה" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "כל ההגדרות" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "אישי" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "חומרה" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "מערכת" @@ -7147,6 +7275,184 @@ msgid "Cancel search" msgstr "ביטול החיפוש" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "צירופי מקשים עבור %s. יש להזין צירוף מקש חד לשינוי." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "כדי לערוך מקש קיצור דרך, יש ללחוץ על השורה המתאימה ולהחזיק את צירוף " +#~ "המקשים החדש או ללחוץ על Backspace כדי למחוק." + +#~ msgid "Error logging into the account" +#~ msgstr "אירעה שגיאה בעת הכניסה לחשבון" + +#~ msgid "Credentials have expired." +#~ msgstr "תוקף פרטי הגישה פג." + +#~ msgid "Sign in to enable this account." +#~ msgstr "יש להיכנס כדי להפעיל חשבון זה." + +#~ msgid "_Sign In" +#~ msgstr "_כניסה" + +#~ msgid "_Name:" +#~ msgstr "_שם:" + +#~ msgid "Add Shortcut" +#~ msgstr "הוספת קיצור דרך" + +#~ msgid "Remove Shortcut" +#~ msgstr "הסרת קיצור דרך" + +#~ msgid "" +#~ msgstr "<פעולה לא ידועה>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "לא ניתן להשתמש בקיצור הדרך „%s“ מכיוון שלא ניתן יהיה להקליד באמצעות מקש " +#~ "זה.\n" +#~ "נא לנסות מקש או צירוף מקשים שונה כגון לחיצה על Ctrl, Alt או Shift יחדיו." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "קיצור הדרך „%s“ כבר משמש ל:\n" +#~ "„%s“" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "אם קיצור הדרך יוקצה מחדש אל „%s“, קיצור הדרך „%s“ יבוטל." + +#~ msgid "_Reassign" +#~ msgstr "הקצאה _מחדש" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "הקיצור „%s” משויך לקיצור „%s”. האם ברצונך להגדיר אותו באופן אוטומטי ל־" +#~ "„%s”?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "‏„%s” משויך כעת אל „%s”, קיצור זה יושבת אם אפשרות זו תיבחר." + +#~ msgid "_Assign" +#~ msgstr "ה_קצאה" + +#~ msgid "Login History" +#~ msgstr "היסטוריית כניסה" + +#~ msgid "Add User Account" +#~ msgstr "הוספת חשבון משתמש" + +#~ msgid "Remove User Account" +#~ msgstr "הסרת חשבון משתמש" + +#~ msgid "Color" +#~ msgstr "צבע" + +#~ msgid "Bond" +#~ msgstr "מאגד" + +#~ msgid "Team" +#~ msgstr "צוות" + +#~ msgid "Bridge" +#~ msgstr "גשר" + +#~ msgid "VLAN" +#~ msgstr "רשת וירטואלית" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "לא ניתן לטעון את תוספי ה־VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "הוספת חיבור לרשת" + +#~ msgid "Bond slaves" +#~ msgstr "שותפים במאגד" + +#~ msgid "(none)" +#~ msgstr "(אף אחד)" + +#~ msgid "Bridge slaves" +#~ msgstr "שותפים במאגד" + +#~ msgid "Team slaves" +#~ msgstr "שותפים בצוות" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "התקן InfiniBand אינו תומך במצב מחובר" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "לא נבחר אישור של רשות אישורים" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "חוסר אישור של רשות אישורים (CA) יכול לגרום להתחברויות לא בטוחות, רשתות " +#~ "אלחוטיות מזויפות. האם ברצונך לבחור אישור של רשות אישורים?" + +#~ msgid "Ignore" +#~ msgstr "התעלמות" + +#~ msgid "Choose CA Certificate" +#~ msgstr "נא לבחור באישור רשות אישורים" + +#~ msgid "As_k for this password every time" +#~ msgstr "יש ל_בקש ססמה זו בכל פעם מחדש" + +#~ msgid "Don't _warn me again" +#~ msgstr "לא לה_זהיר אותי שוב" + +#~ msgid "No" +#~ msgstr "לא" + +#~ msgid "Yes" +#~ msgstr "כן" + +#~ msgid "Power" +#~ msgstr "חשמל" + +#~ msgid "Privacy" +#~ msgstr "פרטיות" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "אחר" + +#~ msgid "Personal File Sharing" +#~ msgstr "שיתוף קבצים פרטי" + +#~ msgid "_Allow Remote Control" +#~ msgstr "לא_פשר שליטה מרחוק" + +#~ msgid "_Verify" +#~ msgstr "אי_מות" + +#~ msgid "Login Options" +#~ msgstr "אפשרויות כניסה" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "משתמש בשם '%s' כבר קיים." + #~ msgid "Used to determine your geographical location" #~ msgstr "משמש לקביעת המיקום הגאוגרפי שלך" @@ -7203,9 +7509,6 @@ #~ msgid "Color" #~ msgstr "צבע" -#~ msgid "Two Finger Scrolling" -#~ msgstr "גלילה בשתי אצבעות" - #~ msgid "_Delay:" #~ msgstr "ה_שהיה:" @@ -7459,9 +7762,6 @@ #~ msgid "Don't use the display" #~ msgstr "לא ניתן לזהות את הצגים" -#~ msgid "Refresh Rate" -#~ msgstr "תדירות ר_ענון:" - #~ msgid "Install Updates" #~ msgstr "התקנת עדכונים" @@ -7644,9 +7944,6 @@ #~ msgid "Domain not found." #~ msgstr "המתחם לא נמצא" -#~ msgid "Wrong password" -#~ msgstr "ססמה שגויה" - #~ msgid "Export" #~ msgstr "יצוא" @@ -8191,9 +8488,6 @@ #~ msgid "Out of range" #~ msgstr "מחוץ לטווח" -#~ msgid "_Configure…" -#~ msgstr "ה_גדרה…" - #~ msgid "_Disconnect" #~ msgstr "_ניתוק" @@ -8535,9 +8829,6 @@ #~ msgid "Take a screenshot" #~ msgstr "צילום המסך" -#~ msgid "Shortcut" -#~ msgstr "קיצור" - #~ msgid "_Right-handed" #~ msgstr "_ימניים" @@ -8638,9 +8929,6 @@ #~ msgid "Create new account" #~ msgstr "יצירת חשבון חדש" -#~ msgid "_Account Type" -#~ msgstr "_סוג החשבון" - #~ msgid "Cr_eate" #~ msgstr "י_צירה" @@ -8794,9 +9082,6 @@ #~ msgid "Toggle screen reader" #~ msgstr "החלפת הפעלת מקריא מסך" -#~ msgid "Error saving the new shortcut" -#~ msgstr "שגיאה בשמירת קיצור הדרך החדש" - #~ msgid "Too many custom shortcuts" #~ msgstr "יותר מדי קיצורי דרך מותאמים אישית" @@ -9650,9 +9935,6 @@ #~ msgid "_Include Top Menu Bar" #~ msgstr "ה_כללת סרגל התפריטים העליון" -#~ msgid "%d Hz" -#~ msgstr "%d הרץ" - #~ msgid "Monitor: %s" #~ msgstr "צג: %s" diff -Nru gnome-control-center-3.20.2/po/hu.po gnome-control-center-3.22.1/po/hu.po --- gnome-control-center-3.20.2/po/hu.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/hu.po 2016-09-27 12:37:36.000000000 +0000 @@ -18,16 +18,16 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-20 20:42+0000\n" -"PO-Revision-Date: 2016-03-20 23:15+0100\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-10 11:04+0200\n" +"Last-Translator: Meskó Balázs \n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Poedit 1.8.8\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -99,7 +99,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Saját mappa" @@ -114,25 +114,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -163,16 +162,17 @@ msgid "Current background" msgstr "Jelenlegi háttér" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Háttér" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Hát­tér" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Háttérkép módosítása tapétára vagy fényképre" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Háttérkép;Képernyő;Asztal;" @@ -213,18 +213,17 @@ msgstr "" "Kapcsolja ki a Repülőgép üzemmód kapcsolót a Bluetooth bekapcsolásához." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Kapcsolja be és ki a Bluetooth-t, majd csatlakoztassa eszközeit" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;megosztás;bluetooth;obex;" @@ -397,7 +396,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Minden fájl" @@ -439,7 +438,7 @@ msgstr "Profil mentése" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "M_entés" @@ -695,7 +694,7 @@ "Windows rendszereken is használhatja." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Összegzés" @@ -707,11 +706,11 @@ msgid "_Import File…" msgstr "Fájl _importálása…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Hozzáadás" @@ -859,17 +858,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Színek" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Kijelzők, fényképezőgépek vagy nyomtatók színeinek kalibrálása" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Szín;ICC;Színek;Profilozás;Kalibrálás;Nyomtató;Kijelző;" @@ -887,23 +887,23 @@ msgid "No languages found" msgstr "Nem találhatók nyelvek" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Ma" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Tegnap" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b. %e." #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%Y. %b. %e." @@ -1023,8 +1023,9 @@ msgid "December" msgstr "December" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Dátum és idő" @@ -1081,12 +1082,12 @@ msgid "AM / PM" msgstr "12 órás" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Dátum, idő és időzóna módosítása" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Óra;Időzóna;Hely;" @@ -1098,209 +1099,224 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Hitelesítés szükséges a dátum- és időbeállítások módosításához." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Fedél lezárva" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Tükrözött" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Elsődleges" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Ki" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Másodlagos" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Kombinált kijelzők elrendezése" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Alkalmaz" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Húzza a kijelzőket az átrendezésükhöz" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Forgatás balra 90°-kal" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Forgatás 180°-kal" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Forgatás jobbra 90°-kal" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Méret" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Méretarány" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Felbontás" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "TV-hez igazítás" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Frissítés gyakorisága" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "" "A felső sáv és a Tevékenységek áttekintés megjelenítése ezen a kijelzőn" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Másodlagos kijelző" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Ezen kijelző összekapcsolása egy másikkal extra munkaterület létrehozásához" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Bemutató" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Csak bemutatók és média megjelenítése" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Tükrözés" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Meglévő nézet megjelenítése mindkét kijelzőn" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Kikapcsolás" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Ne használja ezt a kijelzőt" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "A képernyő-információk nem kérhetők le" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Kombinált kijelzők elrendezése" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Kijelzők" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Ki­jel­zők" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Csatlakoztatott monitorok és projektorok beállítása" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Projektor;xrandr;Képernyő;Felbontás;Frissítés;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Ismeretlen" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d bites (Építés azonosító: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d bites (Építés azonosító: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" -msgstr "%s %d bit" +msgstr "%s %d bites" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" -msgstr "%d bit" +msgstr "%d bites" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Kérdezze meg, mi a teendő" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ne tegyen semmit" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Mappa megnyitása" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Egyéb média" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Válasszon alkalmazást CD-khez" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Válasszon alkalmazást videó DVD-khez" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Válassza ki a zenelejátszó csatlakoztatásakor futtatandó alkalmazást" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Válassza ki a fényképezőgép csatlakoztatásakor futtatandó alkalmazást" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Válasszon alkalmazást szoftver CD-khez" @@ -1309,88 +1325,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "Hang DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Üres Blu-Ray lemez" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Üres CD-lemez" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Üres DVD-lemez" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Üres HD DVD-lemez" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray videolemez" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "E-könyvolvasó" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD videolemez" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows-szoftver" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Szakasz" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Áttekintés" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Alap alkalmazások" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Külső adathordozók" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "%s verzió" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Részletek" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "Rész­le­tek" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Információk megjelenítése a rendszeréről" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1566,8 +1580,9 @@ msgid "Launch help browser" msgstr "Súgóböngésző indítása" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Beállítások" @@ -1640,7 +1655,6 @@ msgstr "Képernyő zárolása" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Akadály­mentesítés" @@ -1676,11 +1690,21 @@ msgid "High contrast on or off" msgstr "Nagy kontraszt be- vagy kikapcsolása" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Egyéni gyorsbillentyűk" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1707,128 +1731,133 @@ msgid "Modifiers-only switch to next source" msgstr "Módosítók csak a következő forrásra váltanak" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Billentyűzet" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "A gyorsbillentyű visszaállítása az alapértelmezett értékre" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"A(z) %s már használatban van ennél: %s. Ha lecseréli, akkor a(z) %s " +"letiltásra kerül" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Egyéni gyorsbillentyű beállítása" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Gyorsbillentyű beállítása" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Adja meg az új gyorsbillentyűt a(z) %s megváltoztatásához." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Egyéni gyorsbillentyű hozzáadása" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Bil­len­tyű­zet" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Gyorsbillentyűk megjelenítése és módosítása, gépelési beállítások megadása" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Gyorsbillentyű;Ismétlés;Villogás;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Egyéni gyorsbillentyű" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Név:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Pa_rancs:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Gyorsbillentyű hozzáadása" +msgid "No keyboard shortcut found" +msgstr "Nem található gyorsbillentyű" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Gyorsbillentyű eltávolítása" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Próbáljon valami mást keresni" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Gyorsbillentyű szerkesztéséhez kattintson a sorra, és nyomja le az új " -"billentyűket, vagy a Backspace billentyűt a törléshez." +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Nyomja meg az Esc gombot a megszakításhoz." -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Egyéni gyorsbillentyűk" - -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Név" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"A gyorsbillentyű („%s”) nem használható, mivel a gépelés lehetetlenné válna " -"a billentyű használatával.\n" -"Próbálkozzon a Control, Alt vagy Shift billentyűk valamelyikének egyidejű " -"lenyomásával." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Parancs" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Gyorsbillentyű" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Szerkesztés" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"A gyorsbillentyű („%s”) már használatban van erre:\n" -"„%s”" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Nincs" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Ha a gyorsbillentyűt újra a(z) „%s” funkcióhoz rendeli, akkor a(z) „%s” " -"gyorsbillentyű letiltásra kerül." +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Eltávolítás" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Adja meg az új gyorsbillentyűt" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Új_ra hozzárendelés" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Mégse" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"A(z) „%s” gyorsbillentyű egy hozzárendelt „%s” gyorsbillentyűvel " -"rendelkezik. Szeretné automatikusan beállítani erre: „%s”?" +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Hozzáadás" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"A(z) „%s” jelenleg a(z) „%s” funkcióhoz van hozzárendelve, ez gyorsbillentyű " -"letiltásra kerül, ha továbblép." +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Csere" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Hozzárendelés" +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Beállítás" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Beállítás_ok tesztelése" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Egér és érintőtábla" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "E­gér és é­rin­tő­táb­la" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Egér vagy érintőtábla érzékenységének, bal vagy jobb kezességének módosítása" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Érintőtábla;Tapipad;Mutató;Kattintás;Koppintás;Dupla;Gomb;Hanyattegér;" @@ -1888,6 +1917,10 @@ msgstr "Koppintás a kattintáshoz" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Kétujjas görgetés" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Görgetés a szélen" @@ -1926,11 +1959,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Repülő mód" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Hálózati proxy" @@ -1938,17 +1971,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Hoppá, valami elromlott. Lépjen kapcsolatba a szoftver szállítójával." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "A Hálózatkezelőnek futnia kell." @@ -1964,7 +1997,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1981,59 +2014,64 @@ msgid "page 2" msgstr "2. oldal" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Biztonság" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatikus" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "%d. profil" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nincs" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Soha" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2041,179 +2079,179 @@ msgstr[1] "%i napja" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nincs" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Gyenge" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Jó" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Kitűnő" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Részletek" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Személyazonosság" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Cím" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Hálózati maszk" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Átjáró" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Cím törlése" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Hozzáadás" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Kiszolgáló" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS-kiszolgáló törlése" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrika" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Útvonal törlése" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatikus (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Kézi" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Csak közvetlen kapcsolat" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Előtag" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatikus" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatikus, csak DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Visszaállítás" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nincs" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 bites kulcs (Hex vagy ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 bites jelmondat" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dinamikus WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA és WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA és WPA2 Enterprise" @@ -2228,30 +2266,30 @@ msgstr "Kapcsolat sebessége" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-cím" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-cím" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardvercím" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2261,7 +2299,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2344,13 +2382,13 @@ msgid "Firewall _Zone" msgstr "Tűzfal _zóna" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Alapértelmezett" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "A zóna határozza meg a kapcsolat megbízhatósági szintjét" @@ -2392,45 +2430,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "A kapcsolatszerkesztő megnyitása sikertelen" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Új profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "A VPN bővítmények nem tölthetők be" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importálás fájlból…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Hálózati kapcsolat hozzáadása" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "VPN hozzáadása" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2438,7 +2456,7 @@ msgstr "_Visszaállítás" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Elfelejtés" @@ -2464,11 +2482,11 @@ msgid "S_ecurity" msgstr "Bi_ztonság" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nem lehet importálni a VPN kapcsolatot" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2481,36 +2499,36 @@ "\n" "Hiba: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Válassza ki az importálandó fájlt" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Megnyitás" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Már létezik „%s” nevű fájl." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Csere" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Le kívánja cserélni a(z) %s fájlt a mentendő VPN kapcsolatra?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Nem lehet exportálni a VPN kapcsolatot" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2521,7 +2539,7 @@ "\n" "Hiba: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN kapcsolat exportálása" @@ -2548,60 +2566,46 @@ msgid "Make available to _other users" msgstr "Elérhetővé tétel más _felhasználóknak" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Hálózat" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Há­ló­zat" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Internetkapcsolatok beállítása" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Hálózat;Vezeték nélküli;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Széles sáv;Szélessáv;" -"Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;" +"Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond alárendeltek" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nincs)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge alárendeltek" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "soha" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "ma" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "tegnap" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-cím" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Utolsó használat" @@ -2611,34 +2615,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Vezetékes" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Beállítások…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "%d. profil" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Új kapcsolat hozzáadása" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team alárendeltek" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2646,13 +2641,13 @@ "Ha nem csak vezeték nélküli internetkapcsolata van, akkor vezeték nélküli " "hotspot létrehozásával megoszthatja a kapcsolatot másokkal." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "A vezeték nélküli hotspot bekapcsolása le fogja választani erről: %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2660,23 +2655,23 @@ "Az internetet nem érheti el a vezeték nélküli kapcsolaton, mialatt a hotspot " "aktív." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Leállítja a hotspotot, és leválasztja a felhasználókat?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "H_otspot leállítása" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "A rendszer házirendje megtiltja a hotspotként való használatot" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "A vezeték nélküli eszköz nem támogatja a hotspot módot" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2684,11 +2679,11 @@ "A kijelölt hálózatok adatai elvesznek, beleértve a jelszavakat és az egyedi " "beállításokat is." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Előzmények" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2696,7 +2691,7 @@ msgstr "_Bezárás" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Felejtse el" @@ -2733,6 +2728,10 @@ msgid "Provider" msgstr "Szolgáltató" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Hálózat" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2838,16 +2837,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "Jels_zó" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Nincs" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "J_elszó megjelenítése" @@ -2941,7 +2936,6 @@ msgstr "Kapcsolódás _rejtett hálózathoz…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Előzmények" @@ -2963,360 +2957,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Jelszó" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Eseti" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Kiépített" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Ismeretlen állapot" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Felügyeletlen" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nem érhető el" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Kapcsolódás" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Hitelesítés szükséges" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Kapcsolódva" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Bontás" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Kapcsolódás meghiúsult" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Ismeretlen állapot (hiányzik)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Nincs kapcsolódva" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "A beállítás sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Az IP-beállítás sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Az IP-beállítás lejárt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Titkos információkra volt szükség, de nem lettek megadva" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "A 802.1x-kliens bontotta a kapcsolatot" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "A 802.1x-kliens beállítása meghiúsult" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "A 802.1x-kliens sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "A 802.1x-kliens hitelesítése túl sokáig tartott" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "A PPP szolgáltatás nem indult el" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP szolgáltatás leválasztva" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "A PPP sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "A DHCP kliens nem indult el" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-klienshiba" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "A DHCP-kliens sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "A megosztott kapcsolat szolgáltatás nem indult el" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "A megosztott kapcsolat szolgáltatás sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Az AutoIP szolgáltatás nem indult el" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP szolgáltatáshiba" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Az AutoIP szolgáltatás sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "A vonal foglalt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nincs tárcsahang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nem hozható létre hívás" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "A tárcsázási kérés túllépte az időkorlátot" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "A tárcsázási kísérlet meghiúsult" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "A modem előkészítése sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "A megadott APN kiválasztása meghiúsult" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nem keres hálózatokat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Hálózatregisztráció megtagadva" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "A hálózatregisztráció túllépte az időkorlátot" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "A kért hálózaton való regisztráció sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "A PIN ellenőrzése sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Az eszközhöz firmware hiányozhat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "A kapcsolat eltűnt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "A meglévő kapcsolat felvéve" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Nem található modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "A Bluetooth kapcsolódás sikertelen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "A SIM kártya nincs behelyezve" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "A SIM Pin szükséges" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "A SIM Puk szükséges" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "A SIM hibás" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Az InfiniBand eszköz nem támogatja a csatlakoztatott módot" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Kapcsolódás függősége meghiúsult" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Hiányzó firmware" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kábel kihúzva" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nincs kiválasztva hitelesítésszolgáltatói tanúsítvány" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "meghatározatlan hiba a 802.1x biztonságban (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nincs fájl kiválasztva" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Ha nem használ hitelesítésszolgáltatói (CA) tanúsítványt, akkor nem " -"biztonságos Wi-Fi hálózatokhoz is kapcsolódhat. Ki kíván választani egy " -"hitelesítésszolgáltatói tanúsítványt?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Mellőzés" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "CA tanúsítvány kiválasztása" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM vagy PKCS#12 személyes kulcsok (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "meghatározatlan hiba az eap-method fájl ellenőrzése közben" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM vagy PKCS#12 személyes kulcsok (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER vagy PEM tanúsítványok (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "hiányzó EAP-FAST PAC fájl" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Válasszon PAC fájlt" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC fájlok (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _fájl" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Belső _hitelesítés" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PA_C létesítés" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3325,41 +3295,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonymous" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Hitelesített" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Mindkettő" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _fájl" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Belső _hitelesítés" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Automatikus PA_C létesítés engedélyezése" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "hiányzó EAP-LEAP felhasználónév" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "hiányzó EAP-LEAP jelszó" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Felhasználónév" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Jelszó megjelenítése" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "érvénytelen EAP-PEAP CA tanúsítvány: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "érvénytelen EAP-PEAP CA tanúsítvány: nincs tanúsítvány megadva" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Válasszon hitelesítésszolgáltatói tanúsítványt" @@ -3377,19 +3379,56 @@ msgid "C_A certificate" msgstr "_CA tanúsítvány" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "CA tanúsítvány nem _szükséges" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_PEAP verzió:" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Jelszó bekérése min_den alkalommal" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "hiányzó EAP felhasználónév" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "hiányzó EAP jelszó" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "hiányzó EAP-TLS személyazonosság" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "érvénytelen EAP-TLS CA tanúsítvány: „%s”" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "érvénytelen EAP-TLS CA tanúsítvány: nincs tanúsítvány megadva" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "érvénytelen EAP-TLS jelszó: hiányzik" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "érvénytelen EAP-TLS személyes kulcs: „%s”" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "érvénytelen EAP-TLS felhasználói tanúsítvány: „%s”" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "A nem titkosított személyes kulcsok nem biztonságosak" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3403,11 +3442,11 @@ "\n" "Személyes kulcsát az OpenSSL segítségével teheti jelszóval védetté." -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Válassza ki a személyes tanúsítványát" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Válassza ki a személyes kulcsát" @@ -3419,51 +3458,56 @@ msgid "_User certificate" msgstr "_Felhasználói tanúsítvány" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Személyes k_ulcs" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "S_zemélyes kulcs jelszava" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "Érvénytelen EAP-TTLS CA tanúsítvány: „%s”" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "érvénytelen EAP-TTLS CA tanúsítvány: nincs tanúsítvány megadva" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Ne figyelmeztessen újra" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nem" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Igen" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Ismeretlen hiba a 802.1x biztonság ellenőrzésekor" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Alagutazott TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Védett EAP (PEAP)" @@ -3473,6 +3517,50 @@ msgid "Au_thentication" msgstr "_Hitelesítés" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "hiányzó leap felhasználónév" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "hiányzó leap jelszó" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "hiányzó wep-kulcs" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"érvénytelen wep-kulcs: egy %zu hosszú kulcsban csak hexadecimális számjegyek " +"lehetnek" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"érvénytelen wep-kulcs: egy %zu hosszú kulcsban csak ascii karakterek lehetnek" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"érvénytelen wep-kulcs: hibás kulcshossz: %zu. A kulcs hossza 5/13 (ascii) " +"vagy 10/26 lehet (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "érvénytelen wep-kulcs: a jelmondat nem lehet üres" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"érvénytelen wep-kulcs: a jelmondatnak 64 karakternél rövidebbnek kell lennie" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Alapértelmezett)" @@ -3509,19 +3597,33 @@ msgid "WEP inde_x" msgstr "WEP inde_x" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"érvénytelen wpa-psk: érvénytelen kulcshossz: %zu. [8,63] bájtnak, vagy 64 " +"hexadecimális számjegynek kell lennie" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"érvénytelen wpa-psk: a 64 bájtos kulcs nem értelmezhető hexadecimálisként" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Típus" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Be" @@ -3558,16 +3660,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Üzenet_tartalom megjelenítése a zárolási képernyőn" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Értesítések" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Ér­te­sí­té­sek" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Az értesítések megjelenítésének és tartalmuk beállítása" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Értesítések;Felugró sáv;Üzenet;Sáv;Tálca;Figyelmeztetés;" @@ -3585,79 +3688,68 @@ msgid "Applications" msgstr "Alkalmazások" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Egyéb" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Fiók hozzáadása" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Levelek" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Naptár" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Névjegyek" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Csevegés" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Erőforrások" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Hiba lépett fel a fiókba bejelentkezéskor" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "A hitelesítési adatok lejártak." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Jelentkezzen be a fiók engedélyezéséhez." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Bejelentkezés" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Hiba a fiók létrehozásakor" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Hiba a fiók eltávolításakor" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Biztos benne, hogy el kívánja távolítani a fiókot?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Ez nem törli a kiszolgálón a fiókot." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Eltávolítás" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Online fiókok" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "On­line fi­ó­kok" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Kapcsolódás online fiókjaihoz, és felhasználási módjuk kiválasztása" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3670,6 +3762,7 @@ msgstr "Nincsenek beállítva online fiókok" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Fiók eltávolítása" @@ -3812,7 +3905,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Akkumulátor" @@ -3860,105 +3953,106 @@ msgid "When _idle" msgstr "Ü_resjáratban" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Energiatakarékosság" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Képernyő fényereje" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatikus fényerő" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Billentyűzet _fényereje" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Képer_nyő elhalványítása, ha inaktív" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Képernyő _elsötétítése" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Wi-Fi kikapcsolása az energiatakarékosság érdekében." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobil széles sáv" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Mobil széles sáv (3G, 4G, LTE stb.) kikapcsolása az energiatakarékosság " "érdekében." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "Bl_uetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Akkumulátoron" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Ha csatlakoztatva van" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Felfüggesztés" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernálás" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ne tegyen semmit" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Felfüggesztés és kikapcsolás gombok" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatikus felfüggesztés" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatikus felfüggesztés" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "A _bekapcsológomb megnyomásakor" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Eszközök" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Energia­gazdálkodás" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "E­ner­gi­agaz­dál­kod­ás" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Akkumulátorállapot megjelenítése és energiagazdálkodási beállítások " "módosítása" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4037,11 +4131,6 @@ msgid "Delay" msgstr "Késleltetés" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Mégse" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Hitelesítés" @@ -4051,138 +4140,138 @@ msgstr "Hitelesítés szükséges" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "A festékkazetta kifogyóban" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "A festékkazetta kifogyott" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Az előhívó kifogyóban" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Az előhívó kifogyott" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "A tintapatron kifogyóban" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "A tintapatron kifogyott" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Fedél nyitva" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Ajtó nyitva" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Kevés a papír" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Kifogyott a papír" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Kikapcsolva" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Leállítva" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "A hulladékgyűjtő majdnem tele" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "A hulladékgyűjtő tele" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Az optikai fotovezető közel jár az élete végéhez" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Az optikai fotovezető már nem működik" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Beállítás" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Kész" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Nem fogad feladatokat" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Feldolgozás" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Festékkazettaszint" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Tintaszint" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Kellékszint" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Telepítés" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4190,65 +4279,62 @@ msgstr[1] "%u aktív" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Az új nyomtató hozzáadása meghiúsult." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Válasszon PPD fájlt" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "PostScript nyomtatóleíró fájlok (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nem található megfelelő illesztőprogram" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Előnyben részesített illesztőprogramok keresése…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Kiválasztás adatbázisból…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "PPD-fájl megadása…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Tesztoldal" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Nincsenek nyomtatók" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "A felület nem tölthető be: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Nyomtatók" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Nyom­tatók" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Nyomtatók hozzáadása, nyomtatási feladatok megjelenítése és nyomtatás " "beállítása" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Nyomtató;Sor;Nyomtatás;Papír;Tinta;Festékkazetta;" @@ -4410,6 +4496,11 @@ msgid "Parallel Port" msgstr "Párhuzamos port" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4622,13 +4713,17 @@ msgid "_Options" msgstr "_Beállítások" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Nincsenek nyomtatók" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Nyomtató hozzáadása" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4636,70 +4731,70 @@ "Elnézést, a rendszer nyomtatószolgáltatása\n" "nem tűnik elérhetőnek." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Képernyőzár" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Használatban" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Be" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Ki" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Helymeghatározó szolgáltatások" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Használat és előzmények" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Törölni kívánja az összes elemet a Kukából?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "A Kuka összes eleme véglegesen törölve lesz." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Kuka ürítése" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Törli az összes ideiglenes fájlt?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Minden ideiglenes fájl véglegesen törlésre kerül." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Ideiglenes fájlok törlése" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Kuka és ideiglenes fájlok törlése" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Szoftverhasználat" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Hiba jelentése" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4709,20 +4804,21 @@ "továbbfejlesztésében. A jelentések névtelenül és személyes adatoktól " "mentesen lesznek elküldve." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Adatvédelmi irányelv" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Adatvédelem" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "A­dat­vé­de­lem" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Védje személyes adatait és ellenőrizze, mit láthatnak mások" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4894,21 +4990,21 @@ msgid "Other" msgstr "Egyéb" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "A változtatások életbe léptetéséhez lépjen ki, majd újra be" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Újraindítás most" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nincs kiválasztva bemeneti forrás" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Bejelentkezési _képernyő" @@ -4940,11 +5036,12 @@ msgid "Paper" msgstr "Papír" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Terület és nyelv" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Te­rü­let és nyelv" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4952,7 +5049,7 @@ "beviteli forrásokat" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Nyelv;kiosztás;billentyűzet;bevitel;" @@ -5010,7 +5107,7 @@ msgstr "Bal+jobb Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Nyelv" @@ -5060,26 +5157,11 @@ "A bejelentkezési beállításokat minden felhasználó használja a rendszerre " "való belépéskor" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Helyek" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Könyvjelzők" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Egyéb" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Válasszon régiót" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5087,18 +5169,19 @@ msgid "No applications found" msgstr "Nem találhatók alkalmazások" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Keresés" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "A Tevékenységek áttekintésben találatokat megjelenítő alkalmazások beállítása" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Keresés;Indexelés;Elrejtés;Magánszféra;Találatok;Eredmények;" @@ -5106,6 +5189,18 @@ msgid "Search Locations" msgstr "Keresési helyek" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Helyek" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Könyvjelzők" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Egyéb" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Mozgatás felfelé" @@ -5118,6 +5213,11 @@ msgid "Preferences" msgstr "Beállítások" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nincs kiválasztott hálózat a megosztáshoz" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5143,21 +5243,55 @@ msgid "Choose a Folder" msgstr "Válasszon mappát" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"A Személyes fájlmegosztás lehetővé teszi a Nyilvános mappájának megosztását " +"másokkal a jelenlegi hálózaton dav://%s " +"használatával." + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Ha a távoli bejelentkezés engedélyezett, akkor a távoli felhasználók a " +"következő parancs használatával kapcsolódhatnak:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Távoli felhasználók megnézhetik és vezérelhetik a képernyőt a következőhöz " +"csatlakozással: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Másolás" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Megosztás" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Meg­osz­tás" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Megosztások beállítása" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5165,6 +5299,10 @@ "megosztás;ssh;host;név;távoli;asztal;média;audio;hang;video;kép;fénykép;" "filmek;kiszolgáló;szerver;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Hálózatok" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Távoli bejelentkezés engedélyezése vagy tiltása" @@ -5174,25 +5312,13 @@ msgstr "" "Hitelesítés szükséges a távoli bejelentkezés engedélyezéséhez vagy tiltásához" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nincs kiválasztott hálózat a megosztáshoz" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Hálózatok" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Számítógép neve" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Személyes fájl_megosztás" +msgid "_File Sharing" +msgstr "_Fájlmegosztás" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5211,87 +5337,54 @@ msgstr "Egyes szolgáltatások le vannak tiltva, mert nincs hálózati kapcsolat" #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Személyes fájlmegosztás" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"A Személyes fájlmegosztás lehetővé teszi a Nyilvános mappájának megosztását " -"másokkal a jelenlegi hálózaton dav://%s " -"használatával." +msgid "File Sharing" +msgstr "Fájlmegosztás" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Jelszó _kérése" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Távoli bejelentkezés" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Távoli felhasználók bejelentkezésének engedélyezése a következő parancs " -"használatával:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Képernyőmegosztás" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Távoli felhasználók számára a képernyő megnézésének vagy vezérlésének " -"engedélyezése a következőhöz csatlakozással: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Távoli vezérlés engedélyezése" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "A kapcsolatok képernyővezérlésének _engedélyezése" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "Jels_zó:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Jelszó meg_jelenítése" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Hozzáférési beállítások" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Az új kapcsolatoknak rá kell kérdezniük a _hozzáférésre" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Jelszó _kérése" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Médiamegosztás" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"A médiamegosztás lehetővé teszi zenék, fényképek és videók megosztását a " -"hálózaton." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Zenék, fényképek és videók megosztása a hálózaton." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Mappák" @@ -5420,11 +5513,6 @@ msgid "Peak detect" msgstr "Csúcsérzékelés" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Név" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Eszköz" @@ -5519,16 +5607,21 @@ msgid "Subwoofer" msgstr "Mélysugárzó" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Egyéni" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "A­ka­dály­men­te­sí­tés" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "A látás, hallás, gépelés, mutatás és kattintás egyszerűbbé tétele" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5628,8 +5721,8 @@ msgstr "Billentyűhangok" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Hangjelzés a Num Lock vagy Caps Lock bekapcsolásakor." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Hangjelzés a Num Lock vagy Caps Lock ki- és bekapcsolásakor." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6011,95 +6104,68 @@ msgstr "Színeffektusok" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Felhasználó hozzáadása" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Teljes név" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Általános" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Rendszergazda" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Teljes név" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Fióktípus" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "A felhasználó beállíthat jelszót a következő _bejelentkezéskor" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Jelszó beállítása _most" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Ellenőrzés" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Megerősítés" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "A vállalati bejelentkezés lehetővé teszi egy meglévő, központilag felügyelt " -"felhasználói fiók használatát ezen az eszközön." +"felhasználói fiók használatát ezen az eszközön. A fiókot arra is " +"használhatja, hogy céges erőforrásokhoz férjen hozzá az interneten." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Tartomány" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Csatlakozzon az internetre\n" -"vállalati bejelentkezések hozzáadásához." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Vállalati bejelentkezés" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Felhasználó hozzáadása" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "B_ejegyzés" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Tartományadminisztrátori bejelentkezés" +msgid "You are Offline" +msgstr "Kapcsolat nélkül" -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." msgstr "" -"A vállalati bejelentkezések használatához a számítógépet be kell\n" -"jegyezni a tartományba. Kérje meg a hálózati rendszergazdát,\n" -"hogy írja be itt a tartomány jelszavát." +"Csatlakoznia kell az internetre a vállalati felhasználók hozzáadásához." -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Rendszergazda _neve" - -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Rendszergazdai jelszó" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Vállalati bejelentkezés" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6134,7 +6200,7 @@ msgstr "Jobb kisujj" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Ujjlenyomatos bejelentkezés engedélyezése" @@ -6171,9 +6237,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Bejelentkezés;Név;Ujjlenyomat;Avatar;Logó;Arckép;Jelszó;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Bejelentkezési előzmények" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "B_ejegyzés" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Tartományadminisztrátori bejelentkezés" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"A vállalati bejelentkezések használatához a számítógépet be kell\n" +"jegyezni a tartományba. Kérje meg a hálózati rendszergazdát,\n" +"hogy írja be itt a tartomány jelszavát." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Rendszergazda _neve" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Rendszergazdai jelszó" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6196,38 +6285,30 @@ msgstr "Jele_nlegi jelszó" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "A felhasználó beállíthat jelszót a következő bejelentkezéskor" +msgid "Allow user to change their password on next login" +msgstr "A felhasználó módosíthatja a jelszót a következő bejelentkezéskor" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Jelszó beállítása most" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Felhasználói fiók hozzáadása" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Felhasználói fiók eltávolítása" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "Felhasználó hozzá_adása…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Bejelentkezési beállítások" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatikus bejelentkezés" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Ujjlenyomatos bejelentkezés" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Felhasználói ikon" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Utolsó bejelentkezés" @@ -6330,7 +6411,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" "Használjon vegyesen kis- és nagybetűket, és tegyen közéjük egy-két számot is." @@ -6422,32 +6503,32 @@ msgstr "Ismeretlen hiba" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Egyeznie kell a fiók szolgáltatójának webcímével." +msgid "Should match the web address of your login provider." +msgstr "Egyeznie kell a bejelentkezés szolgáltatójának webcímével." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "A fiók hozzáadása sikertelen" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Nem egyeznek a megadott jelszavak." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "A fiók regisztrálása sikertelen" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nincs támogatott módszer a tartományban való hitelesítésre" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Nem sikerült a tartományhoz csatlakozni" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6455,7 +6536,7 @@ "A bejelentkezési név nem működik.\n" "Próbálja újra." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6463,14 +6544,24 @@ "A bejelentkezési jelszó nem működik.\n" "Próbálja újra." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Nem sikerült bejelentkezni a tartományba" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "A tartomány nem található. Lehet, hogy elgépelte?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Általános" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Rendszergazda" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6488,15 +6579,15 @@ msgid "Enabled" msgstr "Engedélyezve" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Törli a regisztrált ujjlenyomatokat?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "Ujjlenyomatok _törlése" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6504,15 +6595,15 @@ "Törölni kívánja a regisztrált ujjlenyomatokat, ezzel letiltva az " "ujjlenyomatos bejelentkezést?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Kész!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Az eszköz („%s”) nem érhető el" @@ -6520,16 +6611,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Nem indítható az ujjak beolvasása az eszközön („%s”)" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Nem érhető el ujjlenyomat-olvasó" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Segítségért keresse meg rendszergazdáját." @@ -6538,7 +6629,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6547,11 +6638,11 @@ "Az ujjlenyomatos bejelentkezés engedélyezéséhez a(z) „%s” eszköz " "segítségével el kell mentenie az egyik ujjlenyomatát." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Ujj kiválasztása" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Ujjlenyomatok regisztrálása" @@ -6605,14 +6696,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Munkamenet befejeződött" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Munkamenet elkezdődött" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s – Fiókaktivitás" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Válasszon másik jelszót." @@ -6674,7 +6772,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Nem lehet csatlakozni a(z) %s tartományhoz: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Más fiókok" @@ -6754,15 +6852,15 @@ msgid "Logged in" msgstr "Bejelentkezve" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "A fiókszolgáltatás nem érhető el" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Győződjön meg róla, hogy az AccountService telepítve van és fut." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6770,12 +6868,12 @@ "A módosítások végrehajtásához\n" "előbb kattintson a * ikonra" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Felhasználói fiók létrehozása" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6783,12 +6881,12 @@ "Felhasználói fiók létrehozásához\n" "először kattintson a * ikonra" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Kijelölt felhasználói fiók törlése" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6796,33 +6894,32 @@ "A kijelölt felhasználói fiók törléséhez\n" "először kattintson a * ikonra" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Saját fiók" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Már létezik „%s” felhasználónevű felhasználó." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Ez a felhasználónév nem érhető el. Próbáljon egy másikat." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "A felhasználónév túl hosszú." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "A felhasználónév nem kezdődhet „-” karakterrel." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "A felhasználónév csak a-z közötti kis- és nagybetűket, számjegyeket, és a " -"következő karaktereket tartalmazhatja: „.”, „-” és „_”." +"következő karaktereket tartalmazhatja: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Ez a saját mappájának elnevezésére lesz használva, és nem lehet " @@ -6912,19 +7009,19 @@ msgid "Button" msgstr "Gomb" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom rajztábla" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa­com rajz­táb­la" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Rajztáblák gombleképezéseinek beállítása és a stylus érzékenységének " "módosítása" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Rajztábla;Wacom;Stylus;Toll;Eraser;Radír;Egér;" @@ -6956,6 +7053,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth beállítások" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom rajztábla" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Leképezés monitorra…" @@ -7049,22 +7150,22 @@ msgid "Mode Switch #%d" msgstr "%d. módkapcsoló" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "%d. bal gomb" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "%d. jobb gomb" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "%d. felső gomb" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "%d. alsó gomb" @@ -7141,6 +7242,11 @@ msgid "Tip Pressure Feel" msgstr "Hegy nyomásérzékenysége" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Minden beállítás" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME Vezérlőközpont" @@ -7197,22 +7303,18 @@ msgid "Quit" msgstr "Kilépés" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Minden beállítás" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Személyes" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardver" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Rendszer" @@ -7251,6 +7353,192 @@ msgid "Cancel search" msgstr "Keresés megszakítása" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Gyorsbillentyű ehhez: %s. Adja meg egy új gyorsbillentyűt a " +#~ "megváltoztatásához." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Gyorsbillentyű szerkesztéséhez kattintson a sorra, és nyomja le az új " +#~ "billentyűket, vagy a Backspace billentyűt a törléshez." + +#~ msgid "_Name:" +#~ msgstr "_Név:" + +#~ msgid "Add Shortcut" +#~ msgstr "Gyorsbillentyű hozzáadása" + +#~ msgid "Remove Shortcut" +#~ msgstr "Gyorsbillentyű eltávolítása" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "A gyorsbillentyű („%s”) nem használható, mivel a gépelés lehetetlenné " +#~ "válna a billentyű használatával.\n" +#~ "Próbálkozzon a Control, Alt vagy Shift billentyűk valamelyikének egyidejű " +#~ "lenyomásával." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "A gyorsbillentyű („%s”) már használatban van erre:\n" +#~ "„%s”" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Ha a gyorsbillentyűt újra a(z) „%s” funkcióhoz rendeli, akkor a(z) „%s” " +#~ "gyorsbillentyű letiltásra kerül." + +#~ msgid "_Reassign" +#~ msgstr "Új_ra hozzárendelés" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "A(z) „%s” gyorsbillentyű egy hozzárendelt „%s” gyorsbillentyűvel " +#~ "rendelkezik. Szeretné automatikusan beállítani erre: „%s”?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "A(z) „%s” jelenleg a(z) „%s” funkcióhoz van hozzárendelve, ez " +#~ "gyorsbillentyű letiltásra kerül, ha továbblép." + +#~ msgid "_Assign" +#~ msgstr "_Hozzárendelés" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Team" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "A VPN bővítmények nem tölthetők be" + +#~ msgid "Add Network Connection" +#~ msgstr "Hálózati kapcsolat hozzáadása" + +#~ msgid "Bond slaves" +#~ msgstr "Bond alárendeltek" + +#~ msgid "(none)" +#~ msgstr "(nincs)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge alárendeltek" + +#~ msgid "Team slaves" +#~ msgstr "Team alárendeltek" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Az InfiniBand eszköz nem támogatja a csatlakoztatott módot" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nincs kiválasztva hitelesítésszolgáltatói tanúsítvány" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Ha nem használ hitelesítésszolgáltatói (CA) tanúsítványt, akkor nem " +#~ "biztonságos Wi-Fi hálózatokhoz is kapcsolódhat. Ki kíván választani egy " +#~ "hitelesítésszolgáltatói tanúsítványt?" + +#~ msgid "Ignore" +#~ msgstr "Mellőzés" + +#~ msgid "Choose CA Certificate" +#~ msgstr "CA tanúsítvány kiválasztása" + +#~ msgid "As_k for this password every time" +#~ msgstr "Jelszó bekérése min_den alkalommal" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Ne figyelmeztessen újra" + +#~ msgid "No" +#~ msgstr "Nem" + +#~ msgid "Yes" +#~ msgstr "Igen" + +#~ msgid "Error logging into the account" +#~ msgstr "Hiba lépett fel a fiókba bejelentkezéskor" + +#~ msgid "Credentials have expired." +#~ msgstr "A hitelesítési adatok lejártak." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Jelentkezzen be a fiók engedélyezéséhez." + +#~ msgid "_Sign In" +#~ msgstr "_Bejelentkezés" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Egyéb" + +#~ msgid "Personal File Sharing" +#~ msgstr "Személyes fájlmegosztás" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Távoli vezérlés engedélyezése" + +#~ msgid "_Verify" +#~ msgstr "_Ellenőrzés" + +#~ msgid "Login History" +#~ msgstr "Bejelentkezési előzmények" + +#~ msgid "Add User Account" +#~ msgstr "Felhasználói fiók hozzáadása" + +#~ msgid "Remove User Account" +#~ msgstr "Felhasználói fiók eltávolítása" + +#~ msgid "Login Options" +#~ msgstr "Bejelentkezési beállítások" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Már létezik „%s” felhasználónevű felhasználó." + +#~ msgid "Color" +#~ msgstr "Színek" + +#~ msgid "Power" +#~ msgstr "Energia­gazdálkodás" + +#~ msgid "Privacy" +#~ msgstr "Adatvédelem" + #~ msgid "Used to determine your geographical location" #~ msgstr "A földrajzi helyzetének meghatározásához használják" @@ -7282,15 +7570,9 @@ #~ msgid "S_peed:" #~ msgstr "S_ebesség:" -#~ msgid "Shortcuts" -#~ msgstr "Gyorsbillentyűk" - #~ msgid "For mice and touchpads." #~ msgstr "Egerekhez és érintőtáblákhoz" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Kétujjas görgetés" - #~ msgid "Active Jobs" #~ msgstr "Aktív feladatok" @@ -7751,9 +8033,6 @@ #~ msgid "Domain not found." #~ msgstr "Nem található a tartomány." -#~ msgid "Wrong password" -#~ msgstr "Hibás jelszó" - #~ msgctxt "Password hint" #~ msgid "Try to add more characters." #~ msgstr "Próbáljon meg több karaktert hozzáadni." @@ -8237,9 +8516,6 @@ #~ msgid "C_reate..." #~ msgstr "_Létrehozás…" -#~ msgid "_Configure..." -#~ msgstr "_Beállítás…" - #~ msgid "Wireless" #~ msgstr "Vezeték nélküli" diff -Nru gnome-control-center-3.20.2/po/hy.po gnome-control-center-3.22.1/po/hy.po --- gnome-control-center-3.20.2/po/hy.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/hy.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2010-09-02 11:06+0400\n" "Last-Translator: Nune \n" "Language-Team: \n" +"Language: hy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/id.po gnome-control-center-3.22.1/po/id.po --- gnome-control-center-3.20.2/po/id.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/id.po 2016-10-10 16:16:22.000000000 +0000 @@ -8,12 +8,12 @@ # Andika Triwidada , 2009, 2011-2015. msgid "" msgstr "" -"Project-Id-Version: gnome-control-center gnome-3-20\n" +"Project-Id-Version: gnome-control-center gnome-3-22\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-06-07 15:57+0000\n" -"PO-Revision-Date: 2016-06-26 14:55+0700\n" -"Last-Translator: Andika Triwidada \n" +"POT-Creation-Date: 2016-09-24 10:17+0000\n" +"PO-Revision-Date: 2016-10-06 04:15+0700\n" +"Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" "MIME-Version: 1.0\n" @@ -92,7 +92,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Rumah" @@ -108,25 +108,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1283 -#: ../panels/network/net-device-wifi.c:1483 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -157,16 +156,17 @@ msgid "Current background" msgstr "Latar belakang kini" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Latar Belakang" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Ubah gambar latar Anda ke suatu wallpaper atau foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Gambar latar;Layar;Desktop;" @@ -206,18 +206,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Matikan saklar mode Pesawat Terbang untuk memfungsikan Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Nyalakan dan matikan Bluetooth dan sambungkan perangkat Anda" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "berbagi;bluetooth;obex;bersama;" @@ -388,7 +387,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Semua berkas" @@ -428,7 +427,7 @@ msgstr "Simpan profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Simpan" @@ -686,7 +685,7 @@ "\"windows\">Microsoft Windows ini berguna." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Ringkasan" @@ -698,11 +697,11 @@ msgid "_Import File…" msgstr "_Impor Berkas…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "T_ambah" @@ -851,18 +850,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Warna" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibrasikan warna perangkat Anda, seperti monitor, kamera, atau pencetak" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Warna;ICC;Profil;Kalibrasi;Pencetak;Tampilan;" @@ -881,12 +881,12 @@ msgstr "Tak ada bahasa yang ditemukan" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hari ini" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Kemarin" @@ -1016,8 +1016,9 @@ msgid "December" msgstr "Desember" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Tanggal & Waktu" @@ -1074,12 +1075,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Ubah tanggal dan waktu, termasuk zona waktu" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Jam;Zona waktu;Lokasi;" @@ -1091,25 +1092,25 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Untuk mengubah tatanan waktu atau tanggal, Anda perlu diotentikasi." -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Lid Tertutup" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Tampilan Kembar" -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primer" -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1119,179 +1120,194 @@ msgid "Off" msgstr "Mati" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekunder" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Atur Tampilan Kombinasi" -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "Ter_apkan" -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Seret tampilan untuk mengatur ulang mereka" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Putar berlawanan arah jarum jam 90°" -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Putar 180°" -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Putar searah jarum jam 90°" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Ukuran" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Rasio Aspek" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolusi" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Setel untuk TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Laju Penyegaran" -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Tunjukkan bilah puncak dan Ringkasan Aktivitas pada tampilan ini" -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Tampilan Sekunder" -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Gabungkan tampilan ini dengan lainnya untuk membuat ruang kerja ekstra" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentasi" -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Tampilkan hanya pertunjukan salindia dan media" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Cermin" -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Tayangkan tilikan saat ini pada kedua tampilan" -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Matikan" -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Jangan pakai tampilan ini" -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Tak mendapatkan informasi layar" -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Atur Tampilan Kombinasi" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Tampilan" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Pilih bagaimana menggunakan monitor dan proyektor yang tersambung" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Proyektor;xrandr;Layar;Resolusi;Segarkan;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Unknown" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID Build: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID Build: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Tanya apa yang akan dilakukan" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Jangan lakukan apa pun" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Buka folder" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Media Lain" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Pilih aplikasi bagi CD musik" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Pilih aplikasi bagi DVD video" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Pilih aplikasi yang dijalankan ketika pemutar musik disambungkan" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Pilih aplikasi yang dijalankan ketika kamera disambungkan" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Pilih aplikasi bagi CD perangkat lunak" @@ -1300,88 +1316,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD suara" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "diska Blu-ray kosong" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "diska CD kosong" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "diska DVD kosong" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "diska HD DVD kosong" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "diska video Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "pembaca e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "diska video HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD gambar" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "CD Super Video" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD video" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Perangkat lunak Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Seksi" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Ringkasan" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplikasi Baku" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Media Lepasan" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versi %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Rincian" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Tilik informasi tentang sistem Anda" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1555,8 +1569,9 @@ msgid "Launch help browser" msgstr "Tampilkan layar bantuan" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Pengaturan" @@ -1629,7 +1644,6 @@ msgstr "Kunci layar" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Akses Universal" @@ -1665,14 +1679,24 @@ msgid "High contrast on or off" msgstr "Nyalakan atau matikan kontras tinggi" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Tombol Pintas Gubahan" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Dimatikan" @@ -1696,127 +1720,132 @@ msgid "Modifiers-only switch to next source" msgstr "Hanya modifier bertukar ke sumber selanjutnya" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Papan Ketik" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Tata ulang pintasan ke nilai baku" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s telah dipakai untuk %s. Bila Anda menggantinya, %s akan " +"dinonaktifkan" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Atur Pintasan Ubahan" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Atur Pintasan" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Masukkan pintasan baru untuk mengubah %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Tambah Pintas Gubahan" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Papan Ketik" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Tilik dan ubah pintasan papan tik dan tata preferensi pengetikan Anda" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Pintasan;Pengulangan;Kedip;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Tombol Pintas Gubahan" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nama:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "P_erintah:" +msgid "No keyboard shortcut found" +msgstr "Tak ditemukan tombol pintas" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Tambah Pintasan" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Hapus Pintasan" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Untuk mengedit tombol cara pintas, klik pada baris dan tahan tombol baru, " -"atau tekan spasi mundur untuk menghapus." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Tombol Pintas Gubahan" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Cobalah pencarian lain" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Tekan Esc untuk membatalkan." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Tombol pintas itu \"%s\" tidak dapat digunakan karena tidak mungkin mengetik " -"menggunakan tombol ini.\n" -"Silakan coba dengan rangkaian tombol seperti Control, Alt atau Shift secara " -"bersamaan." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nama" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Tombol pintas itu \"%s\" sudah digunakan untuk\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Perintah" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Pintasan" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Sunting" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Jika Anda memfungsikan ulang cara pintas untuk \"%s\", cara \"%s\" ini akan " -"dinonaktifkan." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Tak Ada" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Alih _Fungsikan" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Hapus" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Masukkan pintasan baru" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Pintasan \"%s\" punya pintasan terkait \"%s\". Apakah Anda ingin menatanya " -"secara otomatis menjadi \"%s\"?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Batal" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" kini diasosiasikan dengan \"%s\", pintasan ini akan dinonaktifkan " -"bila Anda maju." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Tambah" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "Tug_askan" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Gantikan" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Atur" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Uji Penga_turan Anda" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mouse & Touchpad" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Tetikus & Touchpad" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Ubah sensitivitas tetikus atau touchpad Anda dan pilih kidal atau bukan" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Trackpad;Pointer;Klik;Sentuh;Ganda;Tombol;Trackball;Gulir;" @@ -1874,6 +1903,10 @@ msgstr "Ketuk untuk Mengklik" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Pengguliran Dua Jari" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Pengguliran Tepi" @@ -1912,11 +1945,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Mode _Pesawat Terbang" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy jaringan" @@ -1924,18 +1957,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ups, ada sesuatu yang salah. Harap hubungi vendor perangkat lunak Anda." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager perlu berjalan." @@ -1951,7 +1984,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1968,243 +2001,243 @@ msgid "page 2" msgstr "halaman 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Keamanan" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "otomatis" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profil %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nihil" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Tak pernah" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i hari yang lalu" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nihil" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Lemah" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Bagus" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Sempurna" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Rincian" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitas" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Alamat" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Netmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Hapus Alamat" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Tambah" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Hapus Server DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrik" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Hapus Route" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Otomatis (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Hanya Link-Lokal" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Awalan" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Otomatis" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Otomatis, hanya DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reset" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Tak Ada" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Kunci WEP 40/128-bit (Heksa atau ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Frasa-sandi WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP Dinamik (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2219,30 +2252,30 @@ msgstr "Kecepatan link" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Alamat IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Alamat IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Alamat Perangkat Keras" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2252,7 +2285,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2383,45 +2416,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Tak bisa membuka penyunting koneksi" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Profil Baru" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Tim" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Tak dapat memuat pengaya VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Impor dari berkas…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Tambah Koneksi Jaringan" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Tambah VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2429,7 +2442,7 @@ msgstr "_Reset" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1484 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Lupakan" @@ -2454,11 +2467,11 @@ msgid "S_ecurity" msgstr "K_eamanan" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Tak dapat mengimpor sambungan VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2471,38 +2484,38 @@ "\n" "Galat: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Pilih berkas untuk diimpor" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Buka" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Berkas bernama \"%s\" sudah ada." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Gantikan" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "Apakah Anda ingin menggantikan %s dengan sambungan VPN yang sedang Anda " "simpan?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Tak dapat mengekspor sambungan VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2513,7 +2526,7 @@ "\n" "Galat: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Ekspor sambungan VPN" @@ -2540,60 +2553,46 @@ msgid "Make available to _other users" msgstr "Jadikan tersedia bagi pengg_una lain" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Jaringan" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Kendalikan bagaimana Anda menyambung ke Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Jaringan;Nirkabel;Wi-Fi;Wifi;IP;LAN;Proksi;WAN;Broadband;Modem;Bluetooth;vpn;" "vlan;bridge;bond;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Slave bond" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nihil)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Slave bridge" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "tak pernah" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hari ini" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "kemarin" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Alamat IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Terakhir dipakai" @@ -2603,29 +2602,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Kabel" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1642 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opsi…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Tambah sambungan baru" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Slave tim" - -#: ../panels/network/net-device-wifi.c:1190 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2634,12 +2629,12 @@ "menggunakannya sebagai hotspot nirkabel untuk berbagi koneksi dengan yang " "lain." -#: ../panels/network/net-device-wifi.c:1194 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Mengaktifkan hotspot nirkabel akan memutuskan Anda dari %s." -#: ../panels/network/net-device-wifi.c:1198 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2647,23 +2642,23 @@ "Anda tidak dapat mengakses Internet melalui nirkabel Anda selama hotspot " "aktif." -#: ../panels/network/net-device-wifi.c:1281 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Hentikan hotspot dan putuskan semua pengguna?" -#: ../panels/network/net-device-wifi.c:1284 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Stop Hotspot" -#: ../panels/network/net-device-wifi.c:1348 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Kebijakan sistem melarang pemakaian sebagai Hotspot" -#: ../panels/network/net-device-wifi.c:1351 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Perangkat nirkabel tak mendukung mode Hotspot" -#: ../panels/network/net-device-wifi.c:1480 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2671,11 +2666,11 @@ "Rincian jaringan bagi jaringan yang dipilih, termasuk sandi dan sebarang " "konfigurasi gubahan akan hilang." -#: ../panels/network/net-device-wifi.c:1795 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Riwayat" -#: ../panels/network/net-device-wifi.c:1799 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2683,7 +2678,7 @@ msgstr "_Tutup" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1807 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Lupakan" @@ -2719,6 +2714,10 @@ msgid "Provider" msgstr "Penyedia" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Jaringan" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2825,15 +2824,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Sandi" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Tak Ada" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Tampilkan S_andi" @@ -2927,7 +2922,6 @@ msgstr "_Menyambung ke Jaringan Tersembunyi…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "R_iwayat" @@ -2949,360 +2943,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Sandi" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-Hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktur" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Status tak diketahui" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Tak dikelola" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Tak tersedia" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Menyambung" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Perlu otentikasi" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Tersambung" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Memutus" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Koneksi gagal" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Status tak diketahui (hilang)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Tak tersambung" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfigurasi gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Konfigurasi IP gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Konfigurasi IP kadaluarsa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Rahasia diperlukan, tapi tak disediakan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1X supplicant diputus" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Konfigurasi 802.1X supplicant gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1X supplicant gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1X supplicant makan waktu terlalu lama untuk mengotentikasi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Layanan PPP gagal dimulai" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Layanan PPP diputus" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Klien DHCP gagal dimulai" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Galat klien DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Klien DHCP gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Layanan koneksi bersama gagal dimulai" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Layanan koneksi bersama gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Layanan AutoIP gagal dimulai" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Galat layanan AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Layanan AutoIP gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Jalur sibuk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Tak ada nada panggil" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Carrier tak dapat dijalin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Permintaan pemanggilan habis waktu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Usaha memanggil gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Inisialisasi modem gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Gagal memilih APN yang dinyatakan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Tak mencari jaringan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Pendaftaran jaringan ditolak" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Pendaftaran jaringan habis waktu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Gagal mendaftar ke jaringan yang diminta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Uji PIN gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmware yang diperlukan bagi perangkat mungkin hilang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Koneksi aktif perangkat menghilang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Koneksi perangkat kini diasumsikan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem tak ditemukan" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Koneksi Bluetooth gagal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Kartu SIM tak dipasang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Perlu PIN SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Perlu PUK SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM salah" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Perangkat InfiniBand tak mendukung mode tersambung" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Kebergantungan koneksi gagal" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware hilang" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabel tercabut" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Tak ada sertifikat dari Certificate Authority yang dipilih" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "galat tak terdefinisi dalam keamanan 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "tak ada berkas yang dipilih" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Tak menggunakan sertifikat dari Certificate Authority (CA) dapat menyebabkan " -"sambungan ke jaringan Wi-Fi liar yang tak aman. Apakah Anda ingin memilih " -"sebuah sertifikat Certificate Authority?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Abaikan" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Pilih Sertifikat CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Kunci privat DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "galat tak dispesifikasikan saat memvalidasi berkas eap-method" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Kunci privat DER, PEM, atau PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Sertifikat DER atau PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "kurang berkas PAC EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Pilih suatu berkas PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Berkas PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Berkas PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Otent_ikasi dalam:" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_Penyediaan PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3311,41 +3281,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonim" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Terotentikasi" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Keduanya" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Berkas PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Otent_ikasi dalam:" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Ijinkan pro_visi PAC otomatis" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "kurang nama pengguna EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "kurang sandi EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nama pengg_una" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Tampilkan _sandi" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "sertifikat CA EAP-PEAP tak valid: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "sertifikat CA EAP-PEAP tak valid: tak ada sertifikat yang dinyatakan" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Pilih sebuah sertifikat Certificate Authority" @@ -3363,19 +3365,56 @@ msgid "C_A certificate" msgstr "Sertifikat C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Tidak dipe_rlukan sertifikat CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versi PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Tanya_kan sandi ini setiap saat" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "kurang nama pengguna EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "kurang sandi EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "kurang identitas EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "sertifikat CA EAP-TLS tak valid: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "sertificat CA EAP-TLS tak valid: tak ada sertifikat yang dinyatakan" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "sandi EAP-TLS tak valid: kurang" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "kunci privat EAP-TLS tak valid: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "sertifikat pengguna CA EAP-TLS tak valid: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Kunci privat tak tersandi itu tidak aman" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3389,11 +3428,11 @@ "\n" "(Anda dapat melindungi kunci pribadi Anda dengan openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Pilih sertifikat pribadi Anda" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Pilih kunci privat Anda" @@ -3405,51 +3444,56 @@ msgid "_User certificate" msgstr "Sertifikat pengg_una" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Kunci privat" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Sandi kunci _privat" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "sertifikat CA EAP-TTLS tak valid: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "sertificat CA EAP-TTLS tak valid: tak ada sertifikat yang dinyatakan" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Jangan _peringatkan saya lagi" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Tak" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ya" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Galat tak diketahui saat memvalidasi keamanan 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS Terterowong" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Protected EAP (PEAP)" @@ -3459,6 +3503,48 @@ msgid "Au_thentication" msgstr "O_tentikasi" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "kurang leap-username" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "kurang leap-password" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "kurang wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"wep-key tak valid: kunci dengan panjang %zu mesti hanya memuat dijit heksa" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"wep-key tak valid: kunci dengan panjang %zu mesti hanya memuat karakter ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"wep-key tak valid: panjang kunci %zu salah. Suatu kunci mesti sepanjang 5/13 " +"(ascii) atau 10/26 (heksa)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "wep-key tak valid: frasa sandi tidak boleh kosong" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "wep-key tak valid: frasa sandi mesti kurang dari 64 karakter" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Bawaan)" @@ -3495,14 +3581,29 @@ msgid "WEP inde_x" msgstr "Inde_ks WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk tak valid: panjang kunci %zu tak valid. Mesti [8,63] byte atau 64 " +"dijit heksa" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk tak valid: tak bisa interpretasikan kunci dengan 64 byte sebagai " +"heksa" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipe" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3544,17 +3645,18 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "_Tampilkan Isi Pesan dalam Layar Kunci" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notifikasi" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "" "Kendalikan pemberitahuan mana yang ditampilkan dan apa yang ditunjukkan" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Pemberitahuan;Banner;Pesan;Baki;Popup;" @@ -3572,79 +3674,68 @@ msgid "Applications" msgstr "Aplikasi" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Lainnya" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Tambah Akun" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Surel" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalender" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontak" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Obrolan" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Sumber daya" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Galat saat log masuk ke akun" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Kredensial telah kadaluwarsa." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Masuk untuk mengaktifkan akun ini." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Masuk" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Galat saat membuat akun" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Galat saat menghapus akun" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Anda yakin ingin menghapus akun?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Ini tidak akan menghapus akun pada server." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Hapus" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Akun Daring" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Sambung ke akun daring Anda dan tentukan mereka akan dipakai apa" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3657,6 +3748,7 @@ msgstr "Tak ada akun daring yang dikonfigurasi" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Hapus Akun" @@ -3795,7 +3887,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Baterai" @@ -3843,101 +3935,102 @@ msgid "When _idle" msgstr "Ket_ika menganggur" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Penghematan Daya" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "Kecerahan _layar" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Kecerahan otomatis" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "_Kecerahan papan tik" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "Re_dupkan layar ketika tak aktif" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "Kosongkan layar" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Matikan Wi-Fi untuk menghemat daya." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "Data _seluler" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Matikan data seluler (3G, 4G, LTE, dsb.) untuk menghemat daya." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "Ketika memakai baterai" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "Ketika ditancapkan" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Suspensi" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Hibernasi" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Bukan apapun" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "Tombol Suspensi & Daya" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "Suspensi otom_atis" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Suspensi otomatis" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "Ketika Tombol Po_wer ditekan" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Perangkat" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Daya" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Tilik status baterai Anda dan ubah pengaturan penghematan daya" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4016,11 +4109,6 @@ msgid "Delay" msgstr "Tunda" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Batal" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Otentikasikan" @@ -4030,153 +4118,153 @@ msgstr "Otentikasi Diperlukan" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Pewarna sedikit" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Pewarna habis" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Developer sedikit" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Developer habis" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Asupan penanda sedikit" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Asupan penanda habis" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Buka penutup" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Buka pinta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Kertas sedikit" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Kertas habis" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Luring" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Dihentikan" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Penampung sampah hampir penuh" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Penampung sampah penuh" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "Penghantar foto optik hampir mati" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "Penghantar foto optik tak berfungsi lagi" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Mengkonfigurasi" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Siap" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Tak menerima pekerjaan" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "Memroses" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Aras Pewarna" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Aras Tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Aras Asupan" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Memasang" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u aktif" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Gagal menambah pencetak baru." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Pilih Berkas PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4184,50 +4272,47 @@ "Berkas Deskripsi Pencetak PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Tak ditemukan pengandar yang cocok" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Mencari pengandar yang disukai…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "Pilih dari basis data…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Sediakan Berkas PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Halaman uji" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Tidak ada pencetak" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Tak dapat memuat ui: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Pencetak" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Tambah pencetak, tilik tugas pencetak, dan menentukan bagaimana Anda ingin " "mencetak" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Pencetak;Antrian;Cetak;Kertas;Tinta;Pewarna;" @@ -4389,6 +4474,11 @@ msgid "Parallel Port" msgstr "Porta Paralel" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4601,13 +4691,17 @@ msgid "_Options" msgstr "_Pilihan" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Tidak ada pencetak" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Tambah Pencetak" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4615,70 +4709,70 @@ "Maaf! Layanan pencetakan sistem\n" "sepertinya tak tersedia." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Kunci Layar" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Dipakai" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Nyala" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Mati" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Layanan Lokasi" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Pemakaian & Riwayat" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Kosongkan semua butir dari Tong Sampah?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Semua butir dalam Tong Sampah akan dihapus secara permanen." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Kosongkan Tong Sampah" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Hapus semua berkas temporer?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Semua berkas temporer akan dihapus secara permanen." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Bersihkan Berkas Tem_porer" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Kosongkan Tong Sampah & Berkas Temporer" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Pemakaian Perangkat Lunak" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Pelaporan Masalah" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4687,22 +4781,23 @@ "Mengirim laporan masalah teknis membantu kami memperbaiki %s. Laporan " "dikirim secara anonim dan dibersihkan dari data pribadi." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Kebijakan Privasi" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privasi" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Lindungi informasi pribadi Anda dan kendalikan apa yang mungkin dilihat oleh " "orang" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4873,21 +4968,21 @@ msgid "Other" msgstr "Lainnya" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Sesi Anda perlu dimulai ulang agar perubahan berefek" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Restart Sekarang" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Tak ada sumber masukan yang dipilih" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Layar Log Ma_suk" @@ -4919,11 +5014,12 @@ msgid "Paper" msgstr "Kertas" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Wilayah & Bahasa" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4931,7 +5027,7 @@ "masukan Anda" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Bahasa;Tata Letak;Papan Tik;Masukan;" @@ -4988,7 +5084,7 @@ msgstr "Alt Kiri+Kanan" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Bahasa" @@ -5038,26 +5134,11 @@ "Pengaturan log masuk dipakai oleh semua pengguna ketika log masuk ke dalam " "sistem" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Tempat" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Penanda Taut" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Lainnya" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Pilih Lokasi" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5065,11 +5146,12 @@ msgid "No applications found" msgstr "Tak menemukan aplikasi" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Cari" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5077,7 +5159,7 @@ "Aktivitas" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Cari;Temukan;Indeks;Sembunyikan;Privasi;Hasil;" @@ -5085,6 +5167,18 @@ msgid "Search Locations" msgstr "Cari Lokasi" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Tempat" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Penanda Taut" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Lainnya" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Naik" @@ -5097,6 +5191,11 @@ msgid "Preferences" msgstr "Preferensi" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Tiada jaringan yang dipilih untuk berbagi" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5135,36 +5234,42 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Izinkan pengguna jarak jauh menyambung memakai perintah Secure Shell:\n" +"Bila log masuk jarak jauh difungsikan, pengguna jarak jauh dapat menyambung " +"memakai perintah Secure Shell:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Izinkan pengguna jarak jauh menilik atau mengendalikan layar Anda dengan " -"menyambung ke: vnc://%s" +"Berbagi layar memungkinkan pengguna jarak jauh menilik atau mengendalikan " +"layar Anda dengan menyambung ke vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Salin" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Berbagi Pakai" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Berbagi" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Kendalikan apa yang ingin Anda bagikan dengan orang lain" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5172,6 +5277,10 @@ "berbagi;ssh;host;nama;jarak jauh;remote;desktop;media;audio;video;gambar;" "foto;film;server;perender;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Jaringan" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Fungsikan atau matikan log masuk jarak jauh" @@ -5181,25 +5290,13 @@ msgstr "" "Otentikasi diperlukan untuk memfungsikan atau mematikan log masuk jarak jauh" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Tiada jaringan yang dipilih untuk berbagi" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Jaringan" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nama _Komputer" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Berbagi Berkas _Pribadi" +msgid "_File Sharing" +msgstr "_Berbagi Berkas" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5218,8 +5315,8 @@ msgstr "Beberapa layanan dimatikan karena tidak ada akses jaringan." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Berbagi Pakai Berkas Pribadi" +msgid "File Sharing" +msgstr "Berbagi Berkas" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5234,8 +5331,8 @@ msgstr "Berbagi Pakai Layar" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "Ijinkan Kend_ali Jarak Jauh" +msgid "_Allow connections to control the screen" +msgstr "Ijink_an koneksi mengendalikan layar" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5262,11 +5359,8 @@ msgstr "Berbagi Pakai Media" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Berbagi media memungkinkan Anda memakai bersama musik, foto, dan video " -"melalui jaringan." +msgid "Share music, photos and videos over the network." +msgstr "Berbagi pakai musik, foto, dan video melalui jaringan." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5394,11 +5488,6 @@ msgid "Peak detect" msgstr "Deteksi puncak" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nama" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Perangkat" @@ -5497,14 +5586,19 @@ msgid "Custom" msgstr "Gubahan" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Akses Universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "" "Membuat lebih mudah untuk melihat, mendengar, mengetik, menunjuk, dan " "mengklik" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5603,8 +5697,8 @@ msgstr "Suara Tombol" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Bip ketika Num Lock atau Caps Lock dinyalakan." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Bip ketika Num Lock atau Caps Lock dinyalakan atau dimatikan." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5986,95 +6080,67 @@ msgstr "Efek Warna" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Tambah Pengguna" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Nama _Lengkap" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standar" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrator" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Nama _Lengkap" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipe Akun" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Ijinkan pengguna mengatur sandi saat _log masuk berikutnya" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Isi sa_ndi sekarang" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verifikasi" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Konfirmasi" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Log masuk enterprise memungkinkan akun pengguna yang telah ada yang dikelola " -"secara terpusat dipakai pada perangkat ini." +"secara terpusat dipakai pada perangkat ini. Anda juga dapat memakai akun ini " +"untuk mengakses sumber daya perusahaan di internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domain" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Daring untuk menambah\n" -"akun log masuk enterprise." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Log Masuk _Enterprise" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Tambah Pengguna" +msgid "You are Offline" +msgstr "Anda Luring" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Daftarkan" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Log Masuk Administrator Domain" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Untuk memakai log masuk enterprise, komputer ini perlu\n" -"didaftarkan dalam domain. Harap minta administrator jaringan Anda\n" -"memasukkan sandi domain mereka di sini." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nama Administrator" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Anda harus daring untuk menambah pengguna enterprise." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Sandi Administrator" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Log Masuk _Enterprise" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6109,7 +6175,7 @@ msgstr "Kelingking kanan" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Fungsikan Log Masuk Sidik Jari" @@ -6146,9 +6212,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Login;Nama;Sidik jari;Avatar;Logo;Muka;Sandi;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Riwayat Log Masuk" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Daftarkan" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Log Masuk Administrator Domain" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Untuk memakai log masuk enterprise, komputer ini perlu\n" +"didaftarkan dalam domain. Harap minta administrator jaringan Anda\n" +"memasukkan sandi domain mereka di sini." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nama Administrator" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Sandi Administrator" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6171,38 +6260,30 @@ msgstr "_Sandi Sekarang" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Izinkan pengguna mengatur sandi saat log masuk berikutnya" +msgid "Allow user to change their password on next login" +msgstr "Ijinkan pengguna mengubah sandi saat log masuk berikutnya" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Isi sandi sekarang" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Tambah Akun Pengguna" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Hapus Akun Pengguna" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "T_ambah Pengguna..." #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Pilihan Log Masuk" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Log Mas_uk Otomatis" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Log Masuk _Sidik Jari" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ikon Pengguna" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Log Masuk Terakhir" @@ -6305,8 +6386,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Campurlah huruf besar dan kecil dan gunakan satu atau dua angka." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Campurlah huruf besar dan kecil dan cobalah memakai satu atau dua angka." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6397,32 +6479,32 @@ msgstr "Galat tak dikenal" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Mesti cocok dengan alamat web dari penyedia akun Anda." +msgid "Should match the web address of your login provider." +msgstr "Mesti cocok dengan alamat web dari penyedia log masuk Anda." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Gagal menambah akun" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Sandi tak cocok." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Gagal mendaftarkan akun" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Tak ada cara yang didukung untuk mengotentikasi dengan domain ini" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Gagal bergabung ke domain" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6430,7 +6512,7 @@ "Nama log masuk itu tak bekerja.\n" "Harap coba lagi." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6438,41 +6520,51 @@ "Sandi log masuk itu tak bekerja.\n" "Harap coba lagi." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Gagal log masuk domain" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Tak bisa temukan domain. Mungkin Anda salah eja?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standar" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrator" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Anda tidak diizinkan mengakses perangkat. Hubungi administrator sistem Anda." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "Perangkat sedang dipakai." -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Terjadi galat internal." -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Diaktifkan" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Hapus sidik jari yang telah terdaftar?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "Hapus Si_dik Jari" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6480,15 +6572,15 @@ "Apakah Anda ingin menghapus sidik jari Anda yang telah terdaftar sehingga " "log masuk memakai sidik jari dimatikan?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Selesai!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Tak dapat mengakses perangkat '%s'" @@ -6496,16 +6588,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Tak dapat memulai penangkapan sidik jari pada perangkat '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Tak dapat mengakses pembaca sidik jari manapun" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Silahkan hubungi administrator sistem Anda untuk bantuan." @@ -6514,7 +6606,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6523,11 +6615,11 @@ "Untuk memfungsikan log masuk sidik jari, Anda perlu menyimpan sidik jari " "Anda, memakai perangkat '%s'." -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Memilih jari" -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Mendaftarkan sidik jari" @@ -6581,14 +6673,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sesi Berakhir" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sesi Dimulai" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Aktivitas Akun" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Silakan pilih sandi lain." @@ -6650,7 +6749,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Tak bisa menyambung ke domain %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Akun Lain" @@ -6730,15 +6829,15 @@ msgid "Logged in" msgstr "Log masuk" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Gagal menghubungi layanan akun" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Pastikan bahwa AccountService ini telah terpasang dan diaktifkan." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6746,12 +6845,12 @@ "Untuk melakukan perubahan,\n" "pertama kali klik ikon *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Buat akun pengguna" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6759,12 +6858,12 @@ "Untuk membuat akun pengguna,\n" "pertama kali klik ikon *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Hapus akun pengguna yang dipilih" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6772,33 +6871,32 @@ "Untuk menghapus akun pengguna yang dipilih,\n" "pertama kali klik ikon *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Akun Saya" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Pengguna dengan nama ‘%s’ telah ada." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Maaf, nama pengguna tersebut tidak tersedia. Harap coba yang lain." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Nama pengguna terlalu panjang." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Nama pengguna tak boleh diawali dengan ‘-‘." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Nama pengguna hanya boleh terdiri dari huruf a-z besar dan kecil, angka, dan " -"sebarang karakter ‘.’, ‘-‘, atau ‘_’." +"karakter berikut: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Ini akan dipakai untuk menamai folder rumah Anda dan tak bisa diubah." @@ -6888,17 +6986,17 @@ msgid "Button" msgstr "Tombol" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablet Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "Tata pemetaan tombol dan atur kepekaan stylus bagi tablet grafis" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Penghapus;Tetikus;" @@ -6930,6 +7028,10 @@ msgid "Bluetooth Settings" msgstr "Pengaturan Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Petakan ke Monitor…" @@ -7115,6 +7217,11 @@ msgid "Tip Pressure Feel" msgstr "Perasaan Tekanan Ujung" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Semua Pengaturan" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Pusat Kendali GNOME" @@ -7171,22 +7278,18 @@ msgid "Quit" msgstr "Keluar" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Semua Pengaturan" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Pribadi" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Perangkat keras" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistem" @@ -7224,3 +7327,9 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "Batalkan pencarian" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" diff -Nru gnome-control-center-3.20.2/po/it.po gnome-control-center-3.22.1/po/it.po --- gnome-control-center-3.20.2/po/it.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/it.po 2016-10-10 16:16:22.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-05-11 10:26+0000\n" -"PO-Revision-Date: 2016-05-29 15:25+0200\n" +"POT-Creation-Date: 2016-09-24 10:17+0000\n" +"PO-Revision-Date: 2016-10-03 12:16+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italiano \n" "Language: it\n" @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7\n" +"X-Generator: Poedit 1.8.9\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -93,7 +93,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Home" @@ -110,25 +110,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -159,16 +158,17 @@ msgid "Current background" msgstr "Sfondo attuale" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Sfondo" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Cambia l'immagine di sfondo con un rivestimento o una foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Rivestimento;Sfondo;Scrivania;Desktop;Wallpaper;" @@ -208,18 +208,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Disattivare la modalità aereo via hardware per abilitare il Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Attiva e disattiva il Bluetooth e connette i propri dispositivi" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "condivisione;condividere;share;bluetooth;obex;" @@ -394,7 +393,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Tutti i file" @@ -433,7 +432,7 @@ msgstr "Salva profilo" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Salva" @@ -699,7 +698,7 @@ "\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Riepilogo" @@ -711,11 +710,11 @@ msgid "_Import File…" msgstr "_Importa file…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "A_ggiungi" @@ -866,18 +865,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Colore" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibra il colore dei dispositivi, come schermi, fotocamere o stampanti" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Colore;ICC;Profilo;Calibrazione;Stampante;Display;Schermo;" @@ -896,12 +896,12 @@ msgstr "Nessuna lingua trovata" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Oggi" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Ieri" @@ -1031,8 +1031,9 @@ msgid "December" msgstr "Dicembre" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data e ora" @@ -1089,12 +1090,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Cambia data e orario, così come fuso orario" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Orologio;Tempo;Data;Fuso;Posizione;Orario;" @@ -1107,25 +1108,25 @@ msgstr "" "Per cambiare le impostazioni dell'ora e della data è necessario autenticarsi." -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Coperchio chiuso" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Duplicati" -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primario" -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1135,186 +1136,201 @@ msgid "Off" msgstr "Off" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secondario" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Disponi schermi combinati" -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Applica" -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Trascina gli schermi per ridisporli" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Ruota in senso antiorario di 90°" -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Ruota di 180°" -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Ruota in senso orario di 90°" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Dimensione" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Rapporto" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Risoluzione" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Regola per TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Frequenza aggiornamento" -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostra su questo schermo la barra superiore e la panoramica attività" -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Schermo secondario" -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Unisce questo schermo con l'altro per creare uno spazio di lavoro aggiuntivo" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentazione" -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostra solo presentazioni ed elementi mutlimediali" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Duplicato" -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostra quanto già visibile su entrambi gli schermi" -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Spegni" -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Non usare questo schermo" -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Impossibile ottenere informazioni sullo schermo" -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Disponi schermi combinati" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Schermi" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Sceglie come usare i monitor e i proiettori connessi" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Pannello;Proiettore;xrandr;Schermo;Risoluzione;Dimensioni;Refresh;Display;" "Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Sconosciuto" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID build: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID build: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" # modificato un po' rispetto originale per mantere "azione" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Chiedere l'azione da intraprendere" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nessuna azione" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Aprire la cartella" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Altri supporti" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Selezionare un'applicazione per i CD audio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Selezionare un'applicazione per i DVD video" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Selezionare un'applicazione da eseguire quando viene connesso un lettore " "musicale" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "" "Selezionare un'applicazione da eseguire quando viene connessa una fotocamera" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Selezionare un'applicazione per i CD di software" @@ -1323,88 +1339,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD audio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Disco vuoto Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Disco vuoto CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Disco vuoto DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Disco vuoto HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disco video Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Lettore e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disco video HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sezione" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Panoramica" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Applicazioni predefinite" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Dispositivi rimovibili" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versione %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Dettagli" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Visualizza informazioni su questo sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1579,8 +1593,9 @@ msgid "Launch help browser" msgstr "Lancia il visualizzatore di manuali" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Impostazioni" @@ -1653,7 +1668,6 @@ msgstr "Blocca lo schermo" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Accesso universale" @@ -1689,14 +1703,24 @@ msgid "High contrast on or off" msgstr "Attiva o disattiva il contrasto elevato" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Scorciatoie personalizzate" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Disabilitato" @@ -1720,125 +1744,126 @@ msgid "Modifiers-only switch to next source" msgstr "Solo i modificatori passano a sorgente successiva" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastiera" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Ripristina la scorciatoia al suo valore predefinito" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s è già in uso per %s: se viene sostituita, %s verrà disabilitata" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Imposta scorciatoia personalizzata" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Imposta scorciatoia" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Inserire la nuova scorciatoia per cambiare %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Aggiungi scorciatoia personalizzata" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tastiera" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Visualizza e modifica le scorciatoie da tastiera e imposta le preferenze di " "digitazione" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Scorciatoie;Ripetizione;Lampeggiamento;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Scorciatoia personalizzata" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nome:" +msgid "No keyboard shortcut found" +msgstr "Nessuna scorciatoia trovata" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "C_omando:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Aggiungi scorciatoia" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Rimuovi scorciatoia" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Per modificare una scorciatoia, fare clic sulla riga e premere i nuovi tasti " -"oppure premere «Backspace» per cancellarla." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Scorciatoie personalizzate" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Provare un altro criterio di ricerca" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Premere Esc per annullare." -# Appare se si prova ad usare come scorciatoia un tasto solo che non sia un -# tasto speciale (per esempio "G"). -# -# Adattata al meglio la traduzione italiana.c -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Non è possibile usare «%s» come scorciatoia perché diventerebbe impossibile " -"digitare usando questo tasto.\n" -"Provare ad usare in combinazione un tasto come Ctrl, Alt o Maiusc." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nome" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"La scorciatoia «%s» è già usata per\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Comando" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Scorciatoia" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Modifica" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Se si riassegna la scorciatoia a «%s», la scorciatoia «%s» verrà " -"disabilitata." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Nessuno" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Riassegna" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Rimuovi" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Inserire la nuova scorciatoia" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"La scorciatoia «%s» è associata alla scorciatoia «%s». Impostarla " -"automaticamente a «%s»?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Annulla" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"«%s» è attualmente associata con «%s», procedendo tale scorciatoia verrà " -"disabilitata." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Aggiungi" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Assegna" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Sostituisci" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Imposta" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Test _impostazioni" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Mouse e touchpad" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1847,7 +1872,7 @@ # NOTA: cursore non è corretto, ma gli utenti non lo sanno :( #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Puntatore;Click;Clic;Tap;Doppio;Pulsante;Trackball;Cursore;Scroll;" @@ -1907,6 +1932,10 @@ msgstr "Toccare per fare clic" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Scorrimento a due dita" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Scorrimento sul bordo" @@ -1945,11 +1974,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modalità ae_reo" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy di rete" @@ -1957,18 +1986,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Oops, sembra si sia verificato un problema: contattare il fornitore software." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager deve essere in esecuzione." @@ -1984,7 +2013,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2001,64 +2030,64 @@ msgid "page 2" msgstr "pagina 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sicurezza" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatica" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profilo %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nessuna" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Mai" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2066,179 +2095,179 @@ msgstr[1] "%i giorni fa" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nessuna" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Debole" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Buona" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Eccellente" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Dettagli" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identità" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Indirizzo" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Netmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Elimina indirizzo" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Aggiungi" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Elimina server DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metriche" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Elimina instradamento" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatico (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuale" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Solo link-local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefisso" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatico" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatico, solo DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Azzera" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nessuna" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Chiave WEP 40/128-bit (Hex o ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Passphrase WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinamico (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2253,30 +2282,30 @@ msgstr "Velocità collegamento" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Indirizzo IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Indirizzo IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Indirizzo hardware" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2286,7 +2315,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2417,45 +2446,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Impossibile aprire l'editor di connessione" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nuovo profilo" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Impossibile caricare i plugin VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importa da file…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Aggiungi connessione di rete" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Aggiungi VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2463,7 +2472,7 @@ msgstr "A_zzera" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Dimentica" @@ -2489,11 +2498,11 @@ msgid "S_ecurity" msgstr "Sicur_ezza" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Impossibile importare la connessione VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2506,36 +2515,36 @@ "\n" "Errore: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Selezione file da importare" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Apri" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Esiste già un file avente nome «%s»." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Sostituisci" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Sostituire %s con la connessione VPN che si sta salvando?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Impossibile esportare la connessione VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2546,7 +2555,7 @@ "\n" "Errore: %3$s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Esporta connessione VPN" @@ -2573,60 +2582,46 @@ msgid "Make available to _other users" msgstr "Rendere disponibile agli altri _utenti" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Rete" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Regola la connessione a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Rete;Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" -"vpn;vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond slave" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nessuno)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge slave" +"vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "mai" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "oggi" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ieri" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Indirizzo IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Ultimo uso" @@ -2636,29 +2631,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Cavo" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opzioni…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Aggiungi nuova connessione" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team slave" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2667,12 +2658,12 @@ "possibile impostare un hotspot Wi-Fi per condividere con altri tale " "connessione." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "L'attivazione dell'hotspot Wi-Fi terminerà la connessione a %s." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2680,23 +2671,23 @@ "Non è possibile accedere a Internet tramite la connessione wireless mentre " "l'hotspot è attivo." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Interrompere l'hotspot e disconnettere tutti gli utenti?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "Ferma _hotspot" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "La politica di sistema proibisce l'uso come Hotspot" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Il dispositivo wireless non supporta la modalità Hotspot" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2704,11 +2695,11 @@ "Saranno persi i dettagli per le reti selezionate, inclusi la password e ogni " "configurazione personalizzata." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Cronologia" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2716,7 +2707,7 @@ msgstr "_Chiudi" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Dimentica" @@ -2753,6 +2744,10 @@ msgid "Provider" msgstr "Provider" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Rete" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2859,15 +2854,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "Pass_word" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Nessuno" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Mostra pass_word" @@ -2961,7 +2952,6 @@ msgstr "_Connetti a rete nascosta…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Cronologia" @@ -2983,360 +2973,337 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Password" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructure" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Stato sconosciuto" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Non gestito" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Non disponibile" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "In connessione" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Richiesta autenticazione" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Connesso" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "In disconnessione" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Connessione non riuscita" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Stato sconosciuto (mancante)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Non connesso" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Configurazione non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Configurazione IP non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Configurazione IP scaduta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Erano richiesti dei segreti, ma non ne sono stati forniti" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Supplicant 802.1X scollegato" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Configurazione supplicant 802.1X non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Supplicant 802.1X non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "L'autenticazione del supplicant 802.1X ha impiegato troppo tempo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Avvio del servizio PPP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Servizio PPP disconnesso" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Avvio del client DHCP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Errore client DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Client DHCP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Avvio del servizio di connessione condivisa non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Servizio connessione condivisa non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Avvio del servizio AutoIP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Errore servizio AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Servizio AutoIP non riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linea occupata" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nessun segnale di chiamata" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Impossibile stabilire alcuna portante" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "La richiesta di selezione è scaduta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Il tentativo di selezione non è riuscito" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Inizializzazione modem non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Selezione dell'APN specificato non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nessuna ricerca attiva di reti" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Registrazione rete negata" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Registrazione rete scaduta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Registrazione sulla rete richiesta non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Verifica PIN non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Potrebe mancare il firmware per il dispositivo " #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Connessione scomparsa" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "È stata considerata la connessione esistente" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem non trovato" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Connessione Bluetooth non riuscita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Scheda SIM non inserita" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Richiesto codice PIN della SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Richiesto codice PUK della SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Scheda SIM errata" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Il dispositivo InfiniBand non supporta la modalità collegata" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Dipendenza della connessione non riuscita" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware mancante" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cavo scollegato" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Non è stato scelto alcun certificato di un'Autorità di Certificazione" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "errore non definito nella sicurezza 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Nessun file selezionato" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Il non utilizzo di un certificato emesso da un'Autorità di Certificazione " -"(CA) può portare a connessioni Wi-Fi insicure. Scegliere un certificato di " -"un'Autorità di Certificazione?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignora" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Scegli certificato CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Chiavi private DER, PEM o PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "errore non specificato nel validare il file eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Chiavi private DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificati DER o PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "File PAC EAP-FAST mancante" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Scegliere una file PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "File PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_File PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticazione _interna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visioning PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3345,41 +3312,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonimo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticazione" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Entrambi" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_File PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticazione _interna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Fornire a_utomaticamente PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "manca il nome utente EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "manca la password EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nome _utente" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Mostra la pass_word" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "certificato CA EAP-PEAP non valido: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "certificato CA EAP-PEAP non valido: nessun certificato specificato" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Scegliere un certificato di un'Autorità di Certificazione" @@ -3397,19 +3396,56 @@ msgid "C_A certificate" msgstr "Certificato C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nessun certificato CA _richiesto" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versione PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "C_hiedere questa password ogni volta" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "manca il nome utente EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "manca la password EAP" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "manca l'identità EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificato CA EAP-TLS non valido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificato CA EAP-TLS non valido: nessun certificato specificato" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "password EAP-TLS non valida: manca la password" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "chiave privata EAP-TLS non valida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificato utente EAP-TLS non valido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Le chiavi private non cifrate non sono sicure" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3423,11 +3459,11 @@ "\n" "(È possibile proteggere le proprie chiavi private con «openssl».)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Scegliere il certificato personale" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Scegliere la chiave privata personale" @@ -3439,51 +3475,56 @@ msgid "_User certificate" msgstr "Certificato _utente" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "C_hiave privata" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Password chiave _privata" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificato CA EAP-TTLS non valido: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificato CA EAP-TTLS non valido: nessun certificato specificato" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Non a_vvisare più in futuro" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "No" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sì" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Errore sconosciuto nel validare la sicurezza 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS con tunnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "PEAP (Protected EAP)" @@ -3493,6 +3534,51 @@ msgid "Au_thentication" msgstr "Au_tenticazione" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "manca leap-username" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "manca leap-password" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "manca wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"wpa-key non valida: una chiave di lunghezza %zu deve contenere solo cifre " +"esadecimali" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"wpa-key non valida: una chiave di lunghezza %zu deve contenere solo " +"caratteri ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"wpa-key non valida: lunghezza chiave %zu non valida. Una chiave deve essere " +"di lunghezza 5/13 (ascii) o 10/26 (esadecimale)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "wpa-key non valida: la passphrase non può essere vuota" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"wpa-key non valida: la passphrase deve essere più corta di 64 caratteri" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (predefinito)" @@ -3529,14 +3615,29 @@ msgid "WEP inde_x" msgstr "Indi_ce WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk non valida: lunghezza chiave %zu non valida. Deve essere [8,63] byte " +"o 64 cifre esadecimali" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk non valida: impossibile interpretare chiave con 64 byte come " +"esadecimali" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipo" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3578,16 +3679,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Most_rare contenuto messaggi sullo schermo bloccato" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notifiche" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controlla quali notifiche visualizzare e cosa esse mostrano" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifiche;Banner;Messaggio;Tray;Popup;" @@ -3605,79 +3707,68 @@ msgid "Applications" msgstr "Applicazioni" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Altro" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Aggiungi account" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Email" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendario" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contatti" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Risorse" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Errore nell'accedere all'account" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Le credenziali sono scadute." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Eseguire l'accesso per abilitare questo account." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Accedi" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Errore nel creare l'account" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Errore nel rimuovere l'account" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Rimuovere veramente l'account?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "In questo modo non verrà rimosso l'account sul server." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Rimuovi" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Account online" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Connette ai propri account online e decide per cosa usarli" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3690,6 +3781,7 @@ msgstr "Nessun account online configurato" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Rimuovi account" @@ -3833,7 +3925,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Batteria" @@ -3881,105 +3973,106 @@ msgid "When _idle" msgstr "Quando _inattivo" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Risparmio energetico" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "Luminosità dello _schermo" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Luminosità automatica" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "Luminosità della _tastiera" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "_Oscurare lo schermo quando inattivo" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "Schermo _nero" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Spegnere il Wi-Fi per risparmiare energia." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "Banda larga _mobile" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Spegnere i dispositivi a banda larga mobile (3G, 4G, LTE, ecc.) per " "risparmiare energia." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "Quando a batteria" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "Quando collegato" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Sospendere" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Ibernare" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Nessuna azione" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "Sospensione e pulsante accensione" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "_Sospensione automatica" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Sospensione automatica" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "_Quando viene premuto il pulsante di accensione" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositivi" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Alimentazione" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Energia" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Visualizza lo stato della batteria e cambia le impostazioni di risparmio " "energetico" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4058,11 +4151,6 @@ msgid "Delay" msgstr "Ritardo" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Annulla" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autentica" @@ -4073,141 +4161,141 @@ # cfr traduzioni simili su gtk+ #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Toner in esaurimento" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Toner esaurito" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Developer in esaurimento" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Developer esaurito" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Disponibilità di un inchiostro in esaurimento" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Disponibilità di un inchiostro esaurita" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Coperchio aperto" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Sportello aperto" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Carta in esaurimento" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Carta esaurita" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Fuori rete" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Ferma" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Contenitore rifiuti quasi pieno" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Contenitore rifiuti pieno" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "" "Il fotoconduttore ottico sta per terminare il suo periodo di operatività" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "Il fotoconduttore ottico non è più funzionante" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Configurazione" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Pronta" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Non accetta lavori" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "In elaborazione" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Livello toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Livello inchiostro" # lett: materiali, forniture # visto che sono comunque "inchiostri" e che si consumano... #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Livello consumabili" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Installazione" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4215,15 +4303,15 @@ msgstr[1] "%u attivi" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Aggiunta della nuova stampante non riuscita." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Selezionare file PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4231,48 +4319,45 @@ "File PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Nessun driver adatto trovato" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Ricerca driver preferiti…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "Seleziona dal database…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Fornisci file PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Pagina di test" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Nessuna stampante" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Impossibile caricare l'interfaccia: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Stampanti" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Aggiunge stampanti, visualizza lavori di stampa e decide come stampare" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Stampante;Coda;Stampa;Carta;Inchostro;Toner;" @@ -4434,6 +4519,11 @@ msgid "Parallel Port" msgstr "Porta parallela" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4646,13 +4736,17 @@ msgid "_Options" msgstr "_Opzioni" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Nessuna stampante" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Aggiungi stampante" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4660,70 +4754,70 @@ "Il servizio di sistema per la stampa\n" "sembra non essere disponibile." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Blocco schermo" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "In uso" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "On" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Off" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Servizi di localizzazione" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Uso e cronologia" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Svuotare il cestino?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Tutti gli oggetti nel cestino saranno rimossi in maniera definitiva." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "S_vuota cestino" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Eliminare tutti i file temporanei?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Tutti i file temporanei verranno rimossi im maniera definitiva." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Pulisci file temporanei" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Pulizia cestino e file temporanei" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Utilizzo software" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Segnalazione problemi" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4732,22 +4826,23 @@ "L'invio di segnalazioni consente di migliorare %s. Le segnalazioni vengono " "inviate anonimamente e qualsiasi dato personale viene prima eliminato." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Informativa sulla privacy" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privacy" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Protegge le proprie informazioni personali e controlla cosa gli altri " "possono vedere" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4918,21 +5013,21 @@ msgid "Other" msgstr "Altro" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "È necessario riavviare la sessione per applicare le modifiche" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Riavvia adesso" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nessuna sorgente di input selezionata" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Schermata di _accesso" @@ -4964,11 +5059,12 @@ msgid "Paper" msgstr "Carta" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Regione e lingua" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4976,7 +5072,7 @@ "sorgenti di input" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Lingua;Disposizione;Layout;Tastiera;Input;" @@ -5034,7 +5130,7 @@ msgstr "Alt destro e sinistro" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Lingua" @@ -5084,26 +5180,11 @@ "Le impostazioni di accesso sono usate da tutti gli utenti quando eseguono il " "login" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Risorse" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Segnalibri" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Altro" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Seleziona posizione" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5111,11 +5192,12 @@ msgid "No applications found" msgstr "Nessuna applicazione" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Cerca" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5123,7 +5205,7 @@ "attività" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Cerca;Trova;Indice;Nascondi;Privacy;Risultati;" @@ -5131,6 +5213,18 @@ msgid "Search Locations" msgstr "Posizioni di ricerca" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Risorse" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Segnalibri" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Altro" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Sposta su" @@ -5143,6 +5237,11 @@ msgid "Preferences" msgstr "Preferenze" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nessuna rete selezionata per la condivisione" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5181,36 +5280,43 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Consente a utenti remoti di connettersi usando il comando Secure Shell:\n" +"Quanto l'accesso remoto è abilitato, consente a utenti remoti di connettersi " +"usando il comando Secure Shell:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Consente a utenti remoti di visualizzare o controllare il proprio schermo " -"connettendosi a vnc://%s" +"La condivisione dello schermo consente a utenti remoti di visualizzare o " +"controllare il proprio schermo connettendosi a vnc://" +"%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copia" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Condivisione" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Condivisione" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controlla cosa si vuole condividere con altri" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5218,6 +5324,10 @@ "condivisione;share;ssh;host;nome;remoto;desktop;bluetooth;obex;media;" "multimedia;audio;video;immagini;foto;film;server;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Reti" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Abilita o disabilita l'accesso remoto" @@ -5227,25 +5337,13 @@ msgstr "" "È necessario autenticarsi per abilitare o disabilitare l'accesso remoto" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nessuna rete selezionata per la condivisione" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Reti" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Nome del computer" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Condivisione file _personali" +msgid "_File Sharing" +msgstr "Condivisione _file" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5264,8 +5362,8 @@ msgstr "Alcuni servizi sono disabilitati poiché non c'è accesso di rete." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Condivisione file personali" +msgid "File Sharing" +msgstr "Condivisione file" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5280,8 +5378,8 @@ msgstr "Condivisione schermo" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "Consenti controllo da _remoto" +msgid "_Allow connections to control the screen" +msgstr "Consentire _alle connessioni di controllare lo schermo" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5308,11 +5406,8 @@ msgstr "Condivisione multimediale" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"La condivisione delle risorse consente di condividere musica, foto e video " -"sulla rete." +msgid "Share music, photos and videos over the network." +msgstr "Condivide musica, fotografie e video sulla rete." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5445,11 +5540,6 @@ msgid "Peak detect" msgstr "Rilevamento picco" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nome" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositivo" @@ -5550,12 +5640,17 @@ msgid "Custom" msgstr "Personalizzato" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Accesso universale" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Rende più semplice vedere, ascoltare, digitare e fare clic" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5655,8 +5750,9 @@ msgstr "Tasti udibili" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Emette un suono quando BlocNum o BlocMaiusc vengono attivati." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Emette un suono quando BlocNum o BlocMaiusc vengono attivati o disattivati." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6040,95 +6136,67 @@ msgstr "Effetti colore" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Aggiungi utente" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Nome _completo" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Normale" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Amministratore" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Nome _completo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipo di account" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "_Permettere all'utente di impostare una password al prossimo accesso" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Impostare una pass_word adesso" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verifica" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "Confer_ma" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "L'accesso enterprise consente di usare su questo dispositivo un preesistente " -"account utente gestito centralmente." +"account utente gestito centralmente. È possibile utilizzare questo account " +"per accedere alle risorse aziendali su Internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Dominio" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Andare online per aggiungere\n" -"account d'accesso enterprise." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Account _enterprise" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Aggiungi utente" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Registra" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Accesso amministratore dominio" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Per poter utilizzare gli accessi enterprise, il computer deve essere\n" -"registrato nel dominio. Chiedere all'amministratore di rete\n" -"di digitare la password per il dominio in questo campo." +msgid "You are Offline" +msgstr "Fuori rete" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nome amministratore" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "È necessario essere online per aggiungere account enterprise." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Password amministratore" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Account _enterprise" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6164,7 +6232,7 @@ # (ndt) titolo #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Abilita accesso con impronta" @@ -6201,9 +6269,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Login;Accesso;Nome;Impronta;Avatar;Logo;Faccia;Password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Cronologia accessi" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Registra" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Accesso amministratore dominio" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Per poter utilizzare gli accessi enterprise, il computer deve essere\n" +"registrato nel dominio. Chiedere all'amministratore di rete\n" +"di digitare la password per il dominio in questo campo." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nome amministratore" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Password amministratore" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6226,38 +6317,31 @@ msgstr "_Password attuale" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Permette all'utente di impostare una password al prossimo accesso" +msgid "Allow user to change their password on next login" +msgstr "Permette all'utente di modificare la password al prossimo accesso" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Impostare una password adesso" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Aggiungi account utente" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Rimuovi account utente" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "A_ggiungi utente…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opzioni di accesso" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Accesso a_utomatico" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Accesso con i_mpronta" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Icona utente" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Ultimo accesso" @@ -6361,7 +6445,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Combinare lettere maiuscole e minuscole e usare un numero o due." #: ../panels/user-accounts/pw-utils.c:119 @@ -6455,32 +6539,33 @@ msgstr "Errore sconosciuto" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Dovrebbe corrispondere all'indirizzo web del proprio account provider." +msgid "Should match the web address of your login provider." +msgstr "" +"Dovrebbe corrispondere all'indirizzo web del proprio fornitore di accesso." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Aggiunta dell'account non riuscita" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Le password non corrispondono." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Registrazione dell'account non riuscita" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nessun modo supportato per autenticarsi con questo dominio" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Join al dominio non riuscita" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6488,7 +6573,7 @@ "Nome di accesso non valido.\n" "Provare di nuovo." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6496,42 +6581,52 @@ "Password non valida.\n" "Provare di nuovo." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Accesso al dominio non riuscito" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Impossibile trovare il dominio. Forse è stato digitato in modo errato." -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Normale" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Amministratore" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "L'accesso al dispositivo non è consentito. Contattare l'amministratore di " "sistema." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "Il dispositivo è già in uso." -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Si è verificato un errore interno." -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Abilitato" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Eliminare le impronte digitali registrate?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Elimina impronte" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6539,15 +6634,15 @@ "Eliminare le impronte digitali registrate così da disabilitare l'accesso " "tramite impronta?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Eseguito." #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Impossibile accedere al dispositivo «%s»" @@ -6555,16 +6650,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Impossibile avviare la cattura dell'impronta sul dispositivo «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Impossibile accedere ad alcun lettore di impronte digitali" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Contattare l'amministratore di sistema per ricevere aiuto." @@ -6573,7 +6668,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6582,11 +6677,11 @@ "Per abilitare l'accesso tramite impronta digitale è necessario salvare una " "delle proprie impronte digitali utilizzando il dispositivo «%s»." -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Selezione dito" -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Registrazione impronte digitali" @@ -6640,14 +6735,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sessione terminata" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sessione avviata" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Attività account" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Scegliere un'altra password." @@ -6709,7 +6811,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Impossibile connettersi al dominio %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Altri account" @@ -6790,15 +6892,15 @@ msgstr "Accesso eseguito" # Contatto mi pareva orrendo... -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Comunicazione con servizio account non riuscita" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Assicurarsi che AccountService sia installato e abilitato." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6806,12 +6908,12 @@ "Per apportare cambiamenti,\n" "fare prima clic sull'icona *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Crea un account utente" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6819,12 +6921,12 @@ "Per creare un account utente,\n" "fare prima clic sull'icona *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Elimina l'account utente selezionato" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6832,33 +6934,32 @@ "Per eliminare l'account utente selezionato,\n" "fare prima clic sull'icona *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Account personale" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Esiste già un utente con nome «%s»." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Il nome utente non è disponibile, provare un altro." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Il nome utente è troppo lungo." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Il nome utente non può cominciare con un «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Il nome utente deve essere formato da lettere maiuscole e minuscole (dalla A " -"alla Z), numeri e i caratteri \".\", \"-\" e \"_\"." +"alla Z), numeri e dai seguenti caratteri: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Verrà usato per dare un nome alla propria cartella home e non potrà essere " @@ -6950,19 +7051,19 @@ msgid "Button" msgstr "Pulsante" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tavoletta Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Imposta la mappatura dei pulsanti e regola la sensibilità del pennino per " "tavolette grafiche" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;Tavoletta;Penna;Gomma;" @@ -6994,6 +7095,10 @@ msgid "Bluetooth Settings" msgstr "Impostazioni Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tavoletta Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mappa su monitor…" @@ -7180,6 +7285,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilità della punta" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Tutte le impostazioni" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centro di controllo GNOME" @@ -7236,22 +7346,18 @@ msgid "Quit" msgstr "Esci" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Tutte le impostazioni" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personale" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7289,3 +7395,185 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "Annulla la ricerca" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Color" +#~ msgstr "Colore" + +#~ msgid "_Name:" +#~ msgstr "_Nome:" + +#~ msgid "Remove Shortcut" +#~ msgstr "Rimuovi scorciatoia" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Per modificare una scorciatoia, fare clic sulla riga e premere i nuovi " +#~ "tasti oppure premere «Backspace» per cancellarla." + +#~ msgid "" +#~ msgstr "" + +# Appare se si prova ad usare come scorciatoia un tasto solo che non sia un +# tasto speciale (per esempio "G"). +# +# Adattata al meglio la traduzione italiana.c +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Non è possibile usare «%s» come scorciatoia perché diventerebbe " +#~ "impossibile digitare usando questo tasto.\n" +#~ "Provare ad usare in combinazione un tasto come Ctrl, Alt o Maiusc." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "La scorciatoia «%s» è già usata per\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Se si riassegna la scorciatoia a «%s», la scorciatoia «%s» verrà " +#~ "disabilitata." + +#~ msgid "_Reassign" +#~ msgstr "_Riassegna" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "La scorciatoia «%s» è associata alla scorciatoia «%s». Impostarla " +#~ "automaticamente a «%s»?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "«%s» è attualmente associata con «%s», procedendo tale scorciatoia verrà " +#~ "disabilitata." + +#~ msgid "_Assign" +#~ msgstr "_Assegna" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Team" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Impossibile caricare i plugin VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Aggiungi connessione di rete" + +#~ msgid "Bond slaves" +#~ msgstr "Bond slave" + +#~ msgid "(none)" +#~ msgstr "(nessuno)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge slave" + +#~ msgid "Team slaves" +#~ msgstr "Team slave" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Il dispositivo InfiniBand non supporta la modalità collegata" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "" +#~ "Non è stato scelto alcun certificato di un'Autorità di Certificazione" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Il non utilizzo di un certificato emesso da un'Autorità di Certificazione " +#~ "(CA) può portare a connessioni Wi-Fi insicure. Scegliere un certificato " +#~ "di un'Autorità di Certificazione?" + +#~ msgid "Ignore" +#~ msgstr "Ignora" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Scegli certificato CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "C_hiedere questa password ogni volta" + +#~ msgid "Don't _warn me again" +#~ msgstr "Non a_vvisare più in futuro" + +#~ msgid "No" +#~ msgstr "No" + +#~ msgid "Yes" +#~ msgstr "Sì" + +#~ msgid "Error logging into the account" +#~ msgstr "Errore nell'accedere all'account" + +#~ msgid "Credentials have expired." +#~ msgstr "Le credenziali sono scadute." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Eseguire l'accesso per abilitare questo account." + +#~ msgid "_Sign In" +#~ msgstr "_Accedi" + +#~ msgid "Power" +#~ msgstr "Alimentazione" + +#~ msgid "Privacy" +#~ msgstr "Privacy" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Altro" + +#~ msgid "Personal File Sharing" +#~ msgstr "Condivisione file personali" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Consenti controllo da _remoto" + +#~ msgid "_Verify" +#~ msgstr "_Verifica" + +#~ msgid "Login History" +#~ msgstr "Cronologia accessi" + +#~ msgid "Add User Account" +#~ msgstr "Aggiungi account utente" + +#~ msgid "Remove User Account" +#~ msgstr "Rimuovi account utente" + +#~ msgid "Login Options" +#~ msgstr "Opzioni di accesso" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Esiste già un utente con nome «%s»." diff -Nru gnome-control-center-3.20.2/po/ka.po gnome-control-center-3.22.1/po/ka.po --- gnome-control-center-3.20.2/po/ka.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ka.po 2016-08-12 12:43:57.000000000 +0000 @@ -6,38 +6,6 @@ # Zviad Sulaberidze , 2006. # Vladimer Sichinava ვლადიმერ სიჭინავა , 2007. # Vladimer Sichinava , 2008. -# Vladimer Sichinava , 2008. -# Vladimer Sichinava , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. -# Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. # Vladimer Sichinava ვლადიმერ სიჭინავა , 2008. msgid "" msgstr "" @@ -48,6 +16,7 @@ "Last-Translator: Vladimer Sichinava ვლადიმერ სიჭინავა \n" "Language-Team: Georgian \n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/kk.po gnome-control-center-3.22.1/po/kk.po --- gnome-control-center-3.20.2/po/kk.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/kk.po 2016-09-27 12:37:36.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 20:42+0000\n" -"PO-Revision-Date: 2016-03-18 08:59+0500\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-09 21:12+0500\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" "Language: kk\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.9\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -89,7 +89,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Үй" @@ -105,25 +105,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -154,16 +153,17 @@ msgid "Current background" msgstr "Ағымдағы фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Фон суретін түсқағазға немесе фотосуретке алмастырыңыз" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Түсқағаз;Экран;Жұмыс үстелі;" @@ -203,19 +203,18 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Bluetooth іске қосу үшін ұшақтағы режимді сөндіріңіз." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "" "Bluetooth-ды іске қосыңыз не сөндіріңіз және құрылғыларды байланыстырыңыз" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "бөлісу;bluetooth;obex;" @@ -384,7 +383,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Барлық файлдар" @@ -424,7 +423,7 @@ msgstr "Профильді сақтау" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Сақтау" @@ -682,7 +681,7 @@ "туралы ақпаратты қолдана аласыз." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Қорытынды" @@ -694,11 +693,11 @@ msgid "_Import File…" msgstr "Файлды _импорттау…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "Қ_осу" @@ -848,11 +847,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Түс" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -860,7 +860,7 @@ "калибрациялаңыз" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Түс;ICC;Профиль;Калибрациялау;Принтер;Экран;" @@ -878,23 +878,23 @@ msgid "No languages found" msgstr "Тілдер табылмады" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Бүгін" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Кеше" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b, %Y" @@ -1014,8 +1014,9 @@ msgid "December" msgstr "Желтоқсан" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Күн және уақыт" @@ -1072,12 +1073,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Күн мен уақытты (уақыт белдеуімен қоса) өзгерту" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Сағат;Уақыт_белдеуі;Орналасу;" @@ -1089,207 +1090,222 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Уақыт немесе күн баптауларын өзгерту үшін аутентификация керек." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Қақпағы жабық" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Айналы" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Біріншілік" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Сөнд." -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Екіншілік" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Топталған экрандарды реттеу" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "Іске _асыру" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Экрандарды реттеу үшін оларды тартып жылжытыңыз" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Гц (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Гц" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Сағат тілі бағытына қарсы 90°-қа бұру" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "180°-қа бұру" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Сағат тілі бойымен 90°-қа бұру" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Өлшемі" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Жақтар арақатынасы" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Ажыратылымдығы" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Теледидар үшін баптау" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Жаңарту жиілігі" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Жоғарғы панельді және белсенділік көрінісін бұл экранда көрсету" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Екіншілік экран" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Бұл экранды көбірек жұмыс орнын жасау үшін басқа экранмен біріктіру" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Презентация" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Тек слайдшоулар және медианы көрсету" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Айналы" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Бар болып тұрған көріністі екі экранда бірдей көрсету" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Сөндіру" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Бұл экранды қолданбау" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Экран ақпаратын алу мүмкін емес" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Топталған экрандарды р_еттеу" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Экрандар" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Экран­дар" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Жалғанған мониторлар мен проекторларды қолдану тәсілін таңдаңыз" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Панель;Проектор;xrandr;Экран;Ажыратылымдығы;Жаңарту;Монитор;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Белгісіз" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-бит (Жинақ ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-бит (Жинақ ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-бит" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-бит" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Не істеуді сұрау" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ешнәрсе жасамау" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Буманы ашу" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Басқа тасушылар" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Аудио CD үшін қолданбаны таңдаңыз" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Видео DVD үшін қолданбаны таңдаңыз" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Музыкалық плеері салынған кезде жөнелтілетін қолданбаны таңдаңыз" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Камера байланысқан кезде жөнелтілетін қолданбаны таңдаңыз" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "БҚ CD дискілері үшін қолданбаны таңдаңыз" @@ -1298,88 +1314,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "аудио DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Таза Blu-Ray дискі" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Таза CD-R дискі" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Таза DVD+R дискі" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Таза HD DVD дискі" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray видео дискі" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "электронды кітаптарды оқу құрылғысы" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD видео дискі" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows БҚ" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Санат" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Шолу" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Үнсіз келісім қолданбалары" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Ауыстырмалы тасушылар" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Нұсқасы %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Көбірек білу" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "Көбі­рек білу" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Жүйеңіз туралы ақпаратты қараңыз" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1553,8 +1567,9 @@ msgid "Launch help browser" msgstr "Көмек шолушысын жөнелту" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Баптаулар" @@ -1627,7 +1642,6 @@ msgstr "Блоктау экраны" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Арнайы мүмкіндіктер" @@ -1663,11 +1677,21 @@ msgid "High contrast on or off" msgstr "Жоғары контраст іске қосулы/сөндірулі" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Таңдауыңызша жарлықтар" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1694,119 +1718,125 @@ msgid "Modifiers-only switch to next source" msgstr "Түрлендіргіш пернесі келесі кіріс көзіне ауыстырады" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Пернетақта" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Жарлықты бастапқы мәніне тастау" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s жарлығы %s үшін қолданылуда болып тұр. Оны алмастырсаңыз, %s " +"сөндірілетін болады" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Таңдауыңызша жарлықты орнату" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Жарлықты орнату" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "%s өзгерту үшін жаңа жарлықты енгізіңіз." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Таңдауыңызша жарлықты қосу" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Перне­тақта" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Пернетақта жарлықтарын қарау және өзгерту, теру баптауларын орнату" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Жарлық;Қайталау;Жыпылықтау;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Таңдауыңызша жарлық" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Аты:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "К_оманда:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Жарлықты қосу" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Жарлықты өшіру" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Жарлықты түзету үшін, оның жолын таңдап, жаңа пернелерді басыңыз немесе " -"тазарту үшін Backspace басыңыз." +msgid "No keyboard shortcut found" +msgstr "Пернетақта жарлықтары табылмады" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Таңдауыңызша жарлықтар" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Басқа сөздерді іздеп көріңіз" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Белгісіз әрекет>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Бас тарту үшін Esc басыңыз." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"\"%s\" жарлығын қолдану мүмкін емес, өйткені бұл пернемен теру мүмкін емес " -"болады.\n" -"Онымен бірге бір уақытта Control, Alt не Shift басып көріңіз." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Аты" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"\"%s\" жарлығы келесі үшін қолданылуда:\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Команда" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Жарлық" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Түзету" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Егер сіз жарлық мәнін \"%s\" етіп орнатсағыз, онда \"%s\" жарлығы " -"сөндірілетін болады." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ешнәрсе" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Қа_йта тағайындау" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Өшіру" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Жаңа пернетақта жарлығын енгізіңіз" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"\"%s\" жарлығында сәйкестелген \"%s\" жарлығы бар. Оны автоматты түрде \"%s" -"\" етіп орнату керек пе?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Болдырмау" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" қазір \"%s\" жарлығымен сәйкестелген, жалғастырсаңыз, бұл жарлық " -"сөндірілетін болады." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Қосу" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "Т_ағайындау" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Алмастыру" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Орнату" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Ба_птауларды тексеру" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Тышқан және тачпад" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Тышқан және тач­пад" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1814,7 +1844,7 @@ "көрсетіңіз" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Трекпад;Курсор;Шерту;Тию;Қос;Батырма;Трекбол;Скролл;Айналдыру;" @@ -1872,6 +1902,10 @@ msgstr "Шерту үшін тию" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Қос саусақпен айналдыру" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Бұрышпен айналдыру" @@ -1910,11 +1944,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Ұ_шақтағы режимі" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Желілік прокси" @@ -1922,17 +1956,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Қап, бірнәрсе қате кетті. БҚ өндірушісіне хабарласыңыз." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager орындалып тұруы тиіс." @@ -1948,7 +1982,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1965,238 +1999,243 @@ msgid "page 2" msgstr "бет 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Қауіпсіздік" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "автоматты" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Профиль %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Кәсіпорын" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Жоқ" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Ешқашан" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i күн бұрын" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Мб/с" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Жоқ" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Әлсіз" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "ОК" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Жақсы" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Тамаша" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Көбірек білу" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Идентификация" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Адрес" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Желі маскасы" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Шлюз" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Адресті өшіру" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Қосу" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Сервер" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS серверін өшіру" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Метрика" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Маршрутты өшіру" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Автоматты түрде (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Қолмен" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Тек жергілікті желі үшін" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Префикс" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Автоматты түрде" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Автоматты түрде, тек DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Тастау" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ешнәрсе" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 биттік кілті (Hex не ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 биттік кілттік фразасы" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Динамикалық WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2211,30 +2250,30 @@ msgstr "Деректерді өткізу жылдамдығы" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 адресі" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 адресі" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Құрылғы адресі" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2244,7 +2283,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2327,13 +2366,13 @@ msgid "Firewall _Zone" msgstr "Файрволл _зонасы" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Бастапқы" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Зона байланыстың сенімділік деңгейін анықтайды" @@ -2375,45 +2414,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Байланыстар түзеткішін ашу мүмкін емес" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Жаңа профиль" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Агрегацияланған (Bond)" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Агрегацияланған (Team)" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Көпір" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "VPN плагиндерін жүктеу мүмкін емес" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Файлдан импорттау..." -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Желілік байланысты қосу" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "VPN қосу" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2421,7 +2440,7 @@ msgstr "_Тастау" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "Ұ_мыту" @@ -2446,11 +2465,11 @@ msgid "S_ecurity" msgstr "Қауі_псіздік" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "VPN байланысын импорттау мүмкін емес" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2463,36 +2482,36 @@ "\n" "Қате: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Импорттау үшін файлды таңдаңыз" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "А_шу" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "\"%s\" аты бар файл бар болып тұр." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "А_лмастыру" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "%s орнына сіз сақтаймын деген VPN байланысын сақтау керек пе?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "VPN байланысын экспорттау мүмкін емес" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2503,7 +2522,7 @@ "\n" "Қате: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN байланысын экспорттау" @@ -2530,60 +2549,45 @@ msgid "Make available to _other users" msgstr "Басқа па_йдаланушыларға қолжетерлік қылу" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Желі" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Же­лі" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Интернетке қалай байланысатыныңызды басқару" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Желі;Сымсыз;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Кеңжолақты;Модем;Bluetooth;vpn;vlan;" -"bridge;bond;DNS;" +"Желі;Сымсыз;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Кеңжолақты;Модем;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Агрегацияланған байланыс слейвтері (Bond)" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ешнәрсе)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Желілік көпір слейвтері" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ешқашан" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "бүгін" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "кеше" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP адресі" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Соңғы қолданылған" @@ -2593,34 +2597,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Сымды" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Опциялар…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Профиль %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Жаңа байланысты қосу" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Агрегацияланған байланыс слейвтері (Team)" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2629,14 +2624,14 @@ "байланыспен басқа пайдаланушылармен бөлісу үшін, сымсыз қатынау нүктесін " "жасауға болады." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Сымсыз қатынау нүктесін іске қосу нәтижесінде %s желісіне байланыс " "үзіледі." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2644,23 +2639,23 @@ "Бұл сымсыз қатынау нүктесі белсенді болып тұрған кезде, сымсыз байланысыңыз " "арқылы Интернетке қатынау мүмкін емес." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Қатынау нүктесін тоқтатып, барлық пайдаланушыларды үзу керек пе?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "Қа_тынау нүктесін тоқтату" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Қатынау нүктесі ретінде қолдануды жүйелік саясат рұқсат етпейді" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Сымсыз құрылғы қатынау нүкте режимін қолдамайды" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2668,11 +2663,11 @@ "Таңдалған желілер үшін желі ақпараты, парольдер және таңдауыңызша жасалған " "баптаулар жоғалатын болады." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Тарихы" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2680,7 +2675,7 @@ msgstr "Жа_бу" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "Ұ_мыту" @@ -2716,6 +2711,10 @@ msgid "Provider" msgstr "Провайдер" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Желі" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2821,16 +2820,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Пароль" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ешнәрсе" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Пар_ольді көрсету" @@ -2923,7 +2918,6 @@ msgstr "Жасырын желісіне байланы_су…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Тарихы" @@ -2945,360 +2939,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Пароль" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Инфраструктура" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Қалып-күйі белгісіз" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Басқарылмайтын" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Қолжетерсіз" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Қосылуда" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Аутентификация керек" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Байланысқан" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Байланысты үзу" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Байланыс орнату сәтсіз" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Қалып-күйі белгісіз (жоқ болып тұр)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Байланыспаған" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Баптау сәтсіз" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP баптауы сәтсіз" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP баптауы ескірген" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Құпия кілттері сұралды, бірақ ұсынылмады" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x supplicant байланысы ажыратылған" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x supplicant баптауы сәтсіз" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x supplicant сәтсіз" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x supplicant аутентификация үшін тым көп уақыт алған" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP қызметі іске қосыла алмады" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP қызметі байланысты үзген" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP клиенті іске қосылу қатесі" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP клиент қатесі" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP клиенті сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Ортақ етілген байланыс қызметінің іске қосылу қатесі" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Ортақ етілген байланыс қызметі сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP қызметінің іске қосылу қатесі" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP қызметінің қатесі" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP қызметі сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Арна бос емес" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Арнада гудок жоқ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Тасушыны орнату мүмкін емес" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Қоңырауға бөлінген уақыт аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Қоңырау соғу сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Модемді іске қосу сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Көрсетілген APN таңдау сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Желілерді іздемеу" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Желіге тіркелу тайдырылған" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Желіге тіркелудің мерзімі біткен" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Сұралған желіге тіркелу сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN кодын тексеру сәтсіз" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Құрылғы үшін бинарлық кодтар жоқ болуы мүмкін" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Байланыс жоғалды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Бар болып тұрған байланыс алынды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Модем табылмады" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth байланысы сәтсіз аяқталды" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM картасы салынбаған" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM Pin коды керек" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM Puk коды керек" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM қате" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand құрылғысы байланысқан күйін қолдамайды" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Байланыс тәуелділігі сәтсіз аяқталды" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Бинарлы кодтары жоқ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Кабель ажыратылған" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Сертификаттау орталығының (CA) сертификаты таңдалмады" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "файл таңдалмады" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Сертификаттау орталығының (CA) сертификатын қолданбау қауіпсіздік " -"мәселелеріне әкеп соғуы мүмкін. Сертификаттау орталығының сертификатын " -"таңдауды қалайсыз ба?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Елемеу" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "СО сертификатын таңдаңыз" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, не PKCS#12 жеке кілттері (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "eap-method файлын растаудағы анықталмаған қате" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, не PKCS#12 жеке кілттері (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER не PEM сертификаттары (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "EAP-FAST PAC файлы жоқ" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "PAC файлын таңдаңыз" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC файлдары (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _файлы" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Ішкі _аутентификация" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC ини_циализациясы" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3307,41 +3277,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Анонимды" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Аутентификациядан өткен" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Екеуі де" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _файлы" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Ішкі _аутентификация" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Автоматты PAC ұсы_нуды рұқсат ету" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "EAP-LEAP пайдаланушы аты жоқ" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "EAP-LEAP паролі жоқ" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Па_йдаланушы аты" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Пар_ольді көрсету" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "жарамсыз EAP-PEAP CA сертификаты: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "жарамсыз EAP-PEAP CA сертификаты: сертификат көрсетілмеген" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Сертификаттау орталығының сертификатын таңдаңыз" @@ -3359,19 +3361,56 @@ msgid "C_A certificate" msgstr "С_О сертификаты" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "СО сертификаты _керек емес" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _нұсқасы" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Әр р_ет парольді сұрап отыру" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "EAP пайдаланушы аты жоқ" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "EAP паролі жоқ" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "жарамсыз EAP-TLS CA сертификаты: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "жарамсыз EAP-TLS CA сертификаты: сертификат көрсетілмеген" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "жарамсыз EAP-TLS паролі: жоқ болып тұр" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Шифрленбеген жеке кілттері қауіпсіз емес болады" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3385,11 +3424,11 @@ "\n" "(Сіз жеке кілтіңізді openssl көмегімен парольмен қорғай аласыз)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Жеке сертификатыңызды таңдаңыз" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Жеке кілтіңізді таңдаңыз" @@ -3401,51 +3440,56 @@ msgid "_User certificate" msgstr "Па_йдаланушы сертификаты" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Жеке _кілт" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Жеке _кілт паролі" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "жарамсыз EAP-TTLS CA сертификаты: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "жарамсыз EAP-TTLS CA сертификаты: сертификат көрсетілмеген" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Мені келесіде е_скертпеу" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Жоқ" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Иә" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Туннельденген TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Қорғалған EAP (PEAP)" @@ -3455,6 +3499,44 @@ msgid "Au_thentication" msgstr "Аутен_тификация" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "leap-username жоқ" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "leap-password жоқ" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "wep-key жоқ" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "жарамсыз wep-key: кілттік фраза бос емес болуы тиіс" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "жарамсыз wep-key: кілттік фраза 64 таңбадан аз болуы тиіс" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Бастапқы)" @@ -3491,19 +3573,30 @@ msgid "WEP inde_x" msgstr "WEP и_ндексі" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "Тү_рі" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Іске қосулы" @@ -3540,16 +3633,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Блоктау экранында хабарлама құра_масын көрсету" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Хабарламалар" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Ха­бар­ла­ма­лар" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Қай хабарламалар және олар не көрсетінін басқару" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Хабарлаулар;Баннер;Хабарлама;Трей;Қалқымалы;" @@ -3567,81 +3661,70 @@ msgid "Applications" msgstr "Қолданбалар" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Басқа" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Тіркелгіні қосу" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Эл. пошта" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Күнтізбе" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Контакттар" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Чат" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ресурстар" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Тіркелгіге кіру сәтсіз ақталды" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Кіру ақпараты ескірген." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Бұл тіркелгіні іске қосу үшін кіріңіз." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Кіру" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Тіркелгіні жасау қатесі" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Тіркелгіні өшіру қатесі" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Тіркелгіні өшіруді шынымен қалайсыз ба?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Бұл әрекет нәтижесінде тіркелгі серверден өшірілмейді." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "Ө_шіру" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Желілік тіркелгілер" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Желі­лік тір­кел­гі­лер" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Желілік тіркелгілеріңізге байланыс орнатыңыз және олар не үшін " "қолданылатынын шешіңіз" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3654,6 +3737,7 @@ msgstr "Желілік тіркелгілер бапталмады" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Тіркелгіні өшіру" @@ -3792,7 +3876,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Батарея" @@ -3840,103 +3924,104 @@ msgid "When _idle" msgstr "І_ссіз кезінде" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Эл. қорегін сақтау" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Э_кран жарықтылығы" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Автоматты жарықтылық" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Пер_нетақта жарықтылығы" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Белсенді емес экранды бәсең_дету" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Экранды _тазарту" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Эл. қорегін үнемдеу үшін Wi-Fi сөндіріңіз." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Мобильді кеңжолақты" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Эл. қорегін үнемдеу үшін сымсыз кеңжолақты құрылғыларды (3G, 4G, LTE, т.б.) " "сөндіріңіз." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Батареядан жұмыс істеген кезде" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Эл. желісінде" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Ұйықтату" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Гибернация" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ешнәрсе" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Ұйықтату және сөндіру батырмасы" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Автоматты түрде ұйықтату" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Автоматты түрде ұйықтату" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Қ_орек батырмасы басылған кезде" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Құрылғылар" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Эл. қорегі" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Эл. қо­регі" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Батарея қалып-күйін және эл. қорегін сақтауды баптау" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4015,11 +4100,6 @@ msgid "Delay" msgstr "Кідіріс" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Болдырмау" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Аутентификация" @@ -4029,153 +4109,153 @@ msgstr "Аутентификация керек" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Тонер аз" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Тонер жоқ" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Айқындауышы аз" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Айқындауышы бітті" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Тонер бітіп жатыр" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Тонер бітті" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Қақпағы ашық" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Есігі ашық" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Қағазы аз" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Қағаз бітті" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Желіде емес" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Тоқтатылды" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Қоқысты қабылдағыш толуға жақын" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Қоқысты қабылдағыш толып қалды" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Фоторезист жақында жарамсыз болып қалады" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Фоторезист жұмыс істемейді" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Баптау" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Дайын" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Тапрсырмаларды қабылдамайды" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Өңдеуде" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Тонер деңгейі" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Сия деңгейі" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Жаратылатын заттар деңгейі" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Орнатылуда" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u белсенді" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Жаңа принтерді қосу сәтсіз аяқталды" -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "PPD айлын таңдаңыз" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4183,50 +4263,47 @@ "PostScript принтер сипаттау файлдары (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Сәйкес келетін драйвер табылмады" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Таңдаулы драйверлерді іздеу…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Дерекқордан таңдау..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "PPD файлын ұсыну..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Сынау парағы" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Принтерлер жоқ" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "ui жүктеу мүмкін емес: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Принтерлер" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Прин­тер­лер" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Принтерлерді қосу, принтер тапсырмаларын қарау және баспаға шығарылатын " "нәрсені таңдау" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Принтер;Кезек;Баспаға шығару;Қағаз;Сия;Тонер;" @@ -4388,6 +4465,11 @@ msgid "Parallel Port" msgstr "Параллельді порт" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4600,13 +4682,17 @@ msgid "_Options" msgstr "_Опциялар" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Принтерлер жоқ" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Принтерді қосу" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4614,70 +4700,70 @@ "Кешіріңіз! Жүйелік баспаға шығару қызметі\n" "қолжетерлік емес сияқты." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Экранды блоктау" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Қолдануда" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Іске қосулы" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Сөндірулі" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Орналасулар қызметі" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Қолдану тарихы" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Қоқыс шелегінен барлық нәрсені өшіру керек пе?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Қоқыс шелегінен барлық нәрселер толығымен өшіріледі." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Қоқыс шел_егін тазарту" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Барлық уақытша файлдарды өшіру керек пе?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Барлық уақытша файлдар толығымен өшіріледі." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Уақытша файлдарды _тазарту" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Қоқыс шелегін және уақытша файлдарды тазарту" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Бағд. қамтама қолдану" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Мәселелерді хабарлау" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4687,20 +4773,21 @@ "көмектеседі. Хабарламалар анонимды түрде жіберіледі және олардан жеке " "деректер кетіріледі." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Жекелік саясаты" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Жекелік" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Жеке­лік" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Жеке ақпаратыңызды қорғаңыз және басқалар не көре алатынын басқарыңыз" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4872,21 +4959,21 @@ msgid "Other" msgstr "Басқа" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Өзгерістер іске асуы үшін сессияңызды қайта бастау керек" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Қазір қайта қосу" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Кіріс қайнар көзді таңдалмады" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Жүйеге кіру _экраны" @@ -4918,18 +5005,19 @@ msgid "Paper" msgstr "Қағаз" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Аймақ пен тіл" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Ай­мақ пен тіл" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Экран тілін, пішімдерін, пернетақта жаймаларын және қайнар көздерін таңдаңыз" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Тіл;Жайма;Пернетақта;Енгізу;" @@ -4986,7 +5074,7 @@ msgstr "Сол+Оң жақ Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Тіл" @@ -5036,26 +5124,11 @@ "Жүйеге кіру баптаулары осы жүйеге кіретін барлық пайдаланушылармен " "қолданылады" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Орындар" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Бетбелгілер" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Басқа" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Орналасуды таңдау" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_ОК" @@ -5063,17 +5136,18 @@ msgid "No applications found" msgstr "Қолданбалар табылмады" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Іздеу" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "Көріністе қай қолданбалар іздеу нәтижелерін көрсететінінді басқарыңыз" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Іздеу;Табу;Индекс;Жасыру;Жекелік;Нәтижелер;" @@ -5081,6 +5155,18 @@ msgid "Search Locations" msgstr "Іздеу орналасулары" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Орындар" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Бетбелгілер" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Басқа" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Жоғары жылжыту" @@ -5093,6 +5179,11 @@ msgid "Preferences" msgstr "Баптаулар" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Бөлісу үшін желілер таңдалмады" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5118,21 +5209,55 @@ msgid "Choose a Folder" msgstr "Буманы таңдау" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Жеке файлдармен бөлісу көмегімен ағымдағы желіде сіздің Ортақ бумаңызды " +"келесі адрес арқылы бөлісе аласыз: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Қашықтан байланысу іске қосылған болса, қашықтағы пайдаланушылар Secure " +"Shell\n" +"командасы көмегімен байланыса алады:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Экранмен бөлісу көмегімен қашықтағы пайдаланушылар vnc://%s адресіне байланысу арқылы экраныңызды қарай не басқара алады." + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Көшіру" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Бөлісу" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Бө­лі­су" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Басқалармен немен бөлісуді таңдау" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5140,33 +5265,25 @@ "бөлісу;ssh;торап;аты;қашықтағы;жұмыс үстелі;медиа;аудио;видео;суреттер;" "фотолар;кинолар;сервер;өндегіш;" -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 -msgid "Enable or disable remote login" -msgstr "Қашықтан кіруді іске қосу немесе сөндіру" - -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 -msgid "Authentication is required to enable or disable remote login" -msgstr "Қашықтан кіруді іске қосу немесе сөндіру үшін аутентификация керек" - -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Бөлісу үшін желілер таңдалмады" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. #: ../panels/sharing/networks.ui.h:1 msgid "Networks" msgstr "Желілер" +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 +msgid "Enable or disable remote login" +msgstr "Қашықтан кіруді іске қосу немесе сөндіру" + +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 +msgid "Authentication is required to enable or disable remote login" +msgstr "Қашықтан кіруді іске қосу немесе сөндіру үшін аутентификация керек" + #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Компьютер аты" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Жеке файлдармен бөлісу" +msgid "_File Sharing" +msgstr "_Файлдармен бөлісу" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5185,85 +5302,54 @@ msgstr "Желі болмаған соң кейбір қызметтер сөндірілген" #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Жеке файлдармен бөлісу" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Жеке файлдармен бөлісу көмегімен ағымдағы желіде сіздің Ортақ бумаңызды " -"келесі адрес арқылы бөлісе аласыз: dav://%s" +msgid "File Sharing" +msgstr "Файлдармен бөлісу" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Парольді _талап ету" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Қашықтан кіру" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Қашықтағы пайдаланушыларға Secure Shell командасы көмегімен байланысуды " -"рұқсат ету:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Экранмен бөлісу" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Қашықтағы пайдаланушыларға экраныңызды қарау не басқаруды келесі адреске " -"байланысу арқылы рұқсат ету: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Қашықтан басқаруды рұқс_ат ету" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Бұл экранды басқаруға байланыстарды рұқс_ат ету" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Пароль:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Парольді көр_сету" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Қатынау баптаулары" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Жаңа байланыстар рұқсатты сұрау керек" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Парольді _талап ету" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Медиамен бөлісу" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Медиамен бөлісу көмегімен музыка, фотосуреттер және видеолармен желі арқылы " -"бөлісе аласыз." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Музыка, фотосуреттер және видеолармен желі арқылы бөлісу." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Бумалар" @@ -5389,11 +5475,6 @@ msgid "Peak detect" msgstr "Пиктер анықтағышы" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Аты" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Құрылғы" @@ -5488,16 +5569,21 @@ msgid "Subwoofer" msgstr "Сабвуфер" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Таңдауыңызша" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Ар­найы мүм­кін­дік­тер" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Көру, есту, теру, көрсету және шертуді жеңілдету" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5596,8 +5682,8 @@ msgstr "Дыбыс пернелері" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Num Lock немесе Caps Lock іске қосулы кезінде дыбыс беру." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Num Lock немесе Caps Lock іске қосулы/сөндірулі кезінде дыбыс беру." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5979,96 +6065,69 @@ msgstr "Түс эффектілері" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Пайдаланушыны қосу" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "То_лық аты" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Қалыпты" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Әкімші" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "То_лық аты" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Тіркелгі _түрі" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Пайдаланушы жүйеге келесі рет _кірген кезде оған парольді орнатуға рұқсат ету" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Парольді қ_азір орнату" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Растау" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "Ра_стау" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Кәсіпорындық кіру бар болып тұрған және орталықтан басқарылатын пайданушы " -"тіркелгісіне бұл құрылғыда қолданылуды мүмкін етеді." +"тіркелгісіне бұл құрылғыда қолданылуды мүмкін етеді. Сонымен қатар, сіз бұл " +"тіркелгіні кәсіпорынның интернеттегі ресурстарына қатынау үшін қолдана " +"аласыз." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "До_мен" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Кәсіпорындық кіру тіркелгілерін\n" -"қосу үшін желіге байланысыңыз." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Кәсіпорын тірк_елгісі" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Пайдаланушыны қосу" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "Тірк_еу" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Домен әкімшісінің логині" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Кәсіпорындық тіркелгілерін қолдану үшін, бұл компьютерді\n" -"доменге тіркеу керек. Желілік әкімші осы жерде домен паролін\n" -"енгізуі тиіс." +msgid "You are Offline" +msgstr "Сіз желіде емессіз" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Әкімші а_ты" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Кәсіпорындық пайдаланушыларын үшін желіге байланысыңыз." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Әкімші паролі" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Кәсіпорын тірк_елгісі" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6103,7 +6162,7 @@ msgstr "Оң жақ кішкентай саусақ" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Саусақ ізімен кіруді іске қосу" @@ -6140,9 +6199,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Кіру;Аты;Саусақ ізі;Аватар;Логотип;Бет;Пароль;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Жүйеге кіру тарихы" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "Тірк_еу" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Домен әкімшісінің логині" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Кәсіпорындық тіркелгілерін қолдану үшін, бұл компьютерді\n" +"доменге тіркеу керек. Желілік әкімші осы жерде домен паролін\n" +"енгізуі тиіс." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Әкімші а_ты" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Әкімші паролі" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6165,7 +6247,7 @@ msgstr "Ағымдағы па_роль" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" msgstr "" "Пайдаланушы жүйеге келесі рет кірген кезде оған парольді өзгертуге рұқсат ету" @@ -6173,31 +6255,23 @@ msgid "Set a password now" msgstr "Парольді қазір орнату" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Пайдаланушы тіркелгісін қосу" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Пайдаланушы тіркелгісін өшіру" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "Пайдаланушыны қ_осу…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Жүйеге кіру баптаулары" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "А_втокіру" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Са_усақ ізімен кіру" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Пайдаланушы таңбашасы" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Соңғы рет жүйеге кіру" @@ -6300,8 +6374,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Бас және кіші әріптерді араластырыңыз және бір-екі санды қолданыңыз." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Бас және кіші әріптерді араластырыңыз және бір-екі санды қолдануға тырысыңыз." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6392,32 +6467,32 @@ msgstr "Белгісіз қате" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Тіркелгіңізді ұсынушының веб адресіне сәйкес болуы тиіс." +msgid "Should match the web address of your login provider." +msgstr "Логинді ұсынушының веб адресіне сәйкес болуы тиіс." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Тіркелгіні қосу сәтсіз" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Парольдер өзара сәйкес келмейді." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Тіркелгіні тіркеу сәтсіз аяқталды" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Бұл доменде аутентификациялаудың қолдауы бар тәсілдері жоқ" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Доменде тіркелу сәтсіз" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6425,7 +6500,7 @@ "Бұл логин жасамады.\n" "Қайталап көріңіз." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6433,14 +6508,24 @@ "Бұл логин паролі жасамады.\n" "Қайталап көріңіз." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Доменге кіру сәтсіз" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Доменді табу мүмкін емес. Оны дұрыс көрсеттіңіз бе?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Қалыпты" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Әкімші" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6459,15 +6544,15 @@ msgid "Enabled" msgstr "Іске қосулы" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Тіркелген саусақ іздерін өшіру керек пе?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "Саусақ іздерін ө_шіру" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6475,15 +6560,15 @@ "Тіркелген саусақтар іздерін өшіріп, саусақ ізі арқылы жүйеге кіруді сөндіру " "керек пе?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Дайын!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "'%s' құрылғысына қатынау мүмкін емес" @@ -6491,16 +6576,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "'%s' құрылғысында саусақ ізін түсіруді бастау мүмкін емес" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Бірде-бір саусақ ізін оқу құрылғысына қатынау мүмкін емес" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Көмек үшін жүйелік әкімшіңізге хабарласыңыз." @@ -6509,7 +6594,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6518,11 +6603,11 @@ "Саусақ ізі арқылы кіруді іске қосу үшін, сізге '%s' құрылғысын қолданып, бір " "не бірнеше саусақ іздерін сақтау керек." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Саусақты таңдау" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Саусақ ізін тіркеу" @@ -6576,14 +6661,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Сессия аяқталды" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Сессия басталды" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Тіркелгі белсенділігі" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Басқа парольді таңдаңыз." @@ -6645,7 +6737,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "%s доменіне байланысу мүмкін емес: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Басқа тіркелгілер" @@ -6725,15 +6817,15 @@ msgid "Logged in" msgstr "Жүйеге кіріп тұр" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Тіркелгілер қызметімен байланыс орнату қатесі" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "AccountService орнатылған және іске қосылғанына көз жеткізіңіз." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6741,12 +6833,12 @@ "Өзгерістерді жасау үшін,\n" "алдымен * таңбашасына шертіңіз" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Пайдаланушы тіркелгісін жасау" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6754,12 +6846,12 @@ "Пайдаланушы тіркелгісін жасау үшін,\n" "алдымен * таңбашасына шертіңіз" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Таңдалған пайдаланушы тіркелгісін өшіру" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6767,33 +6859,32 @@ "Таңдалған пайдаланушы тіркелгісін өшіру үшін,\n" "алдымен * таңбашасына шертіңіз" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Менің тіркелгім" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Пайдаланушы аты '%s' болып тұрған пайдаланушы бар болып тұр." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Кешіріңіз, бұл пайдаланушы аты қолжетерсіз. Басқасын көріңіз." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Пайдаланушы аты тым ұзын." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Пайдаланушы аты '-' таңбасынан басталмауы тиіс." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Пайдаланушы атында тек ағылшын әліппесінің әріптері, сандар, '.', '-' және " -"'_' таңбаларының кез-келгені болуы мүмкін." +"Пайдаланушы атында тек ағылшын әліппесінің a-z арасындағы бас/кіші әріптері, " +"сандар, және келесі таңбалар болуы мүмкін: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Бұл сіздің үй бумаңыздың аты ретінде қолданылады, және оны кейін өзгертуге " @@ -6885,19 +6976,19 @@ msgid "Button" msgstr "Батырма" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom планшеті" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa­com план­шеті" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Графикалық планшеттер үшін батырмалар сәйкестіктерін және стилус " "сезімталдылығын баптау" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Планшет;Wacom;Стилус;Өшіргіш;Тышқан;" @@ -6929,6 +7020,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth баптаулары" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom планшеті" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Экранға бейнелеу…" @@ -7022,22 +7117,22 @@ msgid "Mode Switch #%d" msgstr "Режимді ауыстырғыш #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Сол жақ батырма #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Оң жақ батырма #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Жоғарғы батырма #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Төменгі батырма #%d" @@ -7114,6 +7209,11 @@ msgid "Tip Pressure Feel" msgstr "Қалам басуының сезімталдылығы" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Барлық баптаулар" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME басқару орталығы" @@ -7170,22 +7270,18 @@ msgid "Quit" msgstr "Шығу" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Барлық баптаулар" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Жеке" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Құрылғылар" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Жүйелік" @@ -7224,6 +7320,196 @@ msgid "Cancel search" msgstr "Іздеуді тоқтату" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Қатынау нүктесі" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "%s үшін пернетақта жарлығы. Өзгерту үшін жаңа жарлықты енгізіңіз." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Жарлықты түзету үшін, оның жолын таңдап, жаңа пернелерді басыңыз немесе " +#~ "тазарту үшін Backspace басыңыз." + +#~ msgid "_Name:" +#~ msgstr "_Аты:" + +#~ msgid "Add Shortcut" +#~ msgstr "Жарлықты қосу" + +#~ msgid "Remove Shortcut" +#~ msgstr "Жарлықты өшіру" + +#~ msgid "" +#~ msgstr "<Белгісіз әрекет>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "\"%s\" жарлығын қолдану мүмкін емес, өйткені бұл пернемен теру мүмкін " +#~ "емес болады.\n" +#~ "Онымен бірге бір уақытта Control, Alt не Shift басып көріңіз." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "\"%s\" жарлығы келесі үшін қолданылуда:\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Егер сіз жарлық мәнін \"%s\" етіп орнатсағыз, онда \"%s\" жарлығы " +#~ "сөндірілетін болады." + +#~ msgid "_Reassign" +#~ msgstr "Қа_йта тағайындау" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "\"%s\" жарлығында сәйкестелген \"%s\" жарлығы бар. Оны автоматты түрде " +#~ "\"%s\" етіп орнату керек пе?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" қазір \"%s\" жарлығымен сәйкестелген, жалғастырсаңыз, бұл жарлық " +#~ "сөндірілетін болады." + +#~ msgid "_Assign" +#~ msgstr "Т_ағайындау" + +#~ msgid "Add Network Connection" +#~ msgstr "Желілік байланысты қосу" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Сертификаттау орталығының (CA) сертификаты таңдалмады" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Сертификаттау орталығының (CA) сертификатын қолданбау қауіпсіздік " +#~ "мәселелеріне әкеп соғуы мүмкін. Сертификаттау орталығының сертификатын " +#~ "таңдауды қалайсыз ба?" + +#~ msgid "Ignore" +#~ msgstr "Елемеу" + +#~ msgid "Choose CA Certificate" +#~ msgstr "СО сертификатын таңдаңыз" + +#~ msgid "As_k for this password every time" +#~ msgstr "Әр р_ет парольді сұрап отыру" + +#~ msgid "Don't _warn me again" +#~ msgstr "Мені келесіде е_скертпеу" + +#~ msgid "No" +#~ msgstr "Жоқ" + +#~ msgid "Yes" +#~ msgstr "Иә" + +#~ msgid "Error logging into the account" +#~ msgstr "Тіркелгіге кіру сәтсіз ақталды" + +#~ msgid "Credentials have expired." +#~ msgstr "Кіру ақпараты ескірген." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Бұл тіркелгіні іске қосу үшін кіріңіз." + +#~ msgid "_Sign In" +#~ msgstr "_Кіру" + +#~ msgid "Personal File Sharing" +#~ msgstr "Жеке файлдармен бөлісу" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Қашықтан басқаруды рұқс_ат ету" + +#~ msgid "Login History" +#~ msgstr "Жүйеге кіру тарихы" + +#~ msgid "Add User Account" +#~ msgstr "Пайдаланушы тіркелгісін қосу" + +#~ msgid "Remove User Account" +#~ msgstr "Пайдаланушы тіркелгісін өшіру" + +#~ msgid "Welcome to the Control Center" +#~ msgstr "Басқару орталығына қош келдіңіз" + +#~ msgid "Select a panel in the sidelist to see the available options" +#~ msgstr "Қолжетерлік опцияларды қарау үшін бүйір тізімнен панельді таңдаңыз" + +#~ msgid "Bond" +#~ msgstr "Агрегацияланған (Bond)" + +#~ msgid "Team" +#~ msgstr "Агрегацияланған (Team)" + +#~ msgid "Bridge" +#~ msgstr "Көпір" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "VPN плагиндерін жүктеу мүмкін емес" + +#~ msgid "Bond slaves" +#~ msgstr "Агрегацияланған байланыс слейвтері (Bond)" + +#~ msgid "(none)" +#~ msgstr "(ешнәрсе)" + +#~ msgid "Bridge slaves" +#~ msgstr "Желілік көпір слейвтері" + +#~ msgid "Team slaves" +#~ msgstr "Агрегацияланған байланыс слейвтері (Team)" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand құрылғысы байланысқан күйін қолдамайды" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Басқа" + +#~ msgid "_Verify" +#~ msgstr "_Растау" + +#~ msgid "Login Options" +#~ msgstr "Жүйеге кіру баптаулары" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Пайдаланушы аты '%s' болып тұрған пайдаланушы бар болып тұр." + +#~ msgid "Color" +#~ msgstr "Түс" + +#~ msgid "Power" +#~ msgstr "Эл. қорегі" + +#~ msgid "Privacy" +#~ msgstr "Жекелік" + #~ msgid "Used to determine your geographical location" #~ msgstr "Географиялық орналасуыңызды анықтау үшін қолданылады" @@ -7233,9 +7519,6 @@ #~ msgid "Time _Zone" #~ msgstr "Уақыт _белдеуі" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Қос саусақпен айналдыру" - #~ msgid "Active Jobs" #~ msgstr "Белсенді тапсырмалар" @@ -7868,9 +8151,6 @@ #~ msgid "The current password is not correct" #~ msgstr "Ағымдағы пароль дұрыс көрсетілмеді" -#~ msgid "Wrong password" -#~ msgstr "Пароль қате" - #~ msgid "Action" #~ msgstr "Әрекет" @@ -7960,10 +8240,6 @@ #~ msgid "C_reate..." #~ msgstr "Жаса_у..." -#, fuzzy -#~ msgid "_Configure..." -#~ msgstr "Баптау" - #~| msgid "Hinting" #~ msgid "_Disconnect" #~ msgstr "Б_айланысты үзу" @@ -8122,9 +8398,6 @@ #~ msgid "Acti_on:" #~ msgstr "Әре_кет:" -#~ msgid "Shortcut" -#~ msgstr "Жарлық" - #~ msgid "_Right-handed" #~ msgstr "_Оңақай" diff -Nru gnome-control-center-3.20.2/po/km.po gnome-control-center-3.22.1/po/km.po --- gnome-control-center-3.20.2/po/km.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/km.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,7 +12,7 @@ "PO-Revision-Date: 2012-04-19 02:15+0000\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" -"Language: \n" +"Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/ko.po gnome-control-center-3.22.1/po/ko.po --- gnome-control-center-3.20.2/po/ko.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ko.po 2016-09-27 12:37:36.000000000 +0000 @@ -29,11 +29,11 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-18 20:43+0000\n" -"PO-Revision-Date: 2016-03-19 11:07+0900\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-10 00:49+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" -"Language: Korean\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -110,7 +110,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "내 폴더" @@ -125,25 +125,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -174,16 +173,17 @@ msgid "Current background" msgstr "현재 배경" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "배경" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "배경을 그림이나 사진으로 바꿉니다" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;배경;Screen;화면;Desktop;바탕 화면;" @@ -223,18 +223,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "블루투스를 사용하려면 비행 모드 스위치를 끄십시오." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "블루투스" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "블루투스를 켜거나 끄고 블루투스 장치에 연결합니다" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;공유;bluetooth;블루투스;obex;" @@ -403,7 +402,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "모든 파일" @@ -442,7 +441,7 @@ msgstr "프로파일 저장" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "저장(_S)" @@ -698,7 +697,7 @@ "법 안내를 읽어보면 도움이 됩니다." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "요약" @@ -710,11 +709,11 @@ msgid "_Import File…" msgstr "파일 가져오기(_I)…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "추가(_A)" @@ -862,17 +861,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "색" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "디스플레이, 카메라, 프린터같은 장치의 색을 보정합니다" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "Color;색;ICC;Profile;프로파일;Calibrate;보정;Printer;프린터;Display;디스플레" @@ -892,23 +892,23 @@ msgid "No languages found" msgstr "언어 없음" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "오늘" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "어제" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b %e일" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%Y년 %b %e일" @@ -1028,8 +1028,9 @@ msgid "December" msgstr "12월" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "날짜 및 시각" @@ -1087,12 +1088,12 @@ msgid "AM / PM" msgstr "오전 / 오후" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "날짜와 시각(표준 시간대 포함)을 바꿉니다" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Clock;시계;Timezone;시간대;Location;위치;" @@ -1104,211 +1105,226 @@ msgid "To change time or date settings, you need to authenticate." msgstr "시간 또는 날짜 설정을 바꾸려면 인증이 필요합니다." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "덮개 닫힘" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "동일 화면" # 모니터 이름, Primary-Secondary -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "주요" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "끔" # 모니터 이름, Primary-Secondary -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "보조" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "정렬된 결합 디스플레이" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "적용(_A)" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "디스플레이를 끌어서 위치를 맞추십시오" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "반시계 방향으로 90° 회전" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "180° 회전" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "시계 방향으로 90° 회전" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "크기" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "종횡비" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "해상도" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "TV에 맞게 조정" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "주사율" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "이 디스플레이의 화면 위에 막대와 현재 활동 요약을 표시" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "보조 디스플레이" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "이 디스플레이를 다른 디스플레이와 합쳐서 추가 작업 공간 만들기" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "표시" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "슬라이드 쇼와 미디어만 표시" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "동일 화면" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "두 디스플레이에서 모두 같은 화면을 봅니다" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "끄기" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "이 디스플레이를 사용하지 않습니다" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "화면 정보를 읽어 올 수 없습니다" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "결합 디스플레이 정렬(_A)" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "디스플레이" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "연결한 모니터와 프로젝터 사용법을 정합니다" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;패널;Projector;프로젝터;xrandr;Screen;화면;Resolution;해상도;Refresh;주" "사율;Monitor;모니터;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "웨일랜드" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "알 수 없음" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d비트 (빌드 ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d비트 (빌드 ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d비트" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d비트" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "어떻게 할지 물어보기" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "아무것도 하지 않기" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "폴더 열기" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "기타 미디어" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "오디오 CD에 사용할 프로그램을 선택하십시오" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "비디오 DVD에 사용할 프로그램을 선택하십시오" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "음악 플레이어를 연결했을 때 실행할 프로그램을 선택하십시오" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "카메라를 연결했을 때 실행할 프로그램을 선택하십시오" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "소프트웨어 CD에 사용할 프로그램을 선택하십시오" @@ -1317,88 +1333,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "오디오 DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "빈 Blu-ray 디스크" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "빈 CD 디스크" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "빈 DVD 디스크" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "빈 HD DVD 디스크" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray 비디오 디스크" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "전자책 읽기 프로그램" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD 비디오 디스크" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "사진 CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "수퍼 비디오 CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "비디오 CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "윈도우 프로그램" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "분류" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "개요" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "기본 프로그램" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "이동식 미디어" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "버전 %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "자세히 보기" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "시스템의 정보를 봅니다" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1574,8 +1588,9 @@ msgid "Launch help browser" msgstr "도움말 보기 실행" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "설정" @@ -1648,7 +1663,6 @@ msgstr "화면 잠그기" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "접근성" @@ -1684,11 +1698,21 @@ msgid "High contrast on or off" msgstr "고대비 켜거나 끄기" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "사용자 설정 바로 가기" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1715,122 +1739,131 @@ msgid "Modifiers-only switch to next source" msgstr "조합 키로만 다음 입력 소스로 전환" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "키보드" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "바로 가기 키 기본값으로 초기화" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s은(는) %s용으로 사용 중입니다. 바꾸면 %s이(가) 사용 중지됩니다" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "사용자 설정 바로 가기 설정" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "바로 가기 설정" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "%s 항목을 바꾸려면 새 바로 가기를 입력하십시오." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "사용자 설정 바로 가기 키 추가" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "키보드" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "키보드 바로 가기를 보거나 바꾸고 키보드 타이핑을 설정합니다" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Shortcut;바로 가기;Repeat;반복;Blink;깜박;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "사용자 설정 바로 가기 키" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "이름(_N):" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "명령(_O):" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "바로 가기 추가" +msgid "No keyboard shortcut found" +msgstr "키보드 바로 가기가 없습니다" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "바로 가기 제거" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"바로 가기 키를 편집하려면, 해당 줄을 누르고 새 키를 누르십시오. 지우려면 백스" -"페이스를 누르십시오." +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "다르게 검색해 보십시오" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "사용자 설정 바로 가기" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "취소하려면 Esc를 누르십시오." -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<알 수 없는 동작>" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "이름" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"바로 가기 키 \"%s\"(은)는 사용할 수 없습니다. 이 키만으로는 입력할 수 없습니" -"다.\n" -"Control 또는 Alt, Shift키와 동시에 사용해 보십시오." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "명령" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "바로 가기" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "편집" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "바로 가기 키 \"%s\"(은)는 \"%s\"에 쓰고 있습니다" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "없음" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "바로 가기 키를 \"%s\"에 다시 설정하면, \"%s\" 바로 가기는 없어집니다." +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "제거" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "새 바로 가기 입력" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "다시 설정(_R)" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "취소" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"\"%s\" 바로 가기에는 연결된 \"%s\" 바로 가기가 있습니다. 자동으로 \"%s\"에 할" -"당하시겠습니까?" +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "추가" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" 바로 가기가 현재 \"%s\"에 연결되어 있고, 계속하면 이 바로 가기 키 사용" -"을 중지합니다." +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "바꾸기" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "설정(_A)" +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "설정" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "설정 검사(_S)" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "마우스 및 터치패드" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "마우스 및 터치패드 민감도를 바꾸고 오른손잡이용인지 왼손잡이용인지 설정합니다" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;트랙패드;Pointer;포인터;Click;클릭;누르기;Tap;두드리기;Double;더블;" @@ -1890,6 +1923,10 @@ msgstr "터치패드 두드리면 단추 누름으로 취급" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "두손가락 스크롤" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "가장자리 스크롤" @@ -1928,11 +1965,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "비행 모드(_P)" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "네트워크 프록시" @@ -1940,17 +1977,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s 가상사설망" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "앗, 뭔가 잘못됐습니다. 소프트웨어 공급자에게 연락하십시오." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager가 동작해야 합니다." @@ -1966,7 +2003,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1983,240 +2020,245 @@ msgid "page 2" msgstr "페이지 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "보안" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "자동" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "프로파일 %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "기업용" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "없음" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "안 함" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] " %i일 전" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "없음" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "약함" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "좋음" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "좋음" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "최상" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "자세히 보기" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "신원" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "주소" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "네트마스크" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "게이트웨이" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "주소 삭제" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "추가" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "서버" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS 서버 삭제" # 주의: 미터법 아님 #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "계측" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "라우팅 삭제" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "자동(DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "수동" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "링크 로컬만" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" # IPv6 네트워크 프리픽스 -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "프리픽스" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "자동" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "자동, DHCP 전용" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "초기화" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "와이파이/이더넷 보안" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128비트 키(16진수 또는 ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128비트 암호글" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "동적 WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA 및 WPA2 개인용" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA 및 WPA2 기업용" @@ -2231,30 +2273,30 @@ msgstr "연결 속도" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 주소" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 주소" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "하드웨어 주소" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2264,7 +2306,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2347,13 +2389,13 @@ msgid "Firewall _Zone" msgstr "방화벽 구역(_Z)" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "기본값" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "이 구역은 연결의 신뢰 단계를 지정합니다" @@ -2395,45 +2437,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "연결 편집을 열 수 없습니다" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "새 프로파일" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "가상사설망" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "본딩" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "팀" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "브릿지" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "가상 LAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "가상 사설망 플러그인을 읽어들일 수 없습니다" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "파일에서 가져오기…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "네트워크 연결 추가" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "가상사설망 추가" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2441,7 +2463,7 @@ msgstr "초기화(_R)" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "저장 지우기(_F)" @@ -2465,11 +2487,11 @@ msgid "S_ecurity" msgstr "보안(_E)" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "가상 사설망 연결을 가져올 수 없습니다" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2482,36 +2504,36 @@ "\n" "오류: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "가져올 파일을 선택하십시오" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "열기(_O)" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "이름이 '%s'인 파일이 이미 있습니다." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "바꾸기(_R)" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "%s 연결을 저장한 VPN 연결로 바꾸시겠습니까?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "가상 사설망 연결을 내보낼 수 없습니다" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2522,7 +2544,7 @@ "\n" "오류: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "가상 사설망 연결 내보내기" @@ -2549,61 +2571,47 @@ msgid "Make available to _other users" msgstr "다른 사용자가 사용할 수 있게 허용(_O)" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "네트워크" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "어떻게 인터넷에 연결할지 정합니다" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Network;네트워크;Wireless;무선;Wi-Fi;Wifi;와이파이;IP;LAN;랜;Proxy;프록시;" -"WAN;인터넷;Broadband;브로드밴드;Modem;모뎀;Bluetooth;블루투스;vpn;가상사설망;" -"vlan;가상랜;bridge;브릿지;bond;본딩;DNS;네임서버;" +"WAN;인터넷;Broadband;브로드밴드;Modem;모뎀;Bluetooth;블루투스;vpn;가상사설" +"망;;DNS;네임서버;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "본딩 슬레이브" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(없음)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "브릿지 슬레이브" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "안 함" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "오늘" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "어제" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP 주소" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "최근 사용" @@ -2613,34 +2621,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "유선" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "옵션…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "프로파일 %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "새 연결 추가" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "팀 슬레이브" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2648,45 +2647,45 @@ "무선 연결이 아닌 인터넷 연결이 있으면, 무선 핫스팟을 통해 인터넷 연결을 다른 " "사람과 공유할 수 있습니다." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "무선 핫스팟을 전환하면 %s의 연결이 끊어집니다." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "핫스팟이 동작할 때는 무선으로 인터넷에 연결할 수 없습니다." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "핫스팟을 중지하고 연결 중인 사용자를 끊으시겠습니까?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "핫스팟 중지(_S)" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "시스템 정책이 핫스팟 사용을 막습니다" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "무선 장치에서 핫스팟 모드를 지원하지 않습니다" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "" "선택한 네트워크의 상세 정보(암호 및 기타 사용자 설정 정보 포함)가 지워집니다." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "기록" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2694,7 +2693,7 @@ msgstr "닫기(_C)" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "지우기(_F)" @@ -2729,6 +2728,10 @@ msgid "Provider" msgstr "공급처" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "네트워크" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2835,16 +2838,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "암호(_P)" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "없음" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "암호 보이기(_A)" @@ -2936,7 +2935,6 @@ msgstr "숨겨진 네트워크에 연결(_C)…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "기록(_H)" @@ -2958,361 +2956,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "암호" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "애드혹" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "인프라스트럭쳐" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "상태 알 수 없음" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "관리 안 됨" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "사용할 수 없음" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "연결 중" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "인증 필요" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "연결됨" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "연결 끊는 중" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "연결 실패" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "상태 알 수 없음(빠짐)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "연결되지 않음" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "설정에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP 설정에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP 설정 기한이 지났습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "비밀 데이터가 필요하지만 전송하지 않았습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x 요청의 연결이 끊겼습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x 요청 설정에 실패했습니다." #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x 요청에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x 요청이 인증에 너무 오래 걸립니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP 서비스 시작해 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP 서비스 연결이 끊어졌습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP 동작 실패" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP 클라이언트 시작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP 클라이언트 오류" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP 클라이언트 동작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "연결 공유 서비스 시작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "연결 공유 서비스 동작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "자동IP 서비스 시작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP 서비스 오류" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "자동IP 서비스 동작에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "회선 사용중" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "전화 걸기 신호음 없음" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "서비스에 연결할 수 없습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "전화 걸기 요청 시간을 초과했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "전화 걸기 시도에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "모뎀 초기화 실패" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "지정한 APN 선택에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "네트워크 검색 요소가 없습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "네트워크 등록이 거부되었습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "네트워크 등록 시간을 초과했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "요청 받은 네트워크 등록에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN 확인 실패" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "장치 펌웨어가 빠진 것 같음" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "연결이 사라졌습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "기존 연결을 가정합니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "모뎀을 찾을 수 없습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "블루투스 연결에 실패했습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM 카드 삽입하지 않았습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM PIN이 필요합니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM의 PIN 잠금 해제 키 코드 필요합니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM이 잘못되었습니다" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "인피니밴드 장치에서 연결 모드를 지원하지 않습니다" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "연결 의존성 설정에 실패했습니다" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "펌웨어 없음" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "케이블 분리됨" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "인증 기관 인증서를 고르지 않았습니다" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "802.1x 보안에 정의하지 않은 오류 (WPA-EAP)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "파일을 선택하지 않았습니다" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"인증 기관(CA) 인증서를 사용하지 않으면 연결이 위험해 지거나, 아무나 연결할 " -"수 있는 와이파이 네트워크가 될 수 있습니다. 인증 기관 인증서를 고르시겠습니" -"까?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "무시" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "인증 기관 인증서 고르기" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM 또는 PKCS#12 형식 개인 키(*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "EAP-METHOD 파일을 검증하는 중 지정하지 않은 오류" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM 또는 PKCS#12 형식 개인 키(*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER 또는 PEM 형식 인증서(*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "EAP-FAST PAC 파일이 없습니다" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "PAC 파일 선택" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC 파일(*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC 파일(_F)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "내부 인증(_I)" - -# provided authenticated credential -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC 제공(_V)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3321,41 +3294,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "익명" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "인증됨" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "둘 모두" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC 파일(_F)" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "내부 인증(_I)" + +# provided authenticated credential +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "자동 PAC 프로비저닝 허용(_V)" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "EAP-LEAP 사용자 이름이 없습니다" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "EAP-LEAP 암호가 없습니다" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "사용자 이름(_U)" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "암호 보이기(_W)" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "잘못된 EAP-PEAP 인증 기관 인증서: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "잘못된 EAP-PEAP 인증 기관 인증서: 인증서를 지정하지 않았습니다" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "인증 기관 인증서 선택" @@ -3373,19 +3379,56 @@ msgid "C_A certificate" msgstr "인증 기관 인증서(_A)" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "인증 기관 인증서 불필요(_R)" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP 버전(_V)" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "매번 이 암호 물어보기(_K)" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "EAP 사용자 이름 없음" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "EAP 암호 없음" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "EAP-TLS 신원 정보 없음" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "잘못된 EAP-TLS 인증 기관 인증서: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "잘못된 EAP-TLS 인증 기관 인증서: 인증서를 지정하지 않았습니다" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "잘못된 EAP-TLS 암호: 없음" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "잘못된 EAP-TLS 개인 키: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "잘못된 EAP-TLS 사용자 인증서: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "암호화하지 않은 개인 키는 보안상 위험합니다" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3398,11 +3441,11 @@ "\n" "(OpenSSL로 개인 키를 암호로 보호할 수도 있습니다)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "개인 인증서 선택" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "개인 키 선택" @@ -3414,51 +3457,56 @@ msgid "_User certificate" msgstr "사용자 인증서(_U)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "개인 키(_K)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "개인 키 암호(_P)" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "잘못된 EAP-TTLS 인증기관 인증서: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "잘못된 EAP-TTLS 인증기관 인증서: 인증서를 지정하지 않았습니다" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "다시 경고하지 않기(_W)" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "아니요" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "예" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "802.1x 보안을 검증하는 중 알 수 없는 오류" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS 터널링" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "PEAP(Protected EAP)" @@ -3468,6 +3516,46 @@ msgid "Au_thentication" msgstr "인증(_T)" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "LEAP 사용자 이름이 없음" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "LEAP 암호가 없음" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "WEP 키가 없음" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "잘못된 WEP 키: 길이가 %zu인 키에는 16진수 숫자만 들어 있어야 합니다" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "잘못된 WEP 키: 길이가 %zu인 키에는 ASCII 문자만 들어 있어야 합니다" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"잘못된 WEP 키: 잘못된 키 길이 %zu. 키 길이는 5/13 (ASCII) 또는 10/26 (16진" +"수) 중 하나여야 합니다" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "잘못된 WEP 키: 암호글이 비어 있으면 안 됩니다" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "잘못된 WEP 키: 암호글은 64자보다 짧아야 합니다" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (기본값)" @@ -3504,19 +3592,32 @@ msgid "WEP inde_x" msgstr "WEP 인덱스(_X)" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"잘못된 WPA-PSK: 잘못된 키 길이 %zu. [8,64] 바이트 또는 64개 16진수 숫자여야 " +"합니다" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "잘못된 WPA-PSK: 64개 16진수 숫자를 키로 해석할 수 없습니다" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "종류(_T)" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "켬" @@ -3553,16 +3654,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "잠금 화면에서 메시지 내용 보이기(_O)" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "알림" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "어떤 알림을 표시할지 및 무엇을 표시할지 설정합니다" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Notifications;알림;Banner;안내판;Message;메시지;Tray;트레이;Popup;팝업;" @@ -3581,79 +3683,68 @@ msgid "Applications" msgstr "프로그램" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "기타" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "계정 추가" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "메일" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "달력" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "연락처" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "대화" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "리소스" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "계정 로그인에 오류가 발생했습니다" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "비밀 데이터가 만료되었습니다." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "이 계정을 사용하려면 로그인하십시오." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "로그인(_S)" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "계정 만들기 오류" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "계정 제거 오류" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "정말로 계정을 제거하시겠습니까?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "서버의 계정은 제거하지 않습니다." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "제거(_R)" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "온라인 계정" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "온라인 계정에 연결하고 그 계정을 어디에 이용할지 설정합니다" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3667,6 +3758,7 @@ msgstr "설정한 온라인 계정이 없습니다" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "계정 제거" @@ -3806,7 +3898,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "배터리" @@ -3854,101 +3946,102 @@ msgid "When _idle" msgstr "입력이 없을 때(_I)" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "절전" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "화면 밝기(_S)" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "자동 밝기 조절" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "키보드 밝기 조절(_K)" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "입력이 없으면 화면 어둡게(_D)" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "빈 화면(_B)" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "와이파이(_W)" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "전기 사용을 줄이려면 와이파이를 끄십시오." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "휴대전화 네트워크(_M)" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "전기 사용을 줄이려면 휴대전화 네트워크를(3G, 4G, LTE 등) 끄십시오." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "블루투스(_B)" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "배터리 전원 사용할 때" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "전원이 연결되었을 때" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "대기 모드" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "최대 절전" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "아무것도 하지 않기" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "대기 모드 및 전원 단추" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "자동 대기 모드(_A)" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "자동 대기 모드" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "전원 단추를 눌렀을 때(_W)" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "장치" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "전원" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "배터리 상태를 보고 절전 설정을 바꿉니다" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4027,11 +4120,6 @@ msgid "Delay" msgstr "지연 시간" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "취소" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "인증" @@ -4041,201 +4129,198 @@ msgstr "인증 필요" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "토너 부족" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "토너 없음" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "현상액 부족" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "현상액 없음" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "마커 내용물 부족" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "마커 내용물 없음" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "덮개 열림" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "문 열림" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "용지 부족" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "용지 없음" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "연결 끊김" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "중지" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "찌꺼기 보관함이 거의 가득 찼습니다" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "찌꺼기 보관함이 가득 찼습니다" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "감광 반도체의 수명이 거의 다 되었습니다" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "감광 반도체가 이제 동작하지 않습니다" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "설정중" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "준비" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "인쇄 작업 받지 않음" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "처리중" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "남은 토너" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "남은 잉크" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "남은 소모품" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "설치중" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u개 활성" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "새 프린터 추가에 실패했습니다." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "PPD 파일 선택" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "포스트스크립트 프린터 기술 파일(*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "적당한 드라이버가 없습니다" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "준비된 드라이버 검색중…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "데이터베이스에서 선택…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "PPD 파일 제공…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "시험 페이지" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "프린터 없음" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "UI를 읽어들일 수 없습니다: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "프린터" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "프린터 추가, 인쇄 작업 보기, 어떻게 인쇄할지 설정" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "" "Printer;프린터;Queue;대기열;Print;인쇄;Paper;용지;종이;Ink;잉크;Toner;토너;" @@ -4398,6 +4483,11 @@ msgid "Parallel Port" msgstr "병렬 포트" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "블루투스" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4609,13 +4699,17 @@ msgid "_Options" msgstr "옵션(_O)" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "프린터 없음" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "프린터 추가" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4623,70 +4717,70 @@ "죄송합니다. 시스템 인쇄 서비스가\n" "없는 것 같습니다." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "화면 잠금" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "사용 중" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "켬" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "끔" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "위치 서비스" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "사용 내역" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "휴지통의 모든 항목을 비우시겠습니까?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "휴지통의 모든 항목을 완전히 삭제합니다." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "휴지통 비우기(_E)" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "모든 임시 파일을 지우시겠습니까?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "모든 임시 파일을 완전히 삭제합니다." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "임시 파일 지우기(_P)" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "휴지통 및 임시 파일 지우기" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "소프트웨어 사용" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "문제점 보고" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4695,20 +4789,21 @@ "기술적인 문제점에 대한 보고서를 보내면 %s 개선에 도움이 됩니다. 보고서는 익명" "으로 전송되고 개인 정보는 가려집니다." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "사생활 보호 정책" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "사생활 보호" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "사생활" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "개인 정보를 보호하고, 다른 사람이 볼 수 있는 사항을 설정합니다" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4877,21 +4972,21 @@ msgid "Other" msgstr "기타" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "바뀐 사항을 적용하려면 세션을 다시 시작해야 합니다." -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "지금 다시 시작" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "입력 소스를 선택하지 않았습니다" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "로그인 화면(_S)" @@ -4923,17 +5018,18 @@ msgid "Paper" msgstr "용지" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "지역 및 언어" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "표시할 언어, 여러가지 형식, 키보드 배치, 입력 소스를 선택합니다." #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Language;언어;Layout;배치;Keyboard;키보드;Input;입력;" @@ -4991,7 +5087,7 @@ msgstr "왼쪽+오른쪽 Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "언어(_L)" @@ -5039,26 +5135,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "로그인 설정은 로그인할 때 모든 사용자가 사용합니다" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "위치" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "책갈피" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "기타" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "위치 선택" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "확인(_O)" @@ -5066,17 +5147,18 @@ msgid "No applications found" msgstr "프로그램 없음" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "검색" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "어떤 프로그램에서 활동 내역에 검색 결과를 표시할지 설정합니다." #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Search;검색;Find;찾기;Index;인덱스;색인;Hide;숨기기;Privacy;개인정보;Results;" @@ -5086,6 +5168,18 @@ msgid "Search Locations" msgstr "검색 위치" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "위치" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "책갈피" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "기타" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "위로 이동" @@ -5098,6 +5192,11 @@ msgid "Preferences" msgstr "기본 설정" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "공유에 사용할 네트워크를 선택하지 않았습니다" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5123,21 +5222,54 @@ msgid "Choose a Folder" msgstr "폴더 선택" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"개인 파일 공유를 사용하면 공유 폴더를 네트워크의 다른 사람이 다음을 사용해 공" +"유할 수 있습니다: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"원격 로그인을 사용하면, 원격 사용자가 다음 보안 셸 명령으로 연결할 수 있습니" +"다:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"화면 공유를 사용하면, 원격 사용자가 vnc://%s에 연결" +"해 화면을 보거나 조작할 수 있습니다" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "복사" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "공유" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "공유" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "다른 사람과 공유할 사항을 정합니다" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5146,6 +5278,10 @@ "크톱;media;미디어;audio;오디오;video;비디오;pictures;photos;사진;movies;영상;" "동영상;server;서버;renderer;렌더러;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "네트워크" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "원격 로그인 사용 여부" @@ -5154,25 +5290,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "원격 로그인 사용 여부를 바꾸려면 인증이 필요합니다" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "공유에 사용할 네트워크를 선택하지 않았습니다" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "네트워크" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "컴퓨터 이름(_C)" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "개인 파일 공유(_P)" +msgid "_File Sharing" +msgstr "파일 공유(_F)" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5191,82 +5315,54 @@ msgstr "네트워크 연결이 없어 일부 서비스를 사용하지 못합니다." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "개인 파일 공유" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"개인 파일 공유를 사용하면 공유 폴더를 네트워크의 다른 사람이 다음을 사용해 공" -"유할 수 있습니다: dav://%s" +msgid "File Sharing" +msgstr "파일 공유" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "암호 필요(_R)" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "원격 로그인" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"원격 사용자가 보안 셸 명령으로 연결하도록 허용:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "화면 공유" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"원격 사용자가 다음에 연결해 화면을 보거나 조작할 수 있습니다: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "원격 조작 허용(_A)" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "연결해서 화면 조작 허용(_A)" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "암호(_P):" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "암호 보이기(_S)" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "접근 옵션" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "새로 연결하면 접근을 허용할지 확인(_N)" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "암호 필요(_R)" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "미디어 공유" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "미디어 공유를 하면 네트워크를 통해 음악, 사진, 영상을 공유합니다." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "네트워크를 통해 음악, 사진, 영상을 공유합니다." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "폴더" @@ -5394,11 +5490,6 @@ msgid "Peak detect" msgstr "피크 검색" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "이름" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "장치" @@ -5493,17 +5584,22 @@ msgid "Subwoofer" msgstr "서브우퍼" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "사용자 설정" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "접근성" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "보기, 듣기, 타이핑, 누르기 편의 사항" # 원문이 'Mouse' 키워드 중복 #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5602,8 +5698,8 @@ msgstr "소리 키" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Num Lock 또는 Caps Lock 키가 켜져 있으면 소리를 냅니다." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Num Lock 또는 Caps Lock 키를 켤 때나 끌 때 소리를 냅니다." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5984,94 +6080,66 @@ msgstr "색상 효과" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "사용자 추가" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "전체 이름(_F)" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "표준" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "관리자" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "전체 이름(_F)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "계정 종류(_T)" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "다음 로그인에 암호를 설정하도록 허용(_L)" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "지금 암호 설정(_N)" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "확인(_V)" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "확인(_C)" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"기업 로그인에서는 중앙에서 관리하는 사용자 계정을 이 장치에서 사용합니다." +"기업 로그인에서는 중앙에서 관리하는 사용자 계정을 이 장치에서 사용합니다. 이 " +"계정을 사용해서 인터넷에서 회사의 자원에 접근할 수 잇습니다." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "도메인(_D)" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"기업 로그인 계정을 추가하려면\n" -"먼저 연결하십시오." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "기업 로그인(_E)" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "사용자 추가" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "등록(_E)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "도메인 관리자 로그인" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"기업 로그인을 사용하려면, 이 컴퓨터는 도메인에 참여해야 합니다.\n" -"여러분의 네트워크 관리자에게 이곳에 도메인 암호를 입력하라고\n" -"요청하십시오." +msgid "You are Offline" +msgstr "연결이 끊겼습니다" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "관리자 이름(_N)" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "기업 사용자를 추가하려면 연결된 상태여야 합니다." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "관리자 암호" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "기업 로그인(_E)" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6106,7 +6174,7 @@ msgstr "오른쪽 새끼" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "지문 로그인 사용" @@ -6145,9 +6213,32 @@ "Login;로그인;Name;이름;Fingerprint;지문;Avatar;아바타;Logo;로고;Face;얼굴;" "Password;암호;비밀 번호;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "로그인 내역" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "등록(_E)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "도메인 관리자 로그인" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"기업 로그인을 사용하려면, 이 컴퓨터는 도메인에 참여해야 합니다.\n" +"여러분의 네트워크 관리자에게 이곳에 도메인 암호를 입력하라고\n" +"요청하십시오." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "관리자 이름(_N)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "관리자 암호" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6170,38 +6261,30 @@ msgstr "현재 암호(_P)" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "다음 로그인에 암호를 설정하도록 허용" +msgid "Allow user to change their password on next login" +msgstr "다음 로그인에 암호를 바꾸도록 허용" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "지금 암호 설정" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "사용자 계정 추가" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "사용자 계정 제거" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "사용자 추가(_A)…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "로그인 옵션" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "자동 로그인(_U)" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "지문 로그인(_F)" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "사용자 아이콘" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "최근 로그인" @@ -6304,7 +6387,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "대소문자를 섞어서 쓰고 숫자를 사용하십시오." #: ../panels/user-accounts/pw-utils.c:119 @@ -6394,32 +6477,32 @@ msgstr "알 수 없는 오류" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "계정을 제공하는 곳의 홈페이지 주소." +msgid "Should match the web address of your login provider." +msgstr "로그인을 제공하는 곳의 웹 주소." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "계정 추가에 실패했습니다" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "암호가 다릅니다." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "계정 등록에 실패했습니다" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "이 도메인에 대해 인증하기 위한 방법을 지원하지 않습니다" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "도메인 참여에 실패했습니다" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6427,7 +6510,7 @@ "이 로그인 이름은 쓸 수 없습니다.\n" "다시 시도해 보십시오." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6435,14 +6518,24 @@ "이 로그인 암호는 쓸 수 없습니다.\n" "다시 시도해 보십시오." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "도메인에 로그를 남기는데 실패했습니다" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "도메인을 찾을 수 없습니다. 잘못 쓰신 것이 아닙니까?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "표준" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "관리자" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6460,29 +6553,29 @@ msgid "Enabled" msgstr "사용" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "등록한 지문을 삭제하시겠습니까?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "지문 삭제(_D)" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "등록한 지문을 삭제하고 지문 로그인을 사용하지 않습니까?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "완료!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "'%s' 장치에 접근할 수 없습니다" @@ -6490,16 +6583,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "'%s' 장치의 지문 캡처를 시작할 수 없습니다" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "지문 인식 장치에 접근할 수 없습니다" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "시스템 관리자에게 문의하십시오." @@ -6508,18 +6601,18 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "지문 로그인을 사용하려면, '%s' 장치를 이용해 지문을 입력해야 합니다." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "손가락 선택" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "지문 등록하는 중" @@ -6573,14 +6666,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "세션이 끝났습니다" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "세션이 시작했습니다" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - 계정 활동" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "다른 암호를 입력하십시오." @@ -6642,7 +6742,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "%s 도메인에 연결할 수 없습니다: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "기타 계정" @@ -6720,15 +6820,15 @@ msgid "Logged in" msgstr "로그인함" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "계정 서비스 연결에 실패했습니다" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "AccountService를 설치하고 사용 표시했는지 확인하십시오." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6736,12 +6836,12 @@ "바꾸려면,\n" "먼저 * 아이콘을 누르십시오" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "새 사용자 계정 만들기" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6749,12 +6849,12 @@ "사용자 계정을 만드려면,\n" "먼저 * 아이콘을 누르십시오" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "선택한 사용자 계정 삭제" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6762,33 +6862,32 @@ "선택한 사용자 계정을 삭제하려면,\n" "먼저 * 아이콘을 누르십시오" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "내 계정" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "사용자 이름이 '%s'인 사용자가 이미 있습니다." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "그 사용자 이름은 사용할 수 없습니다. 다른 이름을 사용하십시오." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "사용자 이름이 너무 깁니다." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "사용자 이름은 '-'로 시작할 수 없습니다." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"사용자 이름은 a-z까지 대소문자와 숫자, 그리고 '.', '-', '_' 문자만으로 만들어" -"야 합니다." +"사용자 이름은 a-z까지 대소문자와 숫자, 그리고 다음 문자만으로 만들어야 합니" +"다: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "홈 폴더의 이름입니다. 바꿀 수 없습니다." @@ -6876,18 +6975,18 @@ msgid "Button" msgstr "단추" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "와콤 디지타이저" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "그래픽 디지타이저의 단추 매핑을 설정하고 스타일러스의 민감도를 조정합니다" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "" "Tablet;태블릿;디지타이저;Wacom;와콤;Stylus;스타일러스;Eraser;지우개;Mouse;마" @@ -6921,6 +7020,10 @@ msgid "Bluetooth Settings" msgstr "블루투스 설정" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "와콤 디지타이저" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "모니터에 연결하기…" @@ -7014,22 +7117,22 @@ msgid "Mode Switch #%d" msgstr "%d번 모드 전환" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "%d번 왼쪽 단추" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "%d번 오른쪽 단추" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "%d번 위 단추" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "%d번 아래 단추" @@ -7106,6 +7209,11 @@ msgid "Tip Pressure Feel" msgstr "팁 압력 감도" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "전체 설정" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "그놈 제어 센터" @@ -7166,22 +7274,18 @@ msgid "Quit" msgstr "끝내기" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "전체 설정" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "개인" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "하드웨어" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "시스템" @@ -7219,3 +7323,21 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "검색 취소" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "핫스팟" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "%s에 대한 키보드 바로 가기. 바꾸려면 새 바로 가기 키를 입력하십시" +#~ "오." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "바로 가기 키를 편집하려면, 해당 줄을 누르고 새 키를 누르십시오. 지우려면 " +#~ "백스페이스를 누르십시오." diff -Nru gnome-control-center-3.20.2/po/lt.po gnome-control-center-3.22.1/po/lt.po --- gnome-control-center-3.20.2/po/lt.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/lt.po 2016-10-10 16:16:22.000000000 +0000 @@ -16,8 +16,8 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-17 21:42+0200\n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-12 20:54+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -100,7 +100,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Namų aplankas" @@ -115,25 +115,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -164,16 +163,17 @@ msgid "Current background" msgstr "Dabartinis fonas" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fonas" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Pakeiskite fono paveikslėlį fonu arba nuotrauka" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Fonas;Ekranas;Darbastalis;" @@ -213,18 +213,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Išjunkite skrydžio veiksenos jungiklį Bluetooth įjungimui." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Įjunkite arba išjunkite Bluetooth ir junkitės prie savo įrenginių" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "dalinimasis;dalytis;bendrinti;bluetooth;obex;" @@ -395,7 +394,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Visi failai" @@ -434,7 +433,7 @@ msgstr "Įrašyti profilį" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "Į_rašyti" @@ -690,7 +689,7 @@ "Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Santrauka" @@ -702,11 +701,11 @@ msgid "_Import File…" msgstr "_Importuoti failą..." -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Pridėti" @@ -856,11 +855,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Spalva" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -868,7 +868,7 @@ "spausdintuvai, spalvas" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Spalva;ICC;Profilis;Kalibravimas;Spausdintuvas;Ekranas;" @@ -886,23 +886,23 @@ msgid "No languages found" msgstr "Nerasta kalbų" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "šiandien" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Vakar" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b %e" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%Y %B %e" @@ -1022,8 +1022,9 @@ msgid "December" msgstr "Gruodis" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data ir laikas" @@ -1080,12 +1081,12 @@ msgid "AM / PM" msgstr "Diena / Naktis" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Keiskite datą ir laiką, įskaitant laiko juostą" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Laikrodis;Laiko juosta;Vietovė;" @@ -1097,207 +1098,222 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Datos ir laiko nustatymams pakeisti reikia patvirtinti tapatybę." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Užvertas" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Dubliuoti" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Pagrindinis" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Išjungta" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Antrinis" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Išdėstyti vaizduoklius" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Pritaikyti" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Tempkite vaizduoklius jų išdėstymui" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Pasukti 90° prieš laikrodžio rodyklę " -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Pasukti 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Pasukti 90° pagal laikrodžio rodyklę" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Dydis" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporcija" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Skiriamoji geba" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Derinti televizoriui" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Atnaujinimo dažnis" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Rodyti viršutinę juostą ir veiklų apžvalgą šiame vaizduoklyje" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Antrinis vaizduoklis" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Prijungti šį vaizduoklį prie kito, papildomai darbo sričiai sukurti" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Pateiktis" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Rodyti tik skaidres ir daugialypę terpę" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Veidrodis" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Rodyti jūsų esamą vaizdą abiejuose vaizduokliuose" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Išjungti" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Nenaudoti šio vaizduoklio" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Nepavyko gauti ekrano informacijos" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Iš_dėstyti sujungtus vaizduoklius" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ekranai" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Pasirinkite, kaip naudoti prijungtus monitorius ir projektorius" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Skydelis;Projektorius;xrandr;Ekranas;Raiška;Atnaujinimas;Monitorius;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Nežinomas" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bitų (Sukūrimo ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bitų (Sukūrimo ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bitų" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bitų" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Klausti, ką daryti" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nieko nedaryti" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Atverti aplanką" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Kitos laikmenos" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Parinkite programą, kuria norėtumėte klausytis garso CD" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Parinkite programą vaizdo DVD rodymui" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Pasirinkite paleistiną programą, kai muzikos grotuvas prijungiamas" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Pasirinkite paleistiną programą, kai prijungiamas fotoaparatas" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Parinkite programą programinės įrangos CD paleidimui" @@ -1306,88 +1322,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "garso DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "tuščias Blu-ray diskas" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "tuščias CD diskas" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "tuščias DVD diskas" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "tuščias HD DVD diskas" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray vaizdo diskas" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "el. knygų skaitytuvas" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD vaizdo diskas" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Paveikslėlių CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super vaizdo CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Vaizdo CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows programinė įranga" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Skyrius" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Apžvalga" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Numatytosios programos" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Išimamos laikmenos" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versija %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Išsamiau" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Rodyti informaciją apie sistemą" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1544,7 +1558,7 @@ #: ../panels/keyboard/01-input-sources.xml.in.h:1 #: ../panels/universal-access/uap.ui.h:11 msgid "Typing" -msgstr "Spausdinimas" +msgstr "Rašymas" #: ../panels/keyboard/01-input-sources.xml.in.h:2 msgid "Switch to next input source" @@ -1562,8 +1576,9 @@ msgid "Launch help browser" msgstr "Paleisti pagalbos naršyklę" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Nustatymai" @@ -1586,7 +1601,7 @@ #: ../panels/keyboard/01-launchers.xml.in.h:8 msgctxt "keybinding" msgid "Search" -msgstr "Ieškoti" +msgstr "Paieška" #: ../panels/keyboard/01-screenshot.xml.in.h:1 msgid "Screenshots" @@ -1636,7 +1651,6 @@ msgstr "Užrakinti ekraną" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Universali prieiga" @@ -1672,11 +1686,21 @@ msgid "High contrast on or off" msgstr "Įjungti arba išjungti didelį kontrastą" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Pasirinktiniai susiejimai" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1703,116 +1727,126 @@ msgid "Modifiers-only switch to next source" msgstr "Tik modifikatoriai perjungia į kitą šaltinį" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Klaviatūra" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Atstatyti numatytąją trumpinio vertę" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s jau naudojamas %s. Jei jį pakeisite, %s bus išjungtas" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Nustatyti pasirinktinį susiejimą" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Nustatyti trumpinį" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Įveskite naują trumpinį %s pakeisti." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Pridėti pasirinktinis trumpinį" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Klaviatūra" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Rodyti ir keisti klaviatūros trumpinius bei nustatyti rašymo nuostatas" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Trumpinys;Pakartoti;Mirksėti;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Pasirinktinis susiejimas" +msgid "No keyboard shortcut found" +msgstr "Nerasta klaviatūros trumpinių" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Pavadinimas:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Ko_manda:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Pridėti trumpinį" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Pašalinti trumpinį" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Norėdami pakeisti spartųjį klavišą, spustelėkite atitinkamą eilutę ir " -"paspauskite spartųjį klavišą arba spauskite Backspace išvalymui." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Pasirinktiniai susiejimai" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Bandykite kitą paiešką" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Spauskite Esc atsisakymui." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Negalima naudoti sparčiojo klavišo „%s“, kadangi nebegalėsite rašyti šiuo " -"klavišu.\n" -"Bandykite klavišą kartu su tokiais klavišai kaip Control, Alt ar Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Pavadinimas" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Susiejimas „%s“ jau yra naudojamas\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Ko_manda" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Trumpinys" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Keisti" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Jei priskirsite spartųjį klavišą komandai „%s“, „%s“ bus išjungtas." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Joks" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Priskirti iš naujo" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Pašalinti" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Įveskite naują trumpinį" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Trumpinys „%s“ turi susietą trumpinį „%s“. Ar norite jį automatiškai " -"nustatyti į „%s“?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Atsisakyti" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"„%s“ šiuo metu yra susietas su „%s“, jei tęsite, šis trumpinys bus išjungtas." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Pridėti" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Priskirti" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Pakeisti" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Nustatyti" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Tikrinkite savo _nustatymus" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Pelė ir jutiklinis kilimėlis" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1820,7 +1854,7 @@ "ar dešiniarankio veikseną" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Sekantis paviršius;Žymiklis;Paspaudimas;Taukštelėjimas;Dvigubas;Mygtukas;" @@ -1880,6 +1914,10 @@ msgstr "Bakstelėti _paspaudimui" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Slinktis dviem pirštais" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Slinkimas kraštuose" @@ -1918,11 +1956,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Skrydžio veiksena" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Tarpinis tinklo serveris" @@ -1930,18 +1968,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Oi, atsitiko kažkas negero. Susisiekite su savo programinės įrangos tiekėju." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager turėtų veikti." @@ -1957,7 +1995,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1974,59 +2012,64 @@ msgid "page 2" msgstr "puslapis 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Sauga" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatinis" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profilis %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nėra" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Niekada" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2035,179 +2078,179 @@ msgstr[2] "Prieš %i dienų" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Joks" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Silpnas" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Gerai" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Geras" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Puikus" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Išsamiau" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Tapatybė" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresas" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Tinklo kaukė" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Tinklų sietuvas" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Ištrinti adresą" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Pridėti" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Serveris" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Ištrinti DNS serverį" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrinė" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Ištrinti kelią" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatinis (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Rankinis" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Tik vietinis susiejimas" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Priešdėlis" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatinis" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "A_utomatinis, tik DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Atstatyti" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Joks" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bitų raktas (šešioliktainis arba ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bitų slaptažodis" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynaminis WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 asmeninis" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 kompanijos" @@ -2222,30 +2265,30 @@ msgstr "Saito greitis" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 adresas" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 adresas" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Aparatinis adresas" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2255,7 +2298,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2338,13 +2381,13 @@ msgid "Firewall _Zone" msgstr "Ugniasienės _zona" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Numatyta" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zona nustato ryšio pasitikėjimo lygį" @@ -2386,45 +2429,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Nepavyko atverti ryšių redaktoriaus" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nauja profilis" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Nepavyko įkelti VPN įskiepių" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importuoti iš failo…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Pridėti tinklo ryšį" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Pridėti VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2432,7 +2455,7 @@ msgstr "_Atstatyti" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Pamiršti" @@ -2458,11 +2481,11 @@ msgid "S_ecurity" msgstr "S_auga" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nepavyko importuoti PVN ryšio" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2475,36 +2498,36 @@ "\n" "Klaida: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Pasirinkite failą importavimui" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Atverti" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Failas pavadinimu „%s“ jau yra." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Pakeisti" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Ar norite pakeisti %s įrašomu VPN ryšiu?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Nepavyko eksportuoti VPN ryšio" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2515,7 +2538,7 @@ "\n" "Klaida: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Eksportuoti VPN ryšį" @@ -2542,60 +2565,46 @@ msgid "Make available to _other users" msgstr "Padaryti pasiekiamu kitiems naud_otojams" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Tinklas" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Valdykite, kaip jungiatės prie interneto" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Tinklas;Belaidis;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Plačiajuostis;Modemas;Bluetooth;" -"vpn;vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Prijungimai" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nėra)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Sujungti antraeilius" +"vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "niekada" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "šiandien" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "vakar" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP adresas" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Paskutinį kartą naudota" @@ -2605,34 +2614,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Laidinis" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Parametrai..." -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profilis %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Pridėti naują ryšį" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team antraeiliai" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2640,12 +2640,12 @@ "Jei turite kitokį interneto ryšį nei belaidis, galite nustatyti belaidį " "prieigos tašką ir dalintis interneto ryšiu su kitais." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Persijungimas prie belaidžio prieigos taško atjungs jus nuo %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2653,23 +2653,23 @@ "Neįmanoma pasiekti interneto per jūsų belaidį, kol prieigos taškas yra " "aktyvus." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Stabdyti prieigos tašką ir atjungti visus naudotojus?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Stabdyti prieigos tašką" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Sistemos taisyklės neleidžia naudoti kaip prieigos taško" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Belaidis įrenginys nepalaiko prieigos taško veiksenos" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2677,11 +2677,11 @@ "Tinklo nustatymai pasirinktiems tinklams įskaitant slaptažodžius ir bet " "kokius asmeninius nustatymus bus prarasti." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Istorija" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2689,7 +2689,7 @@ msgstr "_Užverti" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Pamiršti" @@ -2726,6 +2726,10 @@ msgid "Provider" msgstr "Tiekėjas" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Tinklas" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2831,16 +2835,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Slaptažodis" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Joks" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Rodyti sl_aptažodį" @@ -2934,7 +2934,6 @@ msgstr "_Prisijungti prie paslėpto tinklo..." #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Istorija" @@ -2956,360 +2955,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Slaptažodis" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktūra" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Būsena nežinoma" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Netvarkomas" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nepasiekiamas" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Jungiamasi" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Reikia patvirtinti tapatybę" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Prisijungta" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Atsijungiama" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Prisijungti nepavyko" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Būsena nežinoma (trūkstama)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Neprisijungta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfigūracija nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP konfigūracija nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP konfigūracijos laikas baigėsi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Buvo reikalingos paslaptys, bet nepateiktos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x tiekėjas atjungtas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x tiekėjo konfigūracija nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x tiekėjo klaida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x per ilgai užtruko patvirtindamas tapatybę" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Nepavyko paleisti PPP tarnybos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP tarnyba atsijungė" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Nepavyko paleisti DHCP kliento" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP kliento klaida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP klientas nebeveikia" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Nepavyko paleisti bendrų ryšių tarnybos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Bendrų ryšių tarnyba nebeveikia" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Nepavyko paleisti AutoIP tarnybos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP tarnybos klaida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP tarnyba nebeveikia" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linija užimta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nėra skambinimo tono" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nepavyko nustatyti pernešėjo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Baigėsi skambinimo užklausos laikas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Nepavyko prisiskambinti" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modemo iniciavimas nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Nepavyko pasirinkti nurodytų APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Neieškoma tinklų" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Neleista registruoti tinklo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Baigėsi tinklo registravimo laikas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Nepavyko registruoti prašomo tinklo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Nepavyko patikrinti PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Gali būti, kad įrenginiui trūksta aparatinės programinės įrangos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Ryšys dingo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Buvo panaudotas esamas ryšys" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modemas nerastas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth ryšys nepavyko" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM kortelė neįdėta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Reikalingas SIM Pin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Reikalingas SIM Puk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Neteisinga SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand įrenginys nepalaiko ryšio veiksenos" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Nepavyko ryšio priklausomybė" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Trūksta aparatinės programinės įrangos" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabelis neįjungtas" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nepasirinktas liudijimų įstaigos liudijimas" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "nežinoma klaida 802.1x saugume (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nepasirinktas failas" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Nenaudojamas liudijimų įstaigos (LĮ) liudijimas gali sukurti nesaugius, " -"kenkėjiškus belaidžius tinklus. Ar norite pasirinkti liudijimų įstaigos " -"liudijimą?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Nepaisyti" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Pasirinkti LĮ liudijimą" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, or PKCS#12 privatūs raktai (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "nežinoma klaida tikrinant eap-metodo failą" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, arba PKCS#12 privatūs raktai (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER arba PEM liudijimai (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "trūksta EAP-FAST PAC failo" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Pasirinkite PAC failą" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC failai (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _failas" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Vidinis tapatybės patvirtinimas" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC _paskyrimas" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3318,41 +3293,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonimas" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Tapatybė patvirtinta" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Abu" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _failas" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Vidinis tapatybės patvirtinimas" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Leisti automatinius PAC _priskyrimus" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "trūksta EAP-LEAP naudotojo vardo" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "trūksta EAP-LEAP slaptažodžio" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Naudotojo vardas" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Rodyti slaptažodį" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "netinkamas EAP-PEAP LĮ liudijimas: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "netinkamas EAP-PEAP LĮ liudijimas: nenurodytas liudijimas" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Pasirinkite liudijimų įstaigos liudijimą" @@ -3370,19 +3377,56 @@ msgid "C_A certificate" msgstr "L_Į liudijimas" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Ne_reikia LĮ liudijimo" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _versija" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Klausti šio slaptažodžiu kiekvieną kartą" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "trūksta EAP naudotojo vardo" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "trūksta EAP slaptažodžio" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "trūksta EAP-TLS identiteto" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "netinkamas EAP-TLS LĮ liudijimas: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "netinkamas EAP-TLS LĮ liudijimas: nenurodytas liudijimas" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "netinkamas EAP-TLS slaptažodis: trūksta" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "netinkamas EAP-TLS privatus raktas: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "netinkamas EAP-TLS naudotojo liudijimas: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Nešifruoti privatūs raktai yra nesaugūs" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3396,11 +3440,11 @@ "\n" "(Galite slaptažodžiu apsaugoti savo privatų raktą su openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Pasirinkite asmeninį liudijimą" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Pasirinkite privatų raktą" @@ -3412,51 +3456,56 @@ msgid "_User certificate" msgstr "Na_udotojo liudijimas" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Privatus ra_ktas" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Privataus rakto slaptažodis" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "netinkamas EAP-TTLS LĮ liudijimas: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "netinkamas EAP-TTLS LĮ liudijimas: nenurodytas liudijimas" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Daugiau neperspėti" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ne" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Taip" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Nežinoma klaida saugiai tikrinant 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunneled TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Apsaugotas EAP (PEAP)" @@ -3466,6 +3515,50 @@ msgid "Au_thentication" msgstr "_Tapatybės patvirtinimas" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "trūksta leap naudotojo vardo" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "trūksta leap slaptažodžio" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "trūksta wep rakto" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"netinkamas wep raktas: %zu ilgio raktas turi susidėti tik iš šešioliktainių " +"skaitmenų" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"netinkamas wep raktas: %zu ilgio raktas turi susidėti tik iš ascii simbolių" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"netinkamas wep raktas: netinkamas rakto ilgis %zu. Raktus turi būti 5/13 " +"(ascii) arba 10/16 (šešioliktainis) ilgio" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "netinkamas wep raktas: slaptafrazė negali būti tuščia" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"netinkamas wep raktas: slaptafrazė turi būti trumpesnė nei 64 simboliai" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (numatyta)" @@ -3502,19 +3595,33 @@ msgid "WEP inde_x" msgstr "WEP _indeksas" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"netinkamas wpa-psk: netinkamas rakto ilgis %zu. Turi b8ti [8,63] baitai arba " +"64 šešioliktainiai skaitmenys" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"netinkamas wpa-psk: negalima 64 baitų rakto interpretuoti kaip šešioliktainio" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipas" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Įjungta" @@ -3551,16 +3658,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Rodyti pranešimų turinį ekran_o užrakte" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Pranešimai" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Valdykite, kurie pranešimai yra rodomi, ir ką jie rodo" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Pranešimai;žinutė;laiškas;dėklas;iššokantis langelis;" @@ -3578,80 +3686,69 @@ msgid "Applications" msgstr "Programos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Kita" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Pridėti paskyrą" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Paštas" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendorius" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontaktai" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Pokalbiai" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Resursai" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Klaida prisijungiant prie paskyros" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Baigėsi įgaliojimai" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Prisijunkite šiai paskyrai įjungti." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "Pri_sijungti" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Klaida kuriant paskyrą" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Klaida šalinant paskyrą" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Ar tikrai norite pašalinti paskyrą?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Tai nepašalins šios paskyros serveryje." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Pašalinti" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Interneto paslaugų paskyros" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Internetinės paskyros" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Prisijunkite prie savo internetinių paskyrų ir nuspręskite, kam jas naudosite" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3664,6 +3761,7 @@ msgstr "Nėra nustatytų internetinių paskyrų" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Pašalinti paskyrą" @@ -3810,7 +3908,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Akumuliatorius" @@ -3858,101 +3956,102 @@ msgid "When _idle" msgstr "Kai la_isva" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Energijos taupymas" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Ekrano ryškumas" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatinis ryškumas" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Klaviatūros ryškumas" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Pritemdyti ekraną, kai kompiuteris nenaudojamas" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Išjungti ekraną, kai kompiuteris nenaudojamas" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Išjungti Wi-Fi energijos taupymui." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobilus plačiajuostis" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Išjungti mobilųjį plačiajuostį (3G, 4G, LTE ir kt.) energijai taupyti." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Naudojant baterijos energiją" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Prijungus prie elektros tinklo" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Pristabdyti" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Užmigdyti" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nieko" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Pristabdymas ir įjungimo mygtukas" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatinis pristabdymas" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatinis pristabdymas" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Kai nuspaudžiamas įjungimo mygtukas" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Įrenginiai" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energija" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Rodyti baterijos būseną ir keisti energijos taupymo nustatymus" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4031,11 +4130,6 @@ msgid "Delay" msgstr "Delsa" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Atsisakyti" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Patvirtinti tapatybę" @@ -4045,138 +4139,138 @@ msgstr "Reikia patvirtinti tapatybę" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Baigiasi rašalas" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Baigiasi rašalas" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Baigiasi ryškalas" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Baigėsi ryškalas" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Baigiasi spalvos tiekimas" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Baigėsi spalvos tiekimas" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Atvertas dangtis" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Atvertos durys" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Baigiasi popierius" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Baigėsi popierius" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Išjungta" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Sustabdytas" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Atliekų konteineris beveik pilnas" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Atliekų konteineris pilnas" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Optinio fotokonduktoriaus tarnavimo laikas baigiasi" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Optinis fotokonduktorius nebeveikia" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Konfigūruojama" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Pasirengęs" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Nepriima darbų" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Apdorojama" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Dažų lygis" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Rašalo lygis" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Tiekimo lygis" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Diegiama" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4185,15 +4279,15 @@ msgstr[2] "%u aktyvių" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Nepavyko pridėti naujo spausdintuvo." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Pasirinkite PPD failą" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4201,50 +4295,47 @@ "PostScript spausdintuvo aprašymo failai (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nerasta tinkama tvarkyklė" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Ieškoma pageidaujamų tvarkyklių..." -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Pasirinkti iš duomenų bazės..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Pateikite PPD failą..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Bandomasis puslapis" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Spausdintuvų nėra" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Nepavyko įkelti sąsajos: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Spausdintuvai" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Pridėkite spausdintuvus, matykite spausdintuvo darbus ir nuspręskite, kaip " "norite spausdinti" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Spausdintuvas;Eilė;Spausdinti;Rašalas;" @@ -4406,6 +4497,11 @@ msgid "Parallel Port" msgstr "Lygiagretus prievadas" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4618,13 +4714,17 @@ msgid "_Options" msgstr "_Parametrai" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Spausdintuvų nėra" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Pridėti spausdintuvą" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4632,70 +4732,70 @@ "Atleiskite! Sistemos spausdinimo tarnyba\n" "atrodo nėra pasiekiama." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Ekrano užrakinimas" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Naudojama" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Įjungta" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Išjungta" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Vietos tarnybos" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Naudojimas ir istorija" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Išvalyti visus elementus iš šiukšlinės?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Visi šiukšlinės elementai bus negrįžtamai ištrinti." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Iš_valyti šiukšlinę" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Ištrinti visus laikinuosius failus?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Visi laikinieji failai bus negrįžtamai ištrinti." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Išvalyti laikinuosius _failus" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Išvalyti šiukšlinę ir laikinuosius failus" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Programinės įrangos naudojimas" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Pranešimas apie problemas" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4704,20 +4804,21 @@ "Pranešimų apie technines problemas siuntimas mums padeda pagerinti %s. " "Pranešimai yra siunčiami anonimiškai, o asmeniniai duomenys yra išdarkomi." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Privatumo politika" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privatumas" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Apsaugokite asmeninę informaciją ir valdykite, ką kiti gali matyti" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4888,21 +4989,21 @@ msgid "Other" msgstr "Kita" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Pakeitimams pritaikyti reikia perleisti seansą" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Perleisti dabar" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nepasirinktas įvesties šaltinis" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Pri_sijungimo ekranas" @@ -4934,11 +5035,12 @@ msgid "Paper" msgstr "Popierius" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Regionas ir kalba" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4946,7 +5048,7 @@ "šaltinius" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Kalba;Išdėstymas;Klaviatūra;Įvestis;" @@ -5003,7 +5105,7 @@ msgstr "Kairėn+dešinysis alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Kalba" @@ -5053,26 +5155,11 @@ "Prisijungimo nustatymai yra naudojami visų naudotojų, prisijungiant prie " "sistemos" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Vietos" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Gairės" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Kita" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Pasirinkite vietą" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Gerai" @@ -5080,17 +5167,18 @@ msgid "No applications found" msgstr "Nerasta programų" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" -msgstr "Ieškoti" +msgstr "Paieška" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "Valdykite, kurios programos rodo paieškos rezultatus veiklų apžvalgoje" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Paieška;rasti;indeksas;slėpti;privatumas;rezultatai;" @@ -5098,6 +5186,18 @@ msgid "Search Locations" msgstr "Ieškoti vietų" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Vietos" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Gairės" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Kita" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Pakelti" @@ -5110,6 +5210,11 @@ msgid "Preferences" msgstr "Nuostatos" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nėra pasirinktų bendrinimui tinklų" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5135,21 +5240,54 @@ msgid "Choose a Folder" msgstr "Pasirinkite aplanką" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Dalinimasis asmeniniais failais leidžia bendrinti viešą aplanką su kitais " +"esamame tinkle naudojant: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Kai leidžiama prisijungti nuotoliniu būdu, nutolę naudotojai gali " +"prisijungti naudodami saugaus apvalkalo komandą:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Dalijimasis ekranu leidžia nutolusiems naudotojams matyti ar valdyti jūsų " +"ekraną prisijungiant prie: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopijuoti" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Dalinimasis" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Dalinimasis" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Valdykite, kuo norite dalintis su kitais" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5158,6 +5296,10 @@ "darbalaukis;medija;garsas;vaizdas;paveikslėliai;fotografijos;filmai;serveris;" "piešėjas;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Tinklai" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Įjungti arba išjungti nuotolinį prisijungimą" @@ -5167,25 +5309,13 @@ msgstr "" "Reikia patvirtinti tapatybę nuotoliniams prisijungimui įjungti ar išjungti" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nėra pasirinktų bendrinimui tinklų" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Tinklai" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Kompiuterio pavadinimas" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Dalinimasis asmeniniais failais" +msgid "_File Sharing" +msgstr "_Dalinimasis failais" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5204,85 +5334,54 @@ msgstr "Kai kurios tarnybos yra išjungtos, nes nėra tinklo prieigos." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Dalinimasis asmeniniais failais" +msgid "File Sharing" +msgstr "Dalinimasis failais" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Dalinimasis asmeniniais failais leidžia bendrinti viešą aplanką su kitais " -"esamame tinkle naudojant: dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Reikalauti slaptažodžio" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Nuotolinis prisijungimas" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Leisti nutolusiems naudotojams prisijungti naudojant saugaus apvalkalo " -"komandą:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Ekrano viešinimas" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Leisti nutolusiems naudotojams matyti ar valdyti jūsų ekraną prisijungiant " -"prie: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Leisti nuotolinį valdymą" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Leisti prisijungusiems valdyti ekraną" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "Sla_ptažodis:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Rodyti slaptažodį" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Prieigos parametrai" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Nauji ryšiai turi prašyti prieigos" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Reikalauti slaptažodžio" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Dalinimasis daugialype terpe" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Dalinimasis daugialype terpe leidžia dalinti muzika, nuotraukomis ir vaizdo " -"įrašais tinkle." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Dalinimasis muzika, nuotraukomis ir vaizdo įrašais tinkle." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Aplankai" @@ -5413,11 +5512,6 @@ msgid "Peak detect" msgstr "Viršūnių aptikimas" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Pavadinimas" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Įrenginys" @@ -5512,16 +5606,21 @@ msgid "Subwoofer" msgstr "Žemų garsų stiprintuvas" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Pasirinktinė" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Universali prieiga" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Padarykite matymą, išgirdimą, rašymą, rodymą ir spaudimą paprastesnį" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5581,7 +5680,7 @@ #: ../panels/universal-access/uap.ui.h:15 msgid "_Typing Assist (AccessX)" -msgstr "Spausdinimo _pagalbininkas (AccessX)" +msgstr "Rašymo _pagalbininkas (AccessX)" #: ../panels/universal-access/uap.ui.h:16 msgid "Pointing & Clicking" @@ -5620,7 +5719,7 @@ msgstr "Garso klavišai" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "Pyptelėti, kai įjungiama skaitmenų klaviatūra arba didžiosios raidės." #: ../panels/universal-access/uap.ui.h:26 @@ -5677,7 +5776,7 @@ #: ../panels/universal-access/uap.ui.h:40 msgid "Typing Assist" -msgstr "Spausdinimo pagalbininkas" +msgstr "Rašymo pagalbininkas" #: ../panels/universal-access/uap.ui.h:41 msgid "_Sticky Keys" @@ -5714,7 +5813,7 @@ #: ../panels/universal-access/uap.ui.h:49 msgid "Slow keys typing delay" -msgstr "Rodyti klavišų spausdinimo delsą" +msgstr "Rodyti klavišų rašymo delsą" #: ../panels/universal-access/uap.ui.h:50 msgctxt "slow keys delay" @@ -5748,7 +5847,7 @@ #: ../panels/universal-access/uap.ui.h:57 msgid "Bounce keys typing delay" -msgstr "Pasikartojančių klavišų spausdinimo delsa" +msgstr "Pasikartojančių klavišų rašymo delsa" #: ../panels/universal-access/uap.ui.h:58 msgctxt "bounce keys delay" @@ -6002,95 +6101,67 @@ msgstr "Spalvų efektai" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Pridėti naudotojo paskyrą" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Pilnas vardas" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standartinis" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administratorius" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Pilnas vardas" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Paskyros _tipas" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Leisti naudotojui nustatyti slaptažodį kito _prisijungimo metu" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Nustatyti slaptažodį dabar" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Tikrinti" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Patvirtinti" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Kompanijos prisijungimas leidžia šiame įrenginyje naudoti centralizuotai " -"tvarkomą naudotojo paskyrą." +"tvarkomą naudotojo paskyrą. Taip pat galima naudoti šią paskyrą kompanijos " +"ištekliams internete pasiekti." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Sritis" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Eiti į internetą kompanijos\n" -"prisijungimams pridėti." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Kompanijos prisijungimas" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Pridėti naudotojo paskyrą" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "Į_traukti" +msgid "You are Offline" +msgstr "Esate atsijungęs" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Srities administratoriaus prisijungimas" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Kompanijos prisijungimams naudoti, šis kompiuteris turi būti\n" -"įtrauktas į sritį. Paprašykite tinklo administratoriaus čia\n" -"įvesti jų srities slaptažodį." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Administratoriaus _vardas" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Turite būti prisijungęs prie tinklo kompanijos naudotojams pridėti." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Administratoriaus slaptažodis" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Kompanijos prisijungimas" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6125,7 +6196,7 @@ msgstr "Dešinysis mažasis pirštas" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Leisti prisijungti piršto antspaudu" @@ -6164,9 +6235,32 @@ "Prisijungimo vardas;Vardas;Piršo atspaudas;Atvaizdas;Logotipas;Veidas;" "Slaptažodis;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Prisijungimo istorija" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "Į_traukti" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Srities administratoriaus prisijungimas" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Kompanijos prisijungimams naudoti, šis kompiuteris turi būti\n" +"įtrauktas į sritį. Paprašykite tinklo administratoriaus čia\n" +"įvesti jų srities slaptažodį." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Administratoriaus _vardas" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Administratoriaus slaptažodis" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6189,38 +6283,30 @@ msgstr "_Dabartinis slaptažodis" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Leisti naudotojui nustatyti slaptažodį kito prisijungimo metu" +msgid "Allow user to change their password on next login" +msgstr "Leisti naudotojui pakeisti slaptažodį kito prisijungimo metu" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Nustatyti slaptažodį dabar" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Pridėti naudotojo paskyrą" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Pašalinti naudotojo paskyrą" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Pridėti naudotoją…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Prisijungimo parametrai" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatinis prisijungimas" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Prisijungimas _piršto atspaudu" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Naudotojo piktograma" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Paskutinis prisijungimas" @@ -6323,7 +6409,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Maišykite didžiąsias ir mažąsias raides bei panaudokite skaitmenų." #: ../panels/user-accounts/pw-utils.c:119 @@ -6415,32 +6501,32 @@ msgstr "Nežinoma klaida" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Turi atitikti jūsų paskyros teikėjo žiniatinklio adresą." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Nepavyko pridėti Pasirinkite paskyros" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Slaptažodžiai nesutampa." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Nepavyko priregistruoti paskyros" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nėra palaikomo būdo patvirtinti tapatybę šiame serveryje" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Nepavyko prisijungti prie srities" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6448,7 +6534,7 @@ "Šis prisijungimo vardas nesuveikė.\n" "Bandykite dar kartą." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6456,14 +6542,24 @@ "Šis prisijungimo slaptažodis nesuveikė.\n" "Bandykite dar kartą." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Nepavyko prisijungti prie srities" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Nepavyksta rasti domeno. Gal suklydote?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standartinis" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administratorius" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6483,15 +6579,15 @@ msgid "Enabled" msgstr "Išjungta" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Ar ištrinti įrašytus pirštų antspaudus?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Ištrinti pirštų antspaudus" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6499,15 +6595,15 @@ "Ar norite ištrinti įrašytus pirštų antspaudus, kad būtų išjungtas " "prisijungimas pirštų antspaudais?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Baigta!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Nepavyko pasiekti įrenginio „%s“" @@ -6515,16 +6611,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Nepavyko pradėti piršto antspaudo nuskaitymo įrenginiu „%s“" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Nepavyko pasiekti pirštų antspaudų skaitytuvo" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Susisiekite su sistemos administratoriumi, jei reikia pagalbos." @@ -6533,7 +6629,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6542,11 +6638,11 @@ "Jei norite prisijungti pirštų antspaudu, turite įrašyti bent vieną iš savo " "pirštų antspaudų įrenginiu „%s“." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Pasirinkite pirštą" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Įregistruojami pirštų atspaudai" @@ -6600,14 +6696,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Seansas įjungtas" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Seansas paleistas" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - paskyros aktyvumas" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Pasirinkite kitą slaptažodį." @@ -6669,7 +6772,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Nepavyko prisijungti prie %s srities: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Kitos paskyros" @@ -6749,15 +6852,15 @@ msgid "Logged in" msgstr "Prisijunges prie" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Nepavyko susisiekti su paskyrų tarnyba" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Įsitikinkite, kad AccountService yra įdiegta ir įjungta." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6765,12 +6868,12 @@ "Pakeitimams atlikti,\n" "pirma paspauskite * piktogramą" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Sukurti naują paskyrą" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6778,12 +6881,12 @@ "Naudotojui sukurti,\n" "pirma paspauskite * piktogramą" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Ištrinti pasirinktą naudotoją" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6791,33 +6894,30 @@ "Pasirinktam naudotojui ištrinti,\n" "pirma paspauskite * piktogramą" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mano paskyra" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Naudotojas vardu „%s“ jau yra." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Atleiskite, šis naudotojo vardas yra neprieinamas. Bandykite kitą." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Naudotojo vardas per ilgas." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Naudotojo vardas negali prasidėti simboliu „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." -msgstr "" -"Naudotojo vardą gali sudaryti tik anglų kalbos abėcėlės raidės ir simboliai " -"„.“, „-“ bei „_“." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" +msgstr "Naudotojo vardą gali sudaryti tik raidės a-z ir šie simboliai: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "Tai bus naudojama kaip jūsų namų aplankas ir negalės būti pakeista." @@ -6907,19 +7007,19 @@ msgid "Button" msgstr "Apačia" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Wacom planšetė" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Nustatykite mygtukų susiejimus ir pritaikykite pieštuko jautrumą grafinėms " "planšetėms" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Planšetė;Wacom;Rašiklis;Trintukas;Pelė;" @@ -6951,6 +7051,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth nustatymai" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom planšetė" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Rodyti su monitoriuje..." @@ -7044,22 +7148,22 @@ msgid "Mode Switch #%d" msgstr "Veiksenos jungiklis #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Kairysis mygtukas #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Dešinysis mygtukas #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Viršutinis mygtukas #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Apatinis mygtukas #%d" @@ -7136,6 +7240,11 @@ msgid "Tip Pressure Feel" msgstr "Pieštuko spaudimo jutimas" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Visi nustatymai" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME valdymo centras" @@ -7192,22 +7301,18 @@ msgid "Quit" msgstr "Išeiti" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Visi nustatymai" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Asmeninis" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Aparatinė įranga" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7229,7 +7334,7 @@ #: ../shell/help-overlay.ui.h:3 msgctxt "shortcut window" msgid "Search" -msgstr "Ieškoti" +msgstr "Paieška" #: ../shell/help-overlay.ui.h:4 msgctxt "shortcut window" @@ -7246,6 +7351,192 @@ msgid "Cancel search" msgstr "Atšaukti paiešką" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Prieigos tašką" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "Klaviatūros trumpinys %s. Įveskite naują trumpinį pakeitimui." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Norėdami pakeisti spartųjį klavišą, spustelėkite atitinkamą eilutę ir " +#~ "paspauskite spartųjį klavišą arba spauskite Backspace išvalymui." + +#~ msgid "Error logging into the account" +#~ msgstr "Klaida prisijungiant prie paskyros" + +#~ msgid "Credentials have expired." +#~ msgstr "Baigėsi įgaliojimai" + +#~ msgid "Sign in to enable this account." +#~ msgstr "Prisijunkite šiai paskyrai įjungti." + +#~ msgid "_Sign In" +#~ msgstr "Pri_sijungti" + +#~| msgid "Account _Type" +#~ msgid "_Account Activity" +#~ msgstr "Paskyros _aktyvumas" + +#~ msgid "_Name:" +#~ msgstr "_Pavadinimas:" + +#~ msgid "Add Shortcut" +#~ msgstr "Pridėti trumpinį" + +#~ msgid "Remove Shortcut" +#~ msgstr "Pašalinti trumpinį" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Negalima naudoti sparčiojo klavišo „%s“, kadangi nebegalėsite rašyti šiuo " +#~ "klavišu.\n" +#~ "Bandykite klavišą kartu su tokiais klavišai kaip Control, Alt ar Shift." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Susiejimas „%s“ jau yra naudojamas\n" +#~ "„%s“" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Jei priskirsite spartųjį klavišą komandai „%s“, „%s“ bus išjungtas." + +#~ msgid "_Reassign" +#~ msgstr "_Priskirti iš naujo" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Trumpinys „%s“ turi susietą trumpinį „%s“. Ar norite jį automatiškai " +#~ "nustatyti į „%s“?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "„%s“ šiuo metu yra susietas su „%s“, jei tęsite, šis trumpinys bus " +#~ "išjungtas." + +#~ msgid "_Assign" +#~ msgstr "_Priskirti" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Team" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Nepavyko įkelti VPN įskiepių" + +#~ msgid "Add Network Connection" +#~ msgstr "Pridėti tinklo ryšį" + +#~ msgid "Bond slaves" +#~ msgstr "Prijungimai" + +#~ msgid "(none)" +#~ msgstr "(nėra)" + +#~ msgid "Bridge slaves" +#~ msgstr "Sujungti antraeilius" + +#~ msgid "Team slaves" +#~ msgstr "Team antraeiliai" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand įrenginys nepalaiko ryšio veiksenos" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nepasirinktas liudijimų įstaigos liudijimas" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Nenaudojamas liudijimų įstaigos (LĮ) liudijimas gali sukurti nesaugius, " +#~ "kenkėjiškus belaidžius tinklus. Ar norite pasirinkti liudijimų įstaigos " +#~ "liudijimą?" + +#~ msgid "Ignore" +#~ msgstr "Nepaisyti" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Pasirinkti LĮ liudijimą" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Klausti šio slaptažodžiu kiekvieną kartą" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Daugiau neperspėti" + +#~ msgid "No" +#~ msgstr "Ne" + +#~ msgid "Yes" +#~ msgstr "Taip" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Kita" + +#~ msgid "Personal File Sharing" +#~ msgstr "Dalinimasis asmeniniais failais" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Leisti nuotolinį valdymą" + +#~ msgid "_Verify" +#~ msgstr "_Tikrinti" + +#~ msgid "Login History" +#~ msgstr "Prisijungimo istorija" + +#~ msgid "Add User Account" +#~ msgstr "Pridėti naudotojo paskyrą" + +#~ msgid "Remove User Account" +#~ msgstr "Pašalinti naudotojo paskyrą" + +#~ msgid "Login Options" +#~ msgstr "Prisijungimo parametrai" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Naudotojas vardu „%s“ jau yra." + +#~ msgid "Color" +#~ msgstr "Spalva" + +#~ msgid "Power" +#~ msgstr "Energija" + +#~ msgid "Privacy" +#~ msgstr "Privatumas" + #~ msgid "Used to determine your geographical location" #~ msgstr "Naudojama jūsų geografinei padėčiai nustatyti" @@ -7324,9 +7615,6 @@ #~ msgid "S_peed:" #~ msgstr "G_reitis:" -#~ msgid "Shortcuts" -#~ msgstr "Trumpiniai" - #~ msgid "Test Your Settings" #~ msgstr "Tikrinkite savo nustatymus" @@ -7365,9 +7653,6 @@ #~ msgid "Fast" #~ msgstr "Greitas" -#~ msgid "Two _finger scroll" -#~ msgstr "Slinktis dviem _pirštais" - #~ msgid "No printers available" #~ msgstr "Nėra spausdintuvų" diff -Nru gnome-control-center-3.20.2/po/lv.po gnome-control-center-3.22.1/po/lv.po --- gnome-control-center-3.20.2/po/lv.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/lv.po 2016-10-10 16:16:22.000000000 +0000 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center.HEAD.lv\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-20 08:46+0000\n" -"PO-Revision-Date: 2016-03-20 21:23+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-co" +"ntrol-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-10-09 15:07+0000\n" +"PO-Revision-Date: 2016-10-09 19:26+0200\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " -"2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :" +" 2);\n" "X-Generator: Lokalize 2.0\n" #: ../panels/background/background.ui.h:1 @@ -94,7 +94,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Mājas" @@ -109,25 +109,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -158,16 +157,17 @@ msgid "Current background" msgstr "Pašreizējais fons" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fons" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Maini savu fona attēlu uz tapeti vai fotogrāfiju" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Tapete;Ekrāns;Darbvirsma;Fons;Wallpaper;Screen;Desktop;" @@ -207,18 +207,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Izslēdziet lidmašīnas režīmu, lai ieslēgtu Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Ieslēdziet un izslēdziet Bluetooth un savienojiet savas ierīces" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "koplietot;koplietošana;šārēt;šārēšana;bluetooth;obex;" @@ -391,7 +390,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Visas datnes" @@ -431,7 +430,7 @@ msgstr "Saglabāt profilu" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Saglabāt" @@ -688,12 +687,11 @@ "varētu būt noderīgas." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Kopsavilkums" #: ../panels/color/color.ui.h:28 -#| msgid "_Add profile" msgid "Add profile" msgstr "Pievienot profilu" @@ -701,11 +699,11 @@ msgid "_Import File…" msgstr "_Importēt datni…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Pievienot" @@ -855,11 +853,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Krāsas" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Krāsa" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -867,7 +866,7 @@ "printeriem" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "Krāsas;ICC;profils;Kalibrēt;Printeris;Ekrāns;Color;ICC;Profile;Calibrate;" @@ -887,23 +886,23 @@ msgid "No languages found" msgstr "Nav atrastas valodas" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Šodien" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Vakar" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e. %b, %Y." @@ -1023,8 +1022,9 @@ msgid "December" msgstr "Decembris" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Datums un laiks" @@ -1081,12 +1081,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Mainīt datumu un laiku, tai skaitā laika joslas" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Pulkstenis;Laika josla;Vieta;Laiks;Clock;Timezone;Location;" @@ -1098,209 +1098,224 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Lai mainītu laika un datuma iestatījumus, jāautentificējas." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Aizvērts vāks" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Dublēti ekrāni" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primārais" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Izslēgts" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekundārais" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Izkārtot kombinētos displejus" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Pielietot" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Velciet displejus, lai mainītu to izkārtojumu" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Pagriezt pretēji pulksteņrādītājam par 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Pagriezt par 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Pagriezt pulksteņrādītāja virzienā par 90° grādiem" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Izmērs" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Izmēru attiecība" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Izšķirtspēja" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Pielāgot televizoram" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Atsvaidzināšanas ātrums" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Šajā displejā rādīt augšējo joslu un aktivitāšu pārskatu" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Sekundārais displejs" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Savienot šo displeju kopā ar otru, lai izveidotu papildu darbvietu" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Prezentācija" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Rādīt tikai slīdrādes un multividi" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Dublēt" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Rādīt esošo skatu uz abiem displejiem" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Izslēgt" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Neizmantot šo displeju" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Neizdevās iegūt ekrāna informāciju" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Izkārtot kombinētos displejus" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Displeji" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Izvēlieties, kā izmantot pievienotos monitorus un projektorus" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panelis;Projektors;xrandr;Ekrāns;Izšķirtspēja;Atsvaidzināt;Monitors;Panel;" "Projector;xrandr;Screen;Resolution;Refresh;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Nezināms" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bitu (būvējuma ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bitu (būvējuma ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d bitu" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d bitu" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Vaicāt, ko darīt" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nedarīt neko" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Atvērt mapi" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Citi datu nesēji" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Izvēlieties lietotni audio diskiem" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Izvēlieties lietotni DVD diskiem" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Izvēlieties lietotni, ko palaist, kad pievienots mūzikas atskaņotājs" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Izvēlieties lietotni, ko palaist, kad pievienota fotokamera" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Izvēlieties lietotni programmatūras CD" @@ -1309,88 +1324,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "audio DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "tukšs Blu-ray disks" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "tukšs CD disks" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "tukšs DVD disks" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "tukšs HD DVD disks" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray video disks" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-grāmatu lasītājs" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD video disks" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Bilžu CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows programmatūra" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sadaļa" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Pārskats" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Noklusējuma lietotnes" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Noņemamie datu nesēji" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versija %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Sistēmas informācija" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Aplūkot informāciju par šo sistēmu" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1566,8 +1579,9 @@ msgid "Launch help browser" msgstr "Palaist palīdzības pārlūku" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Iestatījumi" @@ -1640,7 +1654,6 @@ msgstr "Bloķēt ekrānu" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Universālā piekļuve" @@ -1676,11 +1689,21 @@ msgid "High contrast on or off" msgstr "Ieslēgt vai izslēgt augstu kontrastu" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Pielāgotas saīsnes" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1707,117 +1730,128 @@ msgid "Modifiers-only switch to next source" msgstr "Tikai-modifikatori pārslēdz uz nākamo avotu" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastatūra" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Pārstatīt saīsnes vērtību uz tās noklusēto" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s jau izmanto %s. Ja to aizstāsiet, %s tiks izslēgts" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Iestatīt pielāgotas saīsnes" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Iestatīt saīsni" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Ievadiet jaunu saīsni, lai mainītu %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Pievienot pielāgotu saīsni" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tastatūra" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Skatiet un mainiet tastatūras īsinājumtaustiņus un iestatiet savus " "rakstīšanas iestatījumus" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Īsceļš;Atkārtot;Mirkšķināt;Shortcut;Repeat;Blink;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Pielāgota saīsne" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nosaukums:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "K_omanda:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Pievienot saīsni" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Izņemt saīsni" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Lai rediģētu saīsni, klikšķiniet rindā, tad spiediet jaunos taustiņus vai " -"lietojiet Backspace taustiņu dzēšanai." +msgid "No keyboard shortcut found" +msgstr "Nav atrastu tastatūras saīšņu" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Pielāgotas saīsnes" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Mēģiniet ar citu meklējamo vārdu" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Spiediet Esc, lai atceltu." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Saīsni \"%s\" nevar izmantot, jo tas apgrūtinās rakstīšanu.\n" -"Lūdzu, mēģiniet lietot šo taustiņu kopā ar Control, Alt vai Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nosaukums" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Saīsne \"%s\" jau tiek lietota\n" -" \"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Komanda" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Saīsne" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Rediģēt" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Ja pārdefinēsiet saīsni par \"%s\", saīsne \"%s\" tiks deaktivēta." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Nav" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Pā_rdefinēt" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Izņemt" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Ievadiet jaunu saīsni" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"“%s” saīsnei ir saistītā saīsne “%s”. Vai vēlaties to automātiski iestatīt " -"uz “%s”?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Atcelt" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"“%s” pašlaik ir asociēts ar “%s”, ja iesiet tālāk, šī saīsne tiks izslēgta." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Pievienot" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Piešķirt" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Aizstāt" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Iestatīt" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Izmēģiniet _savus iestatījumus" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Pele un skārienpaliktnis" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Pele un skā‑rien‑palikt‑nis" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1825,7 +1859,7 @@ "izmantot labroču vai kreiļu režīmu" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Skārienpaliktnis;Rādītājs;Klikšķis;Uzsitiens;Dubults;Poga;Kursorbumba;" @@ -1885,6 +1919,10 @@ msgstr "Uzsitiens nozīmē klikšķi" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Divu pirkstu ritināšana" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Malu ritināšana" @@ -1923,11 +1961,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Lidmašīnas režīms" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Tīkla starpniekserveris" @@ -1935,19 +1973,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ak vai! Kaut kas nogāja greizi. Lūdzu, sazinieties ar programmatūras " "piegādātāju." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager ir jābūt palaistam." @@ -1963,7 +2001,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1980,59 +2018,64 @@ msgid "page 2" msgstr "2. lappuse" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Drošība" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automātiski" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profils %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nav" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nekad" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2041,179 +2084,179 @@ msgstr[2] "pirms %i dienām" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nav" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Vājš" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Lietojams" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Labs" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Teicams" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Sistēmas informācija" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitāte" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adrese" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Tīkla maska" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Vārteja" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Dzēst adresi" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Pievienot" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Serveris" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Dzēst DNS serveri" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrika" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Dzēst maršrutu" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automātiski (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Pašrocīgi" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Tikai lokālais tīkls" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefikss" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automātiski" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automātiski, tikai DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Atstatīt" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nav" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 bitu atslēga (Hex vai ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 bitu parole" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dinamiskais WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA un WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA un WPA2 Enterprise" @@ -2228,30 +2271,30 @@ msgstr "Savienojuma ātrums" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 adrese" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 adrese" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Aparatūras adrese" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2261,7 +2304,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2344,13 +2387,13 @@ msgid "Firewall _Zone" msgstr "Ugunsmūra _zona" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Noklusējuma" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zona nosaka savienojuma uzticamības līmeni" @@ -2392,45 +2435,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Nevar atvērt savienojumu redaktoru" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Jauns profils" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Sajūgt" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Tilts" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Neizdevās ielādēt VPN spraudņus" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importēt no datnes…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Pievienot tīkla savienojumu" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Pievienot VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2438,7 +2461,7 @@ msgstr "_Atstatīt" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "Ai_zmirst" @@ -2464,11 +2487,11 @@ msgid "S_ecurity" msgstr "D_rošība" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nevar importēt VPN savienojumu" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2481,36 +2504,36 @@ "\n" "Kļūda — %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Izvēlieties datni, ko importēt" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Atvērt" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Datne ar nosaukumu “%s” jau eksistē." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" -msgstr "_Aizvietot" +msgstr "_Aizstāt" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" -msgstr "Vai vēlaties aizvietot %s ar saglabājamo VPN savienojumu?" +msgstr "Vai vēlaties aizstāt %s ar saglabājamo VPN savienojumu?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Nevar eksportēt VPN savienojumu" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2521,7 +2544,7 @@ "\n" "Kļūda — %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Eksportē VPN savienojumu" @@ -2548,60 +2571,46 @@ msgid "Make available to _other users" msgstr "Padarīt pieejamu citiem liet_otājiem" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Tīkls" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Noteikt, kā savienoties ar internetu" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Tīkls;Bezvadu;Wi-Fi;Wifi;IP;LAN;Starpnieks;DNS;Proxy;WAN;Platjosla;Modems;" -"Bluetooth;vpn;vlan;tilts;bond;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond sekotāji" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nekas)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Tilta sekotāji" +"Bluetooth;vpn;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nekad" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "šodien" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "vakar" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP adrese" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Pēdējoreiz lietots" @@ -2611,34 +2620,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Vadu" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opcijas…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profils %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Pievienot jaunu savienojumu" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Sajūga sekotāji" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2646,12 +2646,12 @@ "Ja bez bezvadu pieslēguma ir arī cits pieslēgums Internetam, varat iestatīt " "bezvadu tīklāju, šādi varat dalīties ar savienojumu ar citiem." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Bezvadu tīklāja ieslēgšana atvienos jūs no %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2659,23 +2659,23 @@ "Nav iespējams piekļūt Internetam, izmantojot šo bezvadu pieslēgumu, kamēr " "darbojas tīklājs." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Apturēt tīklāju un atvienot visus lietotājus?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Apturēt tīklāju" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Sistēmas politika neļauj izmantot kā tīklāju" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Bezvadu ierīce ierīce neatbalsta tīklāja režīmu" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2683,11 +2683,11 @@ "Informācija par izvēlētajiem tīkliem, tai skaitā paroles un jebkāda " "pielāgota konfigurācija, tiks pazaudēta." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Vēsture" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2695,7 +2695,7 @@ msgstr "_Aizvērt" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "Ai_zmirst" @@ -2732,6 +2732,10 @@ msgid "Provider" msgstr "Piegādātājs" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Tīkls" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2837,16 +2841,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Parole" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Nav" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Rādīt p_aroli" @@ -2940,7 +2940,6 @@ msgstr "_Savienoties ar slēptu tīklu…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Vēsture" @@ -2962,360 +2961,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Parole" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ekspromta" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktūra" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Nezināms statuss" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Nepārvaldīts" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nav pieejams" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Savienojas" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Nepieciešama autentifikācija" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Savienots" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Atvieno" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Savienojums neizdevās" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Nezināms statuss (trūkst)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Nav savienots" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfigurēšana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP konfigurēšana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP konfigurēšanai iestājās noildze" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Netika doti nepieciešamie noslēpumi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x pieprasītājports atvienots" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x pieprasītājporta konfigurēšana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x pieprasītājports nestrādā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x pieprasītājports neautentificējās atvēlētajā laikā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP servisa palaišana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP serviss atvienots" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP nestrādā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP klienta palaišana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP klienta kļūda" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP klients nestrādā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Koplietojamā savienojuma serviss nepalaidās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Koplietojamā savienojuma serviss nestrādā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP servisa palaišana neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP servisa kļūda" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP serviss nestrādā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Līnija aizņemta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nav centrāles gatavības signāla" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Neizdevās izveidot nesēju" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Iezvanīšanās pieprasījuma noildze" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Iezvanīšanās neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Neizdevās inicializēt modemu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Neizdevās izvēlēties norādīto APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nemeklē tīklus" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Reģistrācija tīklā liegta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Tīkla reģistrācijas noildze" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Neizdevās reģistrēties pieprasītajā tīklā" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN nav atzīts par derīgu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Iespējams, ierīcei pietrūkst aparātprogrammatūras" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Savienojums pazuda" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Tika pieņemts, ka jau eksistē savienojums" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modems nav atrasts" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth savienojums neizdevās" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Nav ievietota SIM karte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Vajadzīgs SIM PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Vajadzīgs SIM PUK" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Nepareiza SIM karte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand ierīce neatbalsta savietoto režīmu" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Savienojuma priekšnoteikums nav izpildīts" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Trūkst aparātprogrammatūras" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Vads atvienots" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nav izvēlēts sertificēšanas institūcijas (CA) sertifikāts" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "nedefinēta kļūda 802.1x drošībā (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nav izvēlēta neviena datne" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Sertificēšanas institūcijas (CA) sertifikāta neizmantošanas rezultātā var " -"savienoties ar nedrošiem vai blēžu bezvadu tīkliem. Vai vēlaties izvēlieties " -"sertificēšanas institūcijas sertifikātu?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorēt" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Izvēlieties CA sertifikātu" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM vai PKCS#12 privātās atslēgas (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "nenorādīta kļūda validējot eap metodes datni" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM vai PKCS#12 privātās atslēgas (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER vai PEM sertifikāti (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "trūkst EAP-FAST PAC datnes" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Izvēlieties PAC datni" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC datne (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _datne" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Iekšējā autentifikācija" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC _nodrošinājums" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3324,41 +3299,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonīmi" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Ar autentifikāciju" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Abi" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _datne" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Iekšējā autentifikācija" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Ļauj automātisku PAC nodrošinājumu" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "trūkst EAP-LEAP lietotājvārds" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "trūkst EAP-LEAP paroles" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Lietotājvārds" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Rādīt paroli" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "nederīgs EAP-PEAP CA sertifikāts: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "nederīgs EAP-PEAP CA sertifikāts: nav norādīts sertifikāts" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Izvēlieties sertificēšanas institūcijas sertifikātu" @@ -3376,19 +3383,56 @@ msgid "C_A certificate" msgstr "C_A sertifikāts" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nepieciešams SI se_rtifikāts" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _versija" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Katru reizi prasīt paroli" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "trūkst EAP lietotājvārda" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "trūkst EAP paroles" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "trūkst EAP-TLS identitātes" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "nederīgs EAP-TLS CA sertifikāts: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "nederīgs EAP-TLS CA sertifikāts: nav norādīts sertifikāts" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "nederīga EAP-TLS paroles: trūkst" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "nederīga EAP-TLS privātā atslēga: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "nederīgs EAP-TLS lietotāja sertifikāts: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Nešifrētas privātās atslēgas nav drošas" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3402,11 +3446,11 @@ "\n" "(Savu privāto atslēgu varat aizsargāt ar paroli ar openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Izvelieties personīgo sertifikātu" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Izvēlieties privāto atslēgu" @@ -3418,51 +3462,56 @@ msgid "_User certificate" msgstr "_Lietotāja sertifikāts" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Privātā _atslēga" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Privātās atslēgas parole" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "nederīgs EAP-TTLS CA sertifikāts: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "nederīgs EAP-TTLS CA sertifikāts: nav norādīts sertifikāts" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Vairs nebrīdināt" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nē" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Jā" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Nezināma kļūda validējot 802.1x drošību" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunelēts TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Protected EAP (PEAP)" @@ -3472,6 +3521,50 @@ msgid "Au_thentication" msgstr "Au_tentifikācija" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "rūkst leap lietotājvārda" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "trūkst leap paroles" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "trūkst wep atslēgas" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai heksadecimālus " +"skaitļus" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"nederīga wep atslēga: atslēga ar garumu %zu var saturēt tikai ascii " +"rakstzīmes" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"nederīga wep atslēga: nepareizs atslēgas garums %zu. Atslēgas garumam ir " +"jābūt vai nu 5/13 (ascii) vai 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "nederīga wep atslēga: parole nevar būt tukša" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "nederīga wep atslēga: parolei ir jābūt īsākai kā 64 rakstzīmes" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (noklusējuma)" @@ -3508,19 +3601,33 @@ msgid "WEP inde_x" msgstr "WEP inde_kss" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"nederīgs wpa-psk: nederīgs atslēgas garums %zu. Jābūt [8,63] baiti vai 64 " +"heksadecimālie cipari" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"nederīgs wpa-psk: nevar interpretēt atslēgu ar 64 baitiem kā heksadecimālu" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tips" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Ieslēgts" @@ -3557,16 +3664,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Ekrāna vair_ogā rādīt ziņojuma saturu" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Paziņojumi" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Pa‑zi‑ņo‑ju‑mi" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Nosakiet, kuri paziņojumi tiks parādīti, un kas tajos būs redzams" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Paziņojumi;Lentas;Ziņojums;Paplāte;Uznirstošais logs;" @@ -3584,80 +3692,69 @@ msgid "Applications" msgstr "Lietotnes" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Citi" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Pievienot kontu" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Pasts" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendārs" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakti" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Tērzēšana" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Resursi" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Kļūda, piesakoties kontā" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Pilnvaras termiņš ir beidzies." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Ierakstieties, lai aktivētu šo kontu." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "Ierak_stīties" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Kļūda, veidojot kontu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Kļūda, noņemot kontu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Vai tiešām vēlaties izņemt kontu?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Tas neizņems kontu no servera." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Izņemt" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Tiešsaistes konti" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Tiešsais‑tes konti" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Savienojieties ar saviem tiešsaistes kontiem un izvēlaties, kam tos izmantot" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3671,6 +3768,7 @@ msgstr "Nav konfigurēti tiešsaistes konti" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Izņemt kontu" @@ -3817,7 +3915,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Baterija" @@ -3865,101 +3963,102 @@ msgid "When _idle" msgstr "Kad _dīkstāvē" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Enerģijas taupīšana" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "Ekrāna gaišum_s" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Automātisks spilgtums" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "_Tastatūras gaišums" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "Pa_darīt ekrānu tumšāku, kad nav aktīvs" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "_Izslēgt ekrānu" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Izslēgt Wi-Fi, lai taupītu enerģiju." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "_Mobilā platjosla" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Izslēgt mobilo platjoslu (3G, 4G, LTE, utt.), lai taupītu enerģiju." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "Kad izmanto baterijas strāvu" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "Kad pieslēgts strāvai" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Iesnaudināt" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Iemidzināt" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Nedarīt neko" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "Iesnaudināšanas un izslēgšanas poga" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "_Automātiski iesnaudināt" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Automātiski iesnaudināt" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "_Kad ir nospiesta ieslēgšanas poga" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Ierīces" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Barošana" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Skatīt baterijas statusu un mainīt enerģijas taupīšanas iestatījumus" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4039,11 +4138,6 @@ msgid "Delay" msgstr "Aizture" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Atcelt" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autentificēt" @@ -4053,138 +4147,138 @@ msgstr "Nepieciešama autentifikācija" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Maz tonera" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Beidzies toneris" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Palicis maz attīstītāja" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Nav attīstītāja" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Palicis maz krāsas" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Beigusies krāsa" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Atvērts vāks" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Atvērtas durvis" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Maz papīra" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Beidzies papīrs" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Nesaistē" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Apturēts" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Atkritumu tvertne gandrīz pilna" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Atkritumu tvertne pilna" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "Optiskais gaismas vadītājs drīz būs jāmaina" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "Optiskais gaismas vadītājs vairs nefunkcionē" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Konfigurē" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Gatavs" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Nepieņem darbus" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "Apstrādā" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Tonera līmenis" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Tintes līmenis" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Krājumu līmenis" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Instalē" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4193,15 +4287,15 @@ msgstr[2] "%u aktīvi" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Neizdevās pievienot jaunu printeri." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Izvēlieties PPD datni" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4209,48 +4303,45 @@ "PostScript Printer Description datnes (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Nav atrasts piemērots draiveris" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Meklē ieteicamos draiverus…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "Izvēlēties no datubāzes…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Dot PPD datni…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Testa lapa" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Nav printeru" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Nevar ielādēt saskarni: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Printeri" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Pievienot printerus, skatīt printera darbus un izlemt, kā drukāt" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printeris;Rinda;Drukāt;Papīrs;Tinte;Toneris;Paper;Ink;" @@ -4412,6 +4503,11 @@ msgid "Parallel Port" msgstr "Paralēlais ports" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4624,13 +4720,17 @@ msgid "_Options" msgstr "_Opcijas" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Nav printeru" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Pievienot printeri" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4638,70 +4738,70 @@ "Diemžēl izskatās, ka sistēmas \n" "drukāšanas serviss nav pieejams." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Ekrāna bloķēšana" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Lietošanā" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Ieslēgts" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Izslēgts" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Atrašanās vietas pakalpojumi" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Lietojums un vēsture" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Iztukšot visu miskasti?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Viss miskastes saturs tiks neatgriezeniski dzēsts." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Iztīrīt atkritumus" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Dzēst visas pagaidu datnes?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Visas pagaidu datnes tiks pilnībā izdzēstas." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Izmest _pagaidu datnes" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Iztīrīt miskasti un pagaidu datnes" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Programmatūras izmantošana" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Problēma ziņojot" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4710,20 +4810,21 @@ "Tehnisku problēmu ziņojumu sūtīšana mums palīdz uzlabot %s. Ziņojumi tiek " "sūtīti anonīmi, un no tiem tiek iztīrīta visi personīgie dati." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Privātuma politika" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privātums" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Aizsargāt personīgo informāciju un noteikt, ko citi var redzēt" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4856,9 +4957,6 @@ msgstr "_Sūtīt programmatūras izmantošanas statistiku" #: ../panels/privacy/privacy.ui.h:43 -#| msgid "" -#| "Location services allow applications to determine your geographical " -#| "position. Accuracy is increased by enabling WiFi and GPS." msgid "" "Location services allow applications to know your location. Using Wi-Fi and " "mobile broadband increases accuracy." @@ -4898,21 +4996,21 @@ msgid "Other" msgstr "Citi" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Sesija jāpārstartē, lai izmaiņas stātos spēkā" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Pārstartēt tagad" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nav izvēlēts ievades avots" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Ierak_stīšanās ekrāns" @@ -4944,11 +5042,12 @@ msgid "Paper" msgstr "Papīrs" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Vieta un valoda" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4956,7 +5055,7 @@ "avotus" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Valoda;Izkārtojums;Tastatūra;Ievade;Language;Layout;Keyboard;Input;" @@ -5013,7 +5112,7 @@ msgstr "Kreisais+labais Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "Va_loda" @@ -5062,26 +5161,11 @@ msgstr "" "Ierakstīšanās iestatījumus izmanto visi lietotāji, kas ierakstās sistēmā" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Vietas" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Grāmatzīmes" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Cita" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Izvēlieties vietu" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Labi" @@ -5089,18 +5173,19 @@ msgid "No applications found" msgstr "Nav atrastu lietotņu" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Meklēt" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Noteikt, kuras lietotnes rāda meklēšanas rezultātus aktivitāšu pārskatā" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Meklēt;Atrast;Indekss;Rādītājs;Slēpt;Privātums;Rezultāti;" @@ -5108,6 +5193,18 @@ msgid "Search Locations" msgstr "Meklēšanas vietas" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Vietas" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Grāmatzīmes" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Citi" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Pārvietot augšup" @@ -5120,6 +5217,11 @@ msgid "Preferences" msgstr "Iestatījumi" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Koplietošanai nav izvēlētu tīklu" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5145,21 +5247,54 @@ msgid "Choose a Folder" msgstr "Izvēlieties mapi" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Personīgo datņu koplietošana ļauj jums dalīties ar savu publisko mapi ar " +"citiem jūsu pašreizējā tīklā, izmantojot dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Kad ir ieslēgta attālinātā ierakstīšanās, attālinātie lietotāji var " +"savienoties, izmantojot drošās čaulas komandu:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Ekrāna koplietošana ļaut attālinātiem lietotājiem kontrolēt jūsu ekrānu, " +"savienojoties ar: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopēt" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Koplietošana" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Kop‑lie‑to‑ša‑na" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Nosaka, ar kādu informāciju dalīties ar citiem cilvēkiem" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5167,6 +5302,10 @@ "koplietot;dalīties;ssh;dators;hosts;nosaukums;attālināti;darbvirsma;datu " "nesējs;audio;video;attēli;bildes;fotogrāfijas;filmas;serveris;renderētājs;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Tīkli" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Aktivēt vai deaktivēt attālināto ierakstīšanos" @@ -5177,25 +5316,13 @@ "Lai aktivētu vai deaktivētu attālināto ierakstīšanos, nepieciešama " "autentifikācija" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Koplietošanai nav izvēlētu tīklu" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Tīkli" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Datora nosaukums" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Personiskā datņu koplietošana" +msgid "_File Sharing" +msgstr "_Datņu koplietošana" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5214,85 +5341,54 @@ msgstr "Daži pakalpojumi ir deaktivēti, jo nav pieejas tīklam." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Personiskā datņu koplietošana" +msgid "File Sharing" +msgstr "Datņu koplietošana" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Personīgo datņu koplietošana ļauj jums dalīties ar savu publisko mapi ar " -"citiem jūsu pašreizējā tīklā, izmantojot dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Piep_rasīt paroli" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Attālinātā ierakstīšanās" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Atļaut attālinātiem lietotājiem savienoties, izmantojot drošās čaulas " -"komandu:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Ekrāna koplietošana" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Atļaut attālinātiem lietotājiem kontrolēt jūsu ekrānu, savienojoties ar: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Atļaut attālināto vadību" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Ļ_aut savienojumiem kontrolēt ekrānu" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Parole:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Rādīt paroli" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Piekļuves opcijas" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Jau_najiem savienojumiem jālūdz piekļuve" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Piep_rasīt paroli" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Multimediju koplietošana" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Multimediju koplietošana ļauj jums dalīties tīklā ar mūziku, fotogrāfijām un " -"video." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Dalīties tīklā ar mūziku, fotogrāfijām un video." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Mapes" @@ -5424,11 +5520,6 @@ msgid "Peak detect" msgstr "Pīķu noteikšana" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nosaukums" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Ierīce" @@ -5523,16 +5614,21 @@ msgid "Subwoofer" msgstr "Zemfrekvences reproduktors" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Pielāgots" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Uni‑ver‑sā‑lā pie‑kļu‑ve" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Padarīt vienkāršāku redzēšanu, dzirdēšanu, rakstīšanu un klikšķināšanu" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5632,8 +5728,8 @@ msgstr "_Skaņas taustiņi" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pīkstēt, kad ir ieslēgti Num Lock vai Caps Lock taustiņi." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pīkstēt, kad ir ieslēgti vai izslēgti Num Lock vai Caps Lock taustiņi." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6014,95 +6110,67 @@ msgstr "Krāsu efekti" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Pievienot lietotāju" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Vārds un uzvārds" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standarta" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administratora" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Vārds un uzvārds" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Konta _tips" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Ļaut _lietotājam izvēlēties paroli nākamajā ierakstīšanās reizē" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Iestatīt paroli _tagad" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Pārbaudīt" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Apstiprināt" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Uzņēmuma ierakstīšanās ļauj uz šīs ierīces izmantot esošus, centrāli " -"pārvaldītus lietotāju kontus." +"pārvaldītus lietotāju kontus. Jūs varat arī izmantot šo kontu, lai piekļūtu " +"uzņēmuma resursiem internetā." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domēns" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Dodieties tiešsaistē, lai\n" -"pievienotu uzņēmuma kontus." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Uzņēmuma ierakstīšanās" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Pievienot lietotāju" +msgid "You are Offline" +msgstr "Jūs esat nesaistē" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "R_eģistrēt" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Domēna administratora ierakstīšanās" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Lai izmantotu uzņēmuma ierakstīšanos, datoram jābūt\n" -"reģistrētam domēnā. Tīkla administratoram šeit jāievada\n" -"sava domēna parole." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Administratora _vārds" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Jums jābūt tiešsaistē, lai pievienotu uzņēmuma kontus." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Administratora parole" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Uzņēmuma ierakstīšanās" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6137,7 +6205,7 @@ msgstr "Labais mazais pirkstiņš" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Aktivēt ierakstīšanos ar pirkstu nospiedumu" @@ -6176,9 +6244,32 @@ "Lietotājs;Vārds;Pirkstu nospiedumi;Avatar;Logo;Seja;Parole;Login;Name;" "Fingerprint;Face;Password;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Ierakstīšanās vēsture" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "R_eģistrēt" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Domēna administratora ierakstīšanās" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Lai izmantotu uzņēmuma ierakstīšanos, datoram jābūt\n" +"reģistrētam domēnā. Tīkla administratoram šeit jāievada\n" +"sava domēna parole." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Administratora _vārds" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Administratora parole" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6201,38 +6292,30 @@ msgstr "Pašreizējā _parole" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Ļaut lietotājam izvēlēties paroli nākamajā ierakstīšanās reizē" +msgid "Allow user to change their password on next login" +msgstr "Ļaut lietotājam mainīt paroli nākamajā ierakstīšanās reizē" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Iestatīt paroli tagad" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Pievienot lietotāja kontu" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Izņemt lietotāja kontu" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Pievienot lietotāju…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Ierakstīšanās opcijas" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomātiskā ierakstīšanās" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Ierakstīšanās ar pirkstu nospiedumu" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Lietotāja ikona" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Pēdējā ierakstīšanās" @@ -6335,9 +6418,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" -"Jauciet kopā mazos un lielos burtus, kā arī izmantojiet kādus skaitļus." +"Jauciet kopā mazos un lielos burtus, kā arī mēģiniet izmantot kādus skaitļus." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6428,32 +6511,32 @@ msgstr "Nezināma kļūda" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Jāatbilst konta sniedzēja tīmekļa adresei." +msgid "Should match the web address of your login provider." +msgstr "Jāatbilst ierakstīšanās pakalpojuma sniedzēja tīmekļa adresei." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Neizdevās pievienot kontu" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Paroles nesakrīt." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Neizdevās reģistrēt kontu" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nav atbalstīta autentificēšanās veida šim domēnam" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Neizdevās pievienoties domēnam" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6461,7 +6544,7 @@ "Šis lietotājvārds nenostrādāja.\n" "Lūdzu, mēģiniet vēlreiz." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6469,14 +6552,24 @@ "Šī parole nenostrādāja.\n" "Lūdzu, mēģiniet vēlreiz." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Neizdevās ierakstīties domēnā" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Nevar atrast domēnu. Varbūt tas ir nepareizi uzrakstīts?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standarta" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administratora" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6495,15 +6588,15 @@ msgid "Enabled" msgstr "Aktivēts" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Dzēst reģistrētos pirkstu nospiedumus?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Dzēst pirkstu nospiedumus" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6511,15 +6604,15 @@ "Vai vēlaties dzēst reģistrētos pirkstu nospiedumus, lai ierakstīšanās ar " "pirkstu nospiedumiem tiktu atslēgta?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Darīts!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Neizdevās piekļūt ierīcei '%s'" @@ -6527,16 +6620,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Neizdevās sākt pirkstu nospieduma tveršanu uz ierīces '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Neizdevās piekļūt pirkstu nospiedumu lasītājam" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Lūdzu, prasiet palīdzību savam sistēmas administratoram." @@ -6545,7 +6638,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6554,11 +6647,11 @@ "Lai ieslēgtu ierakstīšanos ar pirkstu nospiedumiem, jums jāsaglabā sava " "pirksta nospiedums, izmantojot ierīci '%s'." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Pirksta izvēle" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Pirkstu nospiedumu ievade" @@ -6612,14 +6705,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sesija beidzās" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sesija sākās" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - konta aktivitāte" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Lūdzu, izvēlieties citu paroli." @@ -6681,7 +6781,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Neizdevās savienoties ar domēnu %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Citi konti" @@ -6761,15 +6861,15 @@ msgid "Logged in" msgstr "Ierakstījās kā" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Neizdevās sazināties ar kontu servisu" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Lūdzu, pārbaudiet, vai AccountService ir instalēts un aktivēts." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6777,12 +6877,12 @@ "Lai veiktu izmaiņas,\n" "vispirms klikšķiniet uz * ikonas" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Izveidot lietotāja kontu" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6790,12 +6890,12 @@ "Lai izveidotu lietotāja kontu,\n" "vispirms klikšķiniet uz * ikonas" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Dzēst izvēlēto lietotāja kontu" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6803,33 +6903,32 @@ "Lai dzēstu izvēlēto lietotāja kontu,\n" "vispirms klikšķiniet uz * ikonas" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mans konts" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Lietotājs ar lietotājvārdu “%s” jau eksistē." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Diemžēl šis lietotājvārds nav pieejams. Lūdzu, mēģiniet citu." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Lietotājvārds ir pārāk garš." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Lietotājvārds nedrīkst sākties ar “-”." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Lietotājvārds drīkst saturēt tikai lielos un mazos burtus no a–z, ciparus un " -"jebkuru no rakstzīmēm “.”, “-”, “_”." +"šīs rakstzīmes: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "To izmantos, lai nosauktu mājas mapi un to nevar mainīt." @@ -6918,18 +7017,18 @@ msgid "Button" msgstr "Poga" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom planšete" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wacom plan‑še‑te" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Iestatiet pogu attēlojumus un pielāgojiet irbuļa jutīgumu grafikas planšetēm" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Planšete;Wacom;Irbulis;Dzēšgumija;Pele;Tablet;Stylus;Eraser;Mouse;" @@ -6961,6 +7060,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth iestatījumi" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom planšete" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Attēlot uz monitora…" @@ -7054,22 +7157,22 @@ msgid "Mode Switch #%d" msgstr "Režīma slēdzis #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Kreisā poga #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Labā poga #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Augšējā poga #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Apakšējā poga #%d" @@ -7146,6 +7249,11 @@ msgid "Tip Pressure Feel" msgstr "Gala spiediena jušana" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Visi iestatījumi" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME vadības centrs" @@ -7202,22 +7310,18 @@ msgid "Quit" msgstr "Iziet" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Visi iestatījumi" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personisks" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Aparatūra" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistēma" @@ -7256,3 +7360,180 @@ msgid "Cancel search" msgstr "Atcelt meklēšanu" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Tīklājs" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ " %s tastatūras saīsne. Ievadiet jaunu saīsni, lai to mainītu." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Lai rediģētu saīsni, klikšķiniet rindā, tad spiediet jaunos taustiņus vai " +#~ "lietojiet Backspace taustiņu dzēšanai." + +#~ msgid "Color" +#~ msgstr "Krāsas" + +#~ msgid "_Name:" +#~ msgstr "_Nosaukums:" + +#~ msgid "Remove Shortcut" +#~ msgstr "Izņemt saīsni" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Saīsni \"%s\" nevar izmantot, jo tas apgrūtinās rakstīšanu.\n" +#~ "Lūdzu, mēģiniet lietot šo taustiņu kopā ar Control, Alt vai Shift." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Saīsne \"%s\" jau tiek lietota\n" +#~ " \"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Ja pārdefinēsiet saīsni par \"%s\", saīsne \"%s\" tiks deaktivēta." + +#~ msgid "_Reassign" +#~ msgstr "Pā_rdefinēt" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "“%s” saīsnei ir saistītā saīsne “%s”. Vai vēlaties to automātiski " +#~ "iestatīt uz “%s”?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "“%s” pašlaik ir asociēts ar “%s”, ja iesiet tālāk, šī saīsne tiks " +#~ "izslēgta." + +#~ msgid "_Assign" +#~ msgstr "_Piešķirt" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Sajūgt" + +#~ msgid "Bridge" +#~ msgstr "Tilts" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Neizdevās ielādēt VPN spraudņus" + +#~ msgid "Add Network Connection" +#~ msgstr "Pievienot tīkla savienojumu" + +#~ msgid "Bond slaves" +#~ msgstr "Bond sekotāji" + +#~ msgid "(none)" +#~ msgstr "(nekas)" + +#~ msgid "Bridge slaves" +#~ msgstr "Tilta sekotāji" + +#~ msgid "Team slaves" +#~ msgstr "Sajūga sekotāji" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand ierīce neatbalsta savietoto režīmu" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nav izvēlēts sertificēšanas institūcijas (CA) sertifikāts" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Sertificēšanas institūcijas (CA) sertifikāta neizmantošanas rezultātā var " +#~ "savienoties ar nedrošiem vai blēžu bezvadu tīkliem. Vai vēlaties " +#~ "izvēlieties sertificēšanas institūcijas sertifikātu?" + +#~ msgid "Ignore" +#~ msgstr "Ignorēt" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Izvēlieties CA sertifikātu" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Katru reizi prasīt paroli" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Vairs nebrīdināt" + +#~ msgid "No" +#~ msgstr "Nē" + +#~ msgid "Yes" +#~ msgstr "Jā" + +#~ msgid "Error logging into the account" +#~ msgstr "Kļūda, piesakoties kontā" + +#~ msgid "Credentials have expired." +#~ msgstr "Pilnvaras termiņš ir beidzies." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Ierakstieties, lai aktivētu šo kontu." + +#~ msgid "_Sign In" +#~ msgstr "Ierak_stīties" + +#~ msgid "Power" +#~ msgstr "Barošana" + +#~ msgid "Privacy" +#~ msgstr "Privātums" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Cita" + +#~ msgid "Personal File Sharing" +#~ msgstr "Personiskā datņu koplietošana" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Atļaut attālināto vadību" + +#~ msgid "_Verify" +#~ msgstr "_Pārbaudīt" + +#~ msgid "Login History" +#~ msgstr "Ierakstīšanās vēsture" + +#~ msgid "Add User Account" +#~ msgstr "Pievienot lietotāja kontu" + +#~ msgid "Remove User Account" +#~ msgstr "Izņemt lietotāja kontu" + +#~ msgid "Login Options" +#~ msgstr "Ierakstīšanās opcijas" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Lietotājs ar lietotājvārdu “%s” jau eksistē." diff -Nru gnome-control-center-3.20.2/po/mai.po gnome-control-center-3.22.1/po/mai.po --- gnome-control-center-3.20.2/po/mai.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/mai.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2009-03-15 16:11+0530\n" "Last-Translator: Sangeeta Kumari \n" "Language-Team: Maithili \n" +"Language: mai\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/mg.po gnome-control-center-3.22.1/po/mg.po --- gnome-control-center-3.20.2/po/mg.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/mg.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2009-01-16 16:42+0300\n" "Last-Translator: Thierry Randrianiriana \n" "Language-Team: Malagasy \n" +"Language: mg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/mk.po gnome-control-center-3.22.1/po/mk.po --- gnome-control-center-3.20.2/po/mk.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/mk.po 2016-08-12 12:43:57.000000000 +0000 @@ -20,6 +20,7 @@ "PO-Revision-Date: 2011-12-10 20:46+0100\n" "Last-Translator: Jovan N\n" "Language-Team: Macedonian \n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/mn.po gnome-control-center-3.22.1/po/mn.po --- gnome-control-center-3.20.2/po/mn.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/mn.po 2016-08-12 12:43:57.000000000 +0000 @@ -14,6 +14,7 @@ "PO-Revision-Date: 2006-08-16 00:49+0200\n" "Last-Translator: Badral \n" "Language-Team: Mongolian \n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/nb.po gnome-control-center-3.22.1/po/nb.po --- gnome-control-center-3.20.2/po/nb.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/nb.po 2016-08-12 12:43:57.000000000 +0000 @@ -7,13 +7,13 @@ # Åka Sikrom , 2014-2015. msgid "" msgstr "" -"Project-Id-Version: gnome-control-center 3.20.x\n" +"Project-Id-Version: gnome-control-center 3.21.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-03 22:47+0200\n" -"PO-Revision-Date: 2016-05-03 22:56+0200\n" +"POT-Creation-Date: 2016-05-03 22:57+0200\n" +"PO-Revision-Date: 2016-05-03 23:00+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" -"Language: Norwegian bokmål\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -105,8 +105,8 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2205 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 #: ../panels/network/connection-editor/connection-editor.ui.h:1 #: ../panels/network/connection-editor/vpn-helpers.c:250 @@ -154,16 +154,17 @@ msgid "Current background" msgstr "Gjeldende bakgrunn" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Bakgrunn" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Bak-grunn" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Bytt bakgrunnsbilde" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Bakgrunn;Skjerm;Skrivebord;" @@ -203,18 +204,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Slå av flymodus bryteren for å slå på Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue-tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Slå av/på bluetooth og koble til enheter" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "del;deling;bluetooth;obex;" @@ -844,17 +844,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Farge" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Far-ge" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Kalibrer farger for enheter som f.eks. skjermer, kamera eller skrivere" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Farge;ICC;Profil;Kalibrer;Skriver;Skjerm;" @@ -1008,8 +1009,9 @@ msgid "December" msgstr "Desember" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Dato og klokkeslett" @@ -1066,12 +1068,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Endra dato og klokkeslett - inklusive tidssone" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Klokke;Tidssone;Plassering;Adresse;" @@ -1083,21 +1085,21 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Du må autentisere deg for å endre innstillinger for tid og dato." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Lokk lukket" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Speilet" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primær" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 #: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 #: ../panels/privacy/cc-privacy-panel.c:172 @@ -1111,180 +1113,185 @@ msgid "Off" msgstr "Av" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekundær" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Organiser sammenslåtte skjermer" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Bruk" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Dra skjermer for å omorganisere dem" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1792 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1798 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2258 msgid "Rotate counterclockwise by 90°" msgstr "Roter mot klokken med 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2276 msgid "Rotate by 180°" msgstr "Roter med 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2294 msgid "Rotate clockwise by 90°" msgstr "Roter med klokken med 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2315 msgid "Size" msgstr "Størrelse" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2330 msgid "Aspect Ratio" msgstr "Høyde-/breddeforhold" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2353 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Oppløsning" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Juster for TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Oppfriskingshastighet" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Vis topplinjen og aktivitetsoversikten på denne skjermen" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Sekundær skjerm" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" "Slå sammen denne skjermen med en annen for å lage et ekstra arbeidsområde" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentasjon" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Vis kun lysbildeserier og medier" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Speil" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Vis eksisterende visning på begge skjermer" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Slå av" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Ikke bruk denne skjermen" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Fant ikke informasjon om skjermen" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Org_aniser sammenslåtte skjermer" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Skjermer" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Skjer-mer" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Velg hvordan tilkoblede skjermer og prosjektorer skal brukes" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Prosjektor;xrandr;Skjerm;Oppløsning;Oppdater;Skjerm;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:127 msgid "Unknown" msgstr "Ukjent" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:433 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:435 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1115 msgid "Ask what to do" msgstr "Spør hva som skal gjøres" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1119 msgid "Do nothing" msgstr "Ikke gjør noe" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1123 msgid "Open folder" msgstr "Åpne mappe" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1214 msgid "Other Media" msgstr "Annet medie" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1245 msgid "Select an application for audio CDs" msgstr "Velg et program for lyd-CDer" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1246 msgid "Select an application for video DVDs" msgstr "Velg et program for video-DVDer" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1247 msgid "Select an application to run when a music player is connected" msgstr "Velg et program som skal kjøres når en musikkavspiller kobles til" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1248 msgid "Select an application to run when a camera is connected" msgstr "Velg et program som skal kjøres når et kamera kobles til" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1249 msgid "Select an application for software CDs" msgstr "Velg et program for programvare-CDer" @@ -1293,88 +1300,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1261 msgid "audio DVD" msgstr "Lyd-DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1262 msgid "blank Blu-ray disc" msgstr "Tom Blu-ray-plate" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1263 msgid "blank CD disc" msgstr "Tom CD-plate" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1264 msgid "blank DVD disc" msgstr "Tom DVD-plate" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1265 msgid "blank HD DVD disc" msgstr "tom HD-DVD plate" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1266 msgid "Blu-ray video disc" msgstr "Blu-ray videoplate" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1267 msgid "e-book reader" msgstr "E-bokleser" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1268 msgid "HD DVD video disc" msgstr "HD-DVD-videoplate" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1269 msgid "Picture CD" msgstr "Bilde-CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1270 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1271 msgid "Video CD" msgstr "Video-CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1272 msgid "Windows software" msgstr "Windows programvare" -#: ../panels/info/cc-info-panel.c:1435 +#: ../panels/info/cc-info-panel.c:1395 #: ../panels/keyboard/keyboard-shortcuts.c:1949 msgid "Section" msgstr "Seksjon" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Oversikt" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Forvalgte programmer" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Avtagbare medier" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1440 #, c-format msgid "Version %s" msgstr "Versjon %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Detaljer" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "De-taljer" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Vis informasjon om systemet" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1622,7 +1628,6 @@ msgstr "Lås skjerm" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Universell tilgang" @@ -1689,16 +1694,17 @@ msgid "Modifiers-only switch to next source" msgstr "Bytt til neste kilde kun med endringstaster" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastatur" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tast-atur" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Vis og bytt tastatursnarveier, og endre skriveoppsett" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Snarvei;Repetisjon;Blinking;" @@ -1795,11 +1801,12 @@ msgid "Test Your _Settings" msgstr "Test inn_stillinger" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Mus og pekeplate" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1807,7 +1814,7 @@ "venstrehendt" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Styrepute;Peker;Klikk;Tapp;Dobbel;Knapp;Styrekule;Rull;" @@ -2060,6 +2067,11 @@ msgid "Excellent" msgstr "Utmerket" +#: ../panels/network/connection-editor/ce-page-details.c:240 +#: ../panels/network/network-wifi.ui.h:46 +msgid "Details" +msgstr "Detaljer" + #: ../panels/network/connection-editor/ce-page-ethernet.c:228 #: ../panels/network/connection-editor/ce-page-vpn.c:222 #: ../panels/network/connection-editor/ce-page-wifi.c:262 @@ -2530,17 +2542,17 @@ msgid "Make available to _other users" msgstr "Gjør tilgjengelig for _andre brukere" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Nettverk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Nett-verk" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Kontroller hvordan du kobler til internett" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" "vlan;bridge;bond;DNS;" @@ -2709,6 +2721,10 @@ msgid "Provider" msgstr "Tilbyder" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Nettverk" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -3534,16 +3550,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Vis meldingsinnh_old på låseskjerm" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Varslinger" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Va-rs-li-ng-er" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Kontroller hvilke varslinger som vises og hva de viser" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Varslinger;Banner;Melding;Trau;Oppsprett;" @@ -3624,16 +3641,17 @@ msgid "_Remove" msgstr "Fje_rn" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Nettkontoer" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Nett-kontoer" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Koble til nettkontoer og bestem hva de skal brukes til" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3788,7 +3806,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2325 msgid "Battery" msgstr "Batteri" @@ -3888,49 +3906,50 @@ msgid "When plugged in" msgstr "Når den er koblet til strøm" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2026 msgid "Suspend" msgstr "Hvilemodus" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2027 msgid "Hibernate" msgstr "Dvalemodus" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2028 msgid "Nothing" msgstr "Ingenting" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2142 msgid "Suspend & Power Button" msgstr "Hvilemodus og strømknapp" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2185 msgid "_Automatic suspend" msgstr "_Automatisk hvilemodus" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2186 msgid "Automatic suspend" msgstr "Automatisk hvilemodus" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2253 msgid "_When the Power Button is pressed" msgstr "_Når strømknappen trykkes" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2379 msgid "Devices" msgstr "Enheter" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Strøm" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Str-øm" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Vis batteristatus og endre innstillinger for strømsparing" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4194,33 +4213,34 @@ msgstr "Oppgi en PPD-fil …" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2613 +#: ../panels/printers/cc-printers-panel.c:2636 msgid "Test page" msgstr "Testside" -#: ../panels/printers/cc-printers-panel.c:2743 +#: ../panels/printers/cc-printers-panel.c:2749 msgid "No printers" msgstr "Ingen skrivere" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3095 #, c-format msgid "Could not load ui: %s" msgstr "Klarte ikke å laste brukergrensesnitt: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Skrivere" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Skriv-ere" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Legg til skrivere, vis utskriftsjobber og bestem hvordan du ønsker å skrive " "ut" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Skriver;Kø;Utskrift;Papir;Blekk;Toner;" @@ -4382,6 +4402,11 @@ msgid "Parallel Port" msgstr "Parallellport" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4683,16 +4708,17 @@ msgid "Privacy Policy" msgstr "Personvernregler" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Personvern" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Per-son-vern" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Beskytt personlig informasjon og kontroller hva andre kan se" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4828,7 +4854,9 @@ msgid "" "Location services allow applications to know your location. Using Wi-Fi and " "mobile broadband increases accuracy." -msgstr "Stedstjenester lar programmer få vite din plassering. Bruk av trådløse nettverk og mobilt bredbånd øker nøyaktigheten." +msgstr "" +"Stedstjenester lar programmer få vite din plassering. Bruk av trådløse " +"nettverk og mobilt bredbånd øker nøyaktigheten." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4907,17 +4935,18 @@ msgid "Paper" msgstr "Papir" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Region og språk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Re-gion og sp-råk" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Velg språk for visning, formater, tastaturutforminger og inndatakilder" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Språk;Utforming;Tastatur;Inndata;" @@ -5050,18 +5079,19 @@ msgid "No applications found" msgstr "Fant ingen programmer" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Søk" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Kontroller hvilke programmer som viser resultater i aktivitetsoversikten" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Søk;finn;Indeks;Skjul;Personvern;Resultater;" @@ -5138,16 +5168,20 @@ msgstr "Kopier" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Deling" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Del-ing" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Kontroller hva du vil dele med andre" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5480,12 +5514,17 @@ msgid "Custom" msgstr "Egendefinert" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Uni-ver-sell tilgang" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Gjør det lettere å se, høre, skrive og peke og klikke" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5583,8 +5622,8 @@ msgstr "Lydtaster" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pip når Num Lock eller Caps Lock slås på." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pip når Num Lock eller Caps Lock slås på eller av." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6865,17 +6904,17 @@ msgid "Button" msgstr "Knapp" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom pekeplate" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa-com peke-plate" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "Tilordne knapper og juster følsomhet for penn for grafiske tegnebrett" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tegnebrett;Wacom;Stylus;Viskelær;Mus;" @@ -6907,6 +6946,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-innstillinger" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom pekeplate" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Knytt til skjerm …" diff -Nru gnome-control-center-3.20.2/po/nds.po gnome-control-center-3.22.1/po/nds.po --- gnome-control-center-3.20.2/po/nds.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/nds.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2009-11-23 00:53+0100\n" "Last-Translator: Nils-Christoph Fiedler \n" "Language-Team: Low German \n" +"Language: nds\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/nl.po gnome-control-center-3.22.1/po/nl.po --- gnome-control-center-3.20.2/po/nl.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/nl.po 2016-08-12 12:43:57.000000000 +0000 @@ -23,10 +23,11 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-01 23:04+0200\n" -"PO-Revision-Date: 2016-06-01 23:14+0200\n" -"Last-Translator: Reinout van Schouwen \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-06-01 15:12+0000\n" +"PO-Revision-Date: 2016-06-01 22:48+0200\n" +"Last-Translator: Justin van Steijn \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -108,7 +109,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Persoonlijke map" @@ -125,25 +126,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1309 +#: ../panels/network/net-device-wifi.c:1510 #: ../panels/network/network-wifi.ui.h:1 #: ../panels/printers/cc-printers-panel.c:2052 #: ../panels/printers/new-printer-dialog.ui.h:2 #: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 #: ../panels/user-accounts/data/account-dialog.ui.h:17 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 +#: ../panels/user-accounts/um-account-dialog.c:1472 #: ../panels/user-accounts/um-fingerprint-dialog.c:266 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 @@ -175,16 +175,17 @@ msgid "Current background" msgstr "Huidige achtergrond" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Achtergrond" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Achtergrond wijzigen in een achtergrondafbeelding of foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;Screen;Desktop;Achtergrond;Scherm;Bureaublad;" @@ -225,18 +226,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Vliegtuigstand uitschakelen om Bluetooth mogelijk te maken." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Bluetooth aan- en uitzetten en uw apparaten aansluiten" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;delen;" @@ -407,7 +407,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:419 msgid "All files" msgstr "Alle bestanden" @@ -450,7 +450,7 @@ msgstr "Profiel opslaan" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Opslaan" @@ -719,12 +719,11 @@ msgid "_Import File…" msgstr "Bestand _importeren…" -#: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +#: ../panels/network/connection-editor/net-connection-editor.c:543 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/um-account-dialog.c:1473 msgid "_Add" msgstr "_Toevoegen" @@ -876,11 +875,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Kleur" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -888,7 +888,7 @@ "kalibreren" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Color;ICC;Profile;Calibrate;Printer;Display;Kleur;Kalibreren;Weergave;" @@ -907,12 +907,12 @@ msgstr "Er zijn geen talen aangetroffen" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Vandaag" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Gisteren" @@ -1042,8 +1042,9 @@ msgid "December" msgstr "December" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Datum en tijd" @@ -1102,12 +1103,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Datum en tijd, inclusief tijdzone, wijzigen" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Clock;Timezone;Location;Klok;Tijdzone;Locatie;" @@ -1121,23 +1122,23 @@ "Om de datum en tijd van het systeem te wijzigen dient u zich te " "authenticeren." -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Deksel gesloten" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Gespiegeld" -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2430 msgid "Primary" msgstr "Primair" -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 #: ../panels/privacy/cc-privacy-panel.c:172 #: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 @@ -1149,185 +1150,190 @@ msgid "Off" msgstr "Uit" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundair" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Gecombineerde schermen rangschikken" -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Toepassen" -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Schermen slepen om ze te rangschikken" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "90° linksom draaien" -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "180° draaien" -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "90° rechtsom draaien" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Grootte" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Beeldverhouding" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolutie" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2375 +msgid "Adjust for TV" +msgstr "Aanpassen aan tv" + +#: ../panels/display/cc-display-panel.c:2399 msgid "Refresh Rate" msgstr "Verversingsfrequentie" -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2431 msgid "Show the top bar and Activities Overview on this display" msgstr "Menubalk en activiteitenoverzicht op het scherm tonen" -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2437 msgid "Secondary Display" msgstr "Secundaire scherm" -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2438 msgid "Join this display with another to create an extra workspace" msgstr "" "Dit scherm met een ander scherm samenvoegen om extra werkruimte te krijgen" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2445 msgid "Presentation" msgstr "Presentatie" -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2446 msgid "Show slideshows and media only" msgstr "Alleen diavoorstellingen en media tonen" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2451 msgid "Mirror" msgstr "Spiegelen" -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2452 msgid "Show your existing view on both displays" msgstr "Huidige beeld op beide schermen tonen" -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2458 msgid "Turn Off" msgstr "_Uitschakelen" # 'display' hier ook maar als scherm vertaald (RvS) -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2459 msgid "Don't use this display" msgstr "Dit scherm niet gebruiken" # beeldscherm -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2770 msgid "Could not get screen information" msgstr "Kon informatie over het scherm niet verkrijgen" -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2801 msgid "_Arrange Combined Displays" msgstr "_Gecombineerde schermen rangschikken" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Schermen" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Kiezen hoe aangesloten beeldschermen en projectoren gebruikt worden" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Paneel;Scherm;" "Resolutie;Ververs;Beeld;Beamer;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Onbekend" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:433 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:435 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1115 msgid "Ask what to do" msgstr "Vragen wat te doen" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1119 msgid "Do nothing" msgstr "Niets doen" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1123 msgid "Open folder" msgstr "Map openen" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1214 msgid "Other Media" msgstr "Andere media" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1245 msgid "Select an application for audio CDs" msgstr "Selecteer een toepassing voor audio-cd's" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1246 msgid "Select an application for video DVDs" msgstr "Selecteer een toepassing voor video-dvd's" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1247 msgid "Select an application to run when a music player is connected" msgstr "" "Selecteer de te starten toepassing als een muziekspeler wordt aangesloten" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1248 msgid "Select an application to run when a camera is connected" msgstr "Selecteer de te starten toepassing als een camera wordt aangesloten" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1249 msgid "Select an application for software CDs" msgstr "Selecteer een toepassing voor software-cd's" @@ -1336,89 +1342,88 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1261 msgid "audio DVD" msgstr "audio-dvd" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1262 msgid "blank Blu-ray disc" msgstr "lege Blu-ray-schijf" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1263 msgid "blank CD disc" msgstr "lege cd" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1264 msgid "blank DVD disc" msgstr "lege dvd" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1265 msgid "blank HD DVD disc" msgstr "lege hd-dvd" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1266 msgid "Blu-ray video disc" msgstr "Blu-ray-videoschijf" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1267 msgid "e-book reader" msgstr "e-book-lezer" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1268 msgid "HD DVD video disc" msgstr "Hd-dvd-videoschijf" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1269 msgid "Picture CD" msgstr "Foto-cd" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1270 msgid "Super Video CD" msgstr "Super-video-cd" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1271 msgid "Video CD" msgstr "Video-cd" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1272 msgid "Windows software" msgstr "Windows-software" -#: ../panels/info/cc-info-panel.c:1435 +#: ../panels/info/cc-info-panel.c:1395 #: ../panels/keyboard/keyboard-shortcuts.c:1949 msgid "Section" msgstr "Sectie" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Overzicht" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Standaardtoepassingen" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Verwijderbare media" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1440 #, c-format msgid "Version %s" msgstr "Versie %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Details" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Systeeminformatie bekijken" # The user can search on this keywords. Thereby we chose to let the translation contain both English and Dutch words. #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1668,7 +1673,6 @@ msgstr "Scherm vergrendelen" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Universele toegang" @@ -1735,16 +1739,17 @@ msgid "Modifiers-only switch to next source" msgstr "\"Modifiers-only\"-schakeling naar volgende bron" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" msgstr "Toetsenbord" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Sneltoetsen bekijken en wijzigen en typvoorkeuren instellen" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Shortcut;Repeat;Blink;Sneltoets;Herhalen;Knipperen;" @@ -1845,11 +1850,12 @@ msgid "Test Your _Settings" msgstr "Uw instellingen _testen" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Muis en touchpad" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1857,7 +1863,7 @@ "kiezen" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;Aanwijzer;Klik;Tik;" @@ -1956,11 +1962,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "_Vliegtuigstand" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Netwerkproxy" @@ -1968,17 +1974,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:282 +#: ../panels/network/net-vpn.c:439 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Oeps! Er ging iets mis. Neem contact op met uw softwareleverancier." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Netwerkbeheer moet draaien." @@ -2011,64 +2017,64 @@ msgid "page 2" msgstr "pagina 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:460 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Beveiliging" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "Automatisch" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profiel %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:213 +#: ../panels/network/net-device-wifi.c:389 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:217 +#: ../panels/network/net-device-wifi.c:394 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:221 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:226 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:231 +#: ../panels/network/net-device-wifi.c:379 msgctxt "Wifi security" msgid "None" msgstr "Geen" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nooit" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:484 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2076,130 +2082,135 @@ msgstr[1] "%i dagen geleden" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:541 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:570 msgctxt "Signal strength" msgid "None" msgstr "Geen" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:572 msgctxt "Signal strength" msgid "Weak" msgstr "Zwak" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:574 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:576 msgctxt "Signal strength" msgid "Good" msgstr "Goed" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:578 msgctxt "Signal strength" msgid "Excellent" msgstr "Uitstekend" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:236 +#: ../panels/network/network-wifi.ui.h:46 +msgid "Details" +msgstr "Details" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:215 +#: ../panels/network/connection-editor/ce-page-wifi.c:225 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identiteit" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adres" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Netmasker" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Adres verwijderen" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 msgid "Add" msgstr "Toevoegen" -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS-server verwijderen" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrisch" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Route verwijderen" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatisch (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 #: ../panels/privacy/cc-privacy-panel.c:199 msgid "Manual" msgstr "Handmatig" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Alleen Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Voorvoegsel" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 @@ -2208,47 +2219,47 @@ msgid "Automatic" msgstr "Automatisch" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatisch, alleen DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:893 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:89 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Resetten" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Geen" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bit Key (Hex of ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bit wachtwoord" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:405 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamische WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2263,30 +2274,30 @@ msgstr "Verbindingssnelheid" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-adres" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-adres" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardware-adres" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2296,7 +2307,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2427,43 +2438,23 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:293 msgid "Unable to open connection editor" msgstr "Openen van verbindingseditor mislukt" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:311 msgid "New Profile" msgstr "Nieuw profiel" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:608 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Kon plug-ins voor VPN niet laden" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:790 msgid "Import from file…" msgstr "Uit bestand importeren…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 +#: ../panels/network/connection-editor/net-connection-editor.c:861 msgid "Add Network Connection" msgstr "Netwerkverbinding toevoegen" @@ -2473,7 +2464,7 @@ msgstr "_Resetten" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 +#: ../panels/network/net-device-wifi.c:1511 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Vergeten" @@ -2499,11 +2490,11 @@ msgid "S_ecurity" msgstr "_Beveiliging" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Kan VPN-verbinding niet importeren" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2516,36 +2507,36 @@ "\n" "Fout: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Het te importeren bestand selecteren" -#: ../panels/network/connection-editor/vpn-helpers.c:251 +#: ../panels/network/connection-editor/vpn-helpers.c:182 #: ../panels/printers/cc-printers-panel.c:2053 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Openen" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Er bestaat al een bestand met de naam ‘%s’." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Vervangen" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Wilt u %s vervangen door de VPN-verbinding die u op wilt slaan?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Kan VPN-verbinding niet exporteren" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2556,7 +2547,7 @@ "\n" "Fout: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN-verbinding exporteren" @@ -2583,61 +2574,46 @@ msgid "Make available to _other users" msgstr "Beschikbaar maken voor andere _gebruikers" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Netwerk" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Regelen hoe u verbinding maakt met het internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Network;Netwerk;Wireless;Draadloos;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Bre" -"edband;Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond-slaves" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(geen)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge-slaves" +"Network;Netwerk;Wireless;Draadloos;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;" +"Breedband;Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:470 msgid "never" msgstr "nooit" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:480 msgid "today" msgstr "vandaag" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:482 msgid "yesterday" msgstr "gisteren" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-adres" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Laatst gebruikt" @@ -2647,30 +2623,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Bekabeld" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1669 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opties…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Nieuwe verbinding toevoegen" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team-slaves" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1216 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2678,14 +2649,14 @@ "Als u een andere dan een draadloze verbinding met het internet heeft, kunt u " "een draadloze hotspot instellen om de verbinding met anderen te delen." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1220 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "De inschakeling van de draadloze hotspot zal uw verbinding met %s " "verbreken." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1224 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2693,23 +2664,23 @@ "U heeft geen toegang tot het internet via uw draadloze verbinding zolang de " "hotspot is geactiveerd." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1307 msgid "Stop hotspot and disconnect any users?" msgstr "Hotspot stoppen en verbinding verbreken met gebruikers?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1310 msgid "_Stop Hotspot" msgstr "Hotspot _stoppen" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1374 msgid "System policy prohibits use as a Hotspot" msgstr "Systeembeleid staat gebruik als hotspot niet toe" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1377 msgid "Wireless device does not support Hotspot mode" msgstr "Draadloos apparaat ondersteunt de hotspot-modus niet" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1507 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2717,11 +2688,11 @@ "Netwerkdetails voor de geselecteerde netwerken, inclusief wachtwoord en " "aangepaste configuratie, zullen verloren gaan." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1820 msgid "History" msgstr "Geschiedenis" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1824 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2729,7 +2700,7 @@ msgstr "_Sluiten" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1832 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Vergeten" @@ -2766,6 +2737,10 @@ msgid "Provider" msgstr "Provider" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Netwerk" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2875,7 +2850,7 @@ #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 #: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "_Password" msgstr "_Wachtwoord" @@ -2976,7 +2951,7 @@ msgstr "_Verbinden met een verborgen netwerk…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:14 msgid "_History" msgstr "_Geschiedenis" @@ -3003,297 +2978,291 @@ msgstr "Wachtwoord" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructuur" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Onbekende status" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Niet-gemanaged" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Niet beschikbaar" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Verbinden" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Authenticatie vereist" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Verbonden" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Verbinding verbreken" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Verbinding mislukt" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Onbekende status (ontbreekt)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Niet verbonden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Configuratie mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP-configuratie mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP-configuratie verlopen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Geheimen werden vereist, maar niet verstrekt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Niet verbonden met 802.1x supplicant" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Configuratie 802.1x supplicant mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x supplicant mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x supplicant authenticatie duurde te lang" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Starten van PPP-dienst mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Niet verbonden met PPP-dienst" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Starten van DHCP-client mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Fout DHCP-client" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-client mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Starten van gedeelde verbinding-dienst mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Gedeelde verbinding-dienst mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Starten van AutoIP-dienst mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Fout AutoIP-dienst" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP-dienst mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Lijn bezet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Geen kiestoon" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Er kon geen carrier worden vastgesteld" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Tijdslimiet belaanvraag overschreden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Belpoging mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Initialisatie van modem mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Selecteren van opgegeven APN mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Er wordt niet naar netwerken gezocht" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Netwerkregistratie geweigerd" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Tijdslimiet netwerkregistratie verlopen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Registreren bij het gevraagde netwerk mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN-controle mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Mogelijk ontbreekt de firmware voor het apparaat" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Verbinding verdwenen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Er werd uitgegaan van de bestaande verbinding" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem niet gevonden" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth-verbinding mislukt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM-kaart niet ingebracht" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM-pin vereist" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM-Puk vereist" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Verkeerde SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -#, fuzzy -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand-apparaat ondersteunt de verbonden-modus niet" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Verbindingsafhankelijkheid mislukt" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware ontbreekt" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabel niet verbonden" -#: ../panels/network/wireless-security/eap-method.c:275 +#: ../panels/network/wireless-security/eap-method.c:273 msgid "No Certificate Authority certificate chosen" msgstr "Geen Certificate Authority-certificaat gekozen" -#: ../panels/network/wireless-security/eap-method.c:276 +#: ../panels/network/wireless-security/eap-method.c:274 msgid "" "Not using a Certificate Authority (CA) certificate can result in connections " "to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " @@ -3303,38 +3272,38 @@ "tot verbindingen met onveilige, malafide WiFi-netwerken. Wilt u een " "Certificate Authority-certificaat kiezen?" -#: ../panels/network/wireless-security/eap-method.c:281 +#: ../panels/network/wireless-security/eap-method.c:279 msgid "Ignore" msgstr "Negeren" -#: ../panels/network/wireless-security/eap-method.c:285 +#: ../panels/network/wireless-security/eap-method.c:283 msgid "Choose CA Certificate" msgstr "CA-certificaat kiezen" -#: ../panels/network/wireless-security/eap-method.c:645 +#: ../panels/network/wireless-security/eap-method.c:643 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" msgstr "DER, PEM, of PKCS#12 privésleutels (*.der, *.pem, *.p12)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:646 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER of PEM certificaten (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:270 +#: ../panels/network/wireless-security/eap-method-peap.c:278 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:286 +#: ../panels/network/wireless-security/eap-method-peap.c:244 +#: ../panels/network/wireless-security/eap-method-ttls.c:261 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:408 msgid "Choose a PAC file" msgstr "Kies een PAC-bestand" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:415 msgid "PAC files (*.pac)" msgstr "PAC-bestanden (*.pac)" @@ -3382,7 +3351,7 @@ #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:1 msgid "_Username" msgstr "_Gebruikersnaam" @@ -3394,14 +3363,14 @@ msgid "Sho_w password" msgstr "Wachtwoord _tonen" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:261 +#: ../panels/network/wireless-security/wireless-security.c:381 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:348 +#: ../panels/network/wireless-security/eap-method-tls.c:455 +#: ../panels/network/wireless-security/eap-method-ttls.c:348 msgid "Choose a Certificate Authority certificate" msgstr "Kies een Certificate Authority-certificaat" @@ -3433,11 +3402,11 @@ msgid "As_k for this password every time" msgstr "Elke keer naar dit wachtwoord _vragen" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:281 msgid "Unencrypted private keys are insecure" msgstr "Niet-versleutelde privésleutels zijn onveilig" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:284 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3451,11 +3420,11 @@ "\n" "(U kunt uw privésleutel beveiligen via openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:449 msgid "Choose your personal certificate" msgstr "Kies uw persoonlijke certificaat" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:461 msgid "Choose your private key" msgstr "Kies uw privésleutel" @@ -3475,15 +3444,15 @@ msgid "_Private key password" msgstr "Wachtwoord _privésleutel" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:228 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:245 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:278 msgid "CHAP" msgstr "CHAP" @@ -3499,19 +3468,19 @@ msgid "Yes" msgstr "Ja" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:393 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:417 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:428 msgid "Tunneled TLS" msgstr "Getunnelde TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "Protected EAP (PEAP)" msgstr "Beveiligde EAP (PEAP)" @@ -3568,7 +3537,7 @@ msgstr "_Type" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 #: ../panels/privacy/cc-privacy-panel.c:172 #: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 @@ -3612,16 +3581,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "_Berichtinhoud tonen op vergrendelingsscherm" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificaties" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Regelen welke notificaties weergegeven worden en wat ze tonen" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Notifications;Notificaties;Banners;Banieren;Bericht;Message;Tray;Systeemvak;" @@ -3704,16 +3674,17 @@ msgid "_Remove" msgstr "_Verwijderen" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Online-accounts" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Met uw online-accounts verbinden en bepalen waar u ze voor gebruikt" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3868,7 +3839,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Accu" @@ -3916,102 +3887,103 @@ msgid "When _idle" msgstr "Wanneer i_nactief" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Energiebesparing" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Helderheid beeld_scherm" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatische helderheid" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Helderheid toetsenbord" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Scherm _dimmen wanneer inactief" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Zwart scherm" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_WiFi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "WiFi uitschakelen om energie te sparen." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobiel breedband" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Mobiele breedband (3G, 4G, LTE, etc.) uitschakelen om energie te sparen." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Wanneer op accustroom" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Als de kabel aangesloten is" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Pauzestand" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Slaapstand" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Niets doen" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Pauzestand & uitschakelen" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatisch in pauzestand zetten" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatisch in pauzestand zetten" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Als de _aan-/uitknop wordt ingedrukt" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 msgid "Devices" msgstr "Apparaten" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energie" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "De accustatus bekijken en instellingen voor energiebesparing wijzigen" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4287,32 +4259,33 @@ msgstr "PPD-bestand geven…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2613 +#: ../panels/printers/cc-printers-panel.c:2636 msgid "Test page" msgstr "Testpagina" -#: ../panels/printers/cc-printers-panel.c:2743 +#: ../panels/printers/cc-printers-panel.c:2749 msgid "No printers" msgstr "Geen printers" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3095 #, c-format msgid "Could not load ui: %s" msgstr "Kon ui niet laden: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Printers" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Printers toevoegen, afdruktaken bekijken, en bepalen hoe u wilt afdrukken" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Queue;Print;Paper;Ink;Toner;Wachtrij;Papier;Inkt;" @@ -4482,6 +4455,11 @@ msgid "Parallel Port" msgstr "Parallelle poort" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4665,7 +4643,7 @@ msgid "Jobs" msgstr "Taken" -#. Translators: Opens a dialog containing printer's jobs +#. Translators: Opens a dialog containing printer #: ../panels/printers/printers.ui.h:11 msgid "Show _Jobs" msgstr "_Taken tonen" @@ -4691,7 +4669,7 @@ msgid "Print _Test Page" msgstr "_Testpagina afdrukken" -#. Translators: This button opens printer's options tab +#. Translators: This button opens printer #: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6 msgid "_Options" msgstr "_Opties" @@ -4787,16 +4765,17 @@ msgid "Privacy Policy" msgstr "Privacybeleid" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Privacy" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Pri­va­cy" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Uw persoonlijke gegevens beschermen en regelen wat anderen mogen zien" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4968,22 +4947,22 @@ msgid "Other" msgstr "Overige" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1073 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Om de wijzigingen door te voeren moet de computer opnieuw gestart worden" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1077 msgid "Restart Now" msgstr "Nu herstarten" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Er zijn geen invoerbronnen geselecteerd" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Aanmeld_scherm" @@ -5017,18 +4996,19 @@ msgid "Paper" msgstr "Papiersoort" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Regio en taal" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Schermtaal, formaten, toetsenbordindelingen en invoerbronnen selecteren" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Language;Layout;Keyboard;Taal;Indeling;Toetsenbord;" @@ -5085,7 +5065,7 @@ msgstr "Linker+rechter Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 msgid "_Language" msgstr "_Taal" @@ -5135,26 +5115,11 @@ "Aanmeldinstellingen worden gebruikt door alle gebruikers die zich aanmelden " "bij het systeem" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Locaties" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Bladwijzers" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Overige" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Locatie selecteren" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5162,18 +5127,19 @@ msgid "No applications found" msgstr "Geen toepassingen aangetroffen" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Zoeken" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Regelen welke toepassingen zoekresultaten tonen in het activiteitenoverzicht" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Search;Find;Index;Hide;Privacy;Results;Zoeken;Verbergen;" @@ -5181,6 +5147,18 @@ msgid "Search Locations" msgstr "Zoeklocaties" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Locaties" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Bladwijzers" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Overige" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Naar boven" @@ -5251,16 +5229,20 @@ msgstr "Kopiëren" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Delen" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Delen" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Regelen wat u met anderen wilt delen" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5595,12 +5577,17 @@ msgid "Custom" msgstr "Aangepast" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Universele toegang" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Zien, horen, typen, aanwijzen en klikken vergemakkelijken" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5700,8 +5687,8 @@ msgstr "Geluidtoetsen" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Piepen wanneer Num Lock of Caps Lock aan wordt gezet." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Piepen wanneer Num Lock of Caps Lock aan of uit wordt gezet." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6083,26 +6070,24 @@ msgid "Color Effects" msgstr "Kleureffecten" -#: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +msgid "_Full Name" +msgstr "_Volledige naam" + +#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/um-user-panel.c:900 msgid "Standard" msgstr "Standaard" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:4 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 +#: ../panels/user-accounts/um-user-panel.c:898 msgid "Administrator" msgstr "Beheerder" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Volledige naam" - #: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "Account _Type" msgstr "Account-_type" @@ -6115,35 +6100,39 @@ msgstr "_Nu een wachtwoord instellen" #: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Controleren" +msgid "_Confirm" +msgstr "_Bevestigen" #: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Met enterprise-aanmelding kan een bestaande centraal beheerde " -"gebruikersaccount op dit apparaat gebruikt worden." +"gebruikersaccount op dit apparaat gebruikt worden. U kunt dit account ook " +"gebruiken om toegang te krijgen tot bedrijfsbronnen op het internet." #: ../panels/user-accounts/data/account-dialog.ui.h:12 msgid "_Domain" msgstr "_Domein" #: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." +msgid "You are Offline" +msgstr "U bent offline" + +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +msgid "You must be online in order to add enterprise users." msgstr "" "U moet online gaan om enterprise-\n" -"gebruikersaccounts toe te voegen." +"gebruikers toe te voegen." #: ../panels/user-accounts/data/account-dialog.ui.h:15 msgid "_Enterprise Login" msgstr "_Enterprise-aanmelding" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 +#: ../panels/user-accounts/um-account-dialog.c:1462 msgid "Add User" msgstr "Gebruiker toevoegen" @@ -6270,13 +6259,25 @@ msgstr "_Huidige wachtwoord" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Gebruiker kan wachtwoord instellen bij de volgende keer aanmelden" +msgid "Allow user to change their password on next login" +msgstr "Gebruiker kan wachtwoord wijzigen bij de volgende keer aanmelden" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Nu een wachtwoord instellen" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standaard" + +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Beheerder" + #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Add User Account" msgstr "Gebruikersaccount toevoegen" @@ -6285,23 +6286,19 @@ msgid "Remove User Account" msgstr "Gebruikersaccount verwijderen" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Aanmeldopties" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "A_utomatic Login" msgstr "A_utomatisch aanmelden" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "_Fingerprint Login" msgstr "Aanmelden met _vingerafdruk" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "User Icon" msgstr "Gebruikerspictogram" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "Last Login" msgstr "Laatste keer aangemeld" @@ -6406,7 +6403,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" "Gebruik zowel hoofdletters als kleine letters en probeer een paar cijfers te " "gebruiken." @@ -6500,32 +6497,32 @@ msgstr "Onbekende fout" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Dient overeen te komen met het internetadres van uw inlog-provider." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Toevoegen van account mislukt" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Wachtwoorden komen niet overeen." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:729 +#: ../panels/user-accounts/um-account-dialog.c:775 +#: ../panels/user-accounts/um-account-dialog.c:796 msgid "Failed to register account" msgstr "Registreren van account mislukt" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:919 msgid "No supported way to authenticate with this domain" msgstr "Geen ondersteunde manier om met dit domein te authenticeren" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:978 msgid "Failed to join domain" msgstr "Toetreden tot domein mislukt" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1039 msgid "" "That login name didn't work.\n" "Please try again." @@ -6533,7 +6530,7 @@ "Ongeldige gebruikersnaam.\n" "Probeer het opnieuw." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1046 msgid "" "That login password didn't work.\n" "Please try again." @@ -6541,11 +6538,11 @@ "Ongeldig wachtwoord.\n" "Probeer het opnieuw." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1054 msgid "Failed to log into domain" msgstr "Aanmelden bij domein mislukt" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1112 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Domein niet gevonden. Heeft u het verkeerd gespeld?" @@ -6834,16 +6831,16 @@ msgid "Logged in" msgstr "Aangemeld" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1276 msgid "Failed to contact the accounts service" msgstr "Kon de accounts-service niet benaderen" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1278 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Zorg ervoor dat het de AccountService geïnstalleerd in ingeschakeld is." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1319 msgid "" "To make changes,\n" "click the * icon first" @@ -6851,12 +6848,12 @@ "Klik op het het *-pictogram\n" "om wijzigingen te maken" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1357 msgid "Create a user account" msgstr "Gebruikersaccount aanmaken" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1368 +#: ../panels/user-accounts/um-user-panel.c:1680 msgid "" "To create a user account,\n" "click the * icon first" @@ -6864,12 +6861,12 @@ "Klik op het *-pictogram\n" "om een gebruikersaccount aan te maken" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1378 msgid "Delete the selected user account" msgstr "De geselecteerde gebruiker verwijderen" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1390 +#: ../panels/user-accounts/um-user-panel.c:1685 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6877,33 +6874,32 @@ "Klik op het het *-pictogram om de geselecteerde\n" "gebruiker te verwijderen" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1594 msgid "My Account" msgstr "Mijn account" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Er bestaat al een gebruikersnaam ‘%s’." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Die gebruikersnaam is helaas niet beschikbaar. Probeer een andere." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "De gebruikersnaam is te lang." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "De gebruikersnaam mag niet met een ‘-’ beginnen." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"De gebruikersnaam mag alleen maar bestaan uit hoofd– en kleine letters van " -"a-z, cijfers en de tekens ‘.’, ‘-’ en ‘_’." +"De gebruikersnaam mag alleen maar bestaan uit grote/kleine letters van a t/m " +"z, cijfers en de tekens ‘.’, ‘-’ en ‘_’." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Dit zal gebruikt worden om uw persoonlijke map een naam te geven en kan niet " @@ -6996,19 +6992,19 @@ msgid "Button" msgstr "Knop" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom-tablet" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wacom­-tablet" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Knoptoewijzingen instellen en gevoeligheid van stylus voor grafische " "tabletten aanpassen" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;Tekenen;Gum;Muis;" @@ -7040,6 +7036,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-instellingen" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom-tablet" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Naar monitor mappen…" @@ -7335,57 +7335,3 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "Zoeken annuleren" - -#~ msgid "Back­ground" -#~ msgstr "Achtergrond" - -#~ msgid "Blue­tooth" -#~ msgstr "Bluetooth" - -#~ msgid "Co­lor" -#~ msgstr "Kleur" - -#~ msgid "Adjust for TV" -#~ msgstr "Aanpassen aan tv" - -#~ msgid "De­tails" -#~ msgstr "Details" - -#~ msgid "Net­work" -#~ msgstr "Netwerk" - -#~ msgid "No­ti­fi­ca­tions" -#~ msgstr "Notificaties" - -#~ msgid "Po­wer" -#~ msgstr "Energie" - -#~ msgid "Pri­va­cy" -#~ msgstr "Pri­va­cy" - -#~ msgid "Sha­ring" -#~ msgstr "Delen" - -#~ msgid "Uni­ver­sal Access" -#~ msgstr "Universele toegang" - -#~ msgid "Standard" -#~ msgstr "Standaard" - -#~ msgid "Administrator" -#~ msgstr "Beheerder" - -#~ msgid "_Confirm" -#~ msgstr "_Bevestigen" - -#~ msgid "You are Offline" -#~ msgstr "U bent offline" - -#~ msgid "Allow user to change their password on next login" -#~ msgstr "Gebruiker kan wachtwoord wijzigen bij de volgende keer aanmelden" - -#~ msgid "Sorry, that user name isn't available. Please try another." -#~ msgstr "Die gebruikersnaam is helaas niet beschikbaar. Probeer een andere." - -#~ msgid "Wa­com Tab­let" -#~ msgstr "Wacom­-tablet" diff -Nru gnome-control-center-3.20.2/po/nso.po gnome-control-center-3.22.1/po/nso.po --- gnome-control-center-3.20.2/po/nso.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/nso.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2004-11-27 17:02+0200\n" "Last-Translator: Zuza Software Foundation \n" "Language-Team: Northern Sotho \n" +"Language: nso\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/oc.po gnome-control-center-3.22.1/po/oc.po --- gnome-control-center-3.20.2/po/oc.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/oc.po 2016-08-12 12:43:57.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-control-center HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-02-18 08:41+0000\n" -"PO-Revision-Date: 2016-02-27 17:51+0200\n" +"POT-Creation-Date: 2016-05-22 17:33+0000\n" +"PO-Revision-Date: 2016-05-06 20:37+0200\n" "Last-Translator: Cédric Valmary (totenoc.eu) \n" "Language-Team: Tot En Òc\n" "Language: oc\n" @@ -21,7 +21,6 @@ "X-Project-Style: gnome\n" #: ../panels/background/background.ui.h:1 -#| msgid "Background" msgid "_Background" msgstr "_Rèireplan" @@ -32,7 +31,6 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -#| msgid "Lock Screen" msgid "_Lock Screen" msgstr "_Verrolhar l'ecran" @@ -101,41 +99,41 @@ #: ../panels/background/cc-background-chooser-dialog.c:573 #, c-format msgid "You can add images to your %s folder and they will show up here" -msgstr "Podètz apondre d'images dins vòstre dorsièr %s ont s'aficharàn" +msgstr "Podètz apondre d'imatges dins vòstre dorsièr %s ont s'aficharàn" #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 -#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:29 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 #: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2023 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:250 +#: ../panels/network/connection-editor/vpn-helpers.c:379 +#: ../panels/network/net-device-wifi.c:1281 +#: ../panels/network/net-device-wifi.c:1481 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:1931 +#: ../panels/printers/cc-printers-panel.c:2052 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:568 +#: ../panels/privacy/cc-privacy-panel.c:982 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 #: ../panels/search/cc-search-locations-dialog.c:681 #: ../panels/sharing/cc-sharing-panel.c:372 #: ../panels/user-accounts/data/account-dialog.ui.h:17 #: ../panels/user-accounts/data/password-dialog.ui.h:2 #: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:266 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 -#: ../panels/user-accounts/um-user-panel.c:708 -#: ../panels/user-accounts/um-user-panel.c:726 +#: ../panels/user-accounts/um-user-panel.c:705 +#: ../panels/user-accounts/um-user-panel.c:723 msgid "_Cancel" msgstr "_Anullar" #: ../panels/background/cc-background-chooser-dialog.c:581 msgid "_Select" -msgstr "_Sélectionner" +msgstr "_Seleccionar" #: ../panels/background/cc-background-item.c:203 msgid "multiple sizes" @@ -156,26 +154,25 @@ msgid "Current background" msgstr "Rèireplan actual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Rèireplan" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Remplaçar vòstre imatge de rèireplan per un papièr pintrat o una fòto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Papièr pintrat;Ecran;Burèu;" #: ../panels/bluetooth/cc-bluetooth-panel.c:264 -#| msgid "Air_plane Mode" msgid "Turn Off Airplane Mode" msgstr "Mòde a_vion" #: ../panels/bluetooth/cc-bluetooth-panel.c:330 -#| msgid "No Bluetooth adapters found" msgid "No Bluetooth Found" msgstr "Cap d'adaptator Bluetooth pas trobat" @@ -184,7 +181,6 @@ msgstr "" #: ../panels/bluetooth/cc-bluetooth-panel.c:331 -#| msgid "Bluetooth Sharing" msgid "Bluetooth Turned Off" msgstr "Bluetooth desactivat" @@ -193,37 +189,32 @@ msgstr "" #: ../panels/bluetooth/cc-bluetooth-panel.c:332 -#| msgid "Air_plane Mode" msgid "Airplane Mode is on" msgstr "Mòde a_vion activat" #: ../panels/bluetooth/cc-bluetooth-panel.c:332 -#| msgid "Bluetooth is disabled by hardware switch" msgid "Bluetooth is disabled when airplane mode is on." msgstr "Lo comutator material del Bluetooth es desactivat" #: ../panels/bluetooth/cc-bluetooth-panel.c:333 -#, fuzzy -#| msgid "Air_plane Mode" msgid "Hardware Airplane Mode is on" -msgstr "Mòde a_vion" +msgstr "Mòde a_vion activat" #: ../panels/bluetooth/cc-bluetooth-panel.c:333 msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "" -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Activa/desactiva lo Bluetooth e connècta vòstres periferics" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "" @@ -264,7 +255,7 @@ #. * good idea why or any suggestions #: ../panels/color/cc-color-calibrate.c:410 msgid "An internal error occurred that could not be recovered." -msgstr "Una error intèrna irrecuperabla s'es producha." +msgstr "Una error intèrna irrecuperabla s'es produita." #. TRANSLATORS: Some required-at-runtime tools were not #. * installed, which should only affect insane distros @@ -438,7 +429,7 @@ msgstr "Enregistrar lo perfil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:380 msgid "_Save" msgstr "_Enregistrar" @@ -549,13 +540,11 @@ #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -#| msgid "Start" msgid "_Start" msgstr "A_viar" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -#| msgid "Resume" msgid "_Resume" msgstr "_Reprene" @@ -637,7 +626,7 @@ "management will be most accurate at this brightness level." msgstr "" "Reglatz la luminositat de l'ecran a una valor que vos es costumièra. La " -"gestion de color ne serà mai fisabla." +"gestion de color serà pas mai fisabla." #: ../panels/color/color.ui.h:16 msgid "" @@ -698,16 +687,19 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:731 msgid "Summary" msgstr "Resumit" #: ../panels/color/color.ui.h:28 -#| msgid "Import File…" +msgid "Add profile" +msgstr "Apondre un perfil" + +#: ../panels/color/color.ui.h:29 msgid "_Import File…" msgstr "_Importar un fichièr…" -#: ../panels/color/color.ui.h:30 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 #: ../panels/network/connection-editor/net-connection-editor.c:518 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 @@ -715,7 +707,7 @@ msgid "_Add" msgstr "_Apondre" -#: ../panels/color/color.ui.h:31 +#: ../panels/color/color.ui.h:32 msgid "" "Problems detected. The profile may not work correctly. Show " "details." @@ -723,155 +715,150 @@ "I a un problèma. Es possible que lo perfil foncione pas corrèctament. Afichar los detalhs" -#: ../panels/color/color.ui.h:32 +#: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." msgstr "" "Cada periferic a besonh d'un perfil de color a jorn per la presa en carga de " "las colors." -#: ../panels/color/color.ui.h:33 +#: ../panels/color/color.ui.h:34 msgid "Learn more" msgstr "Per ne saber mai" -#: ../panels/color/color.ui.h:34 +#: ../panels/color/color.ui.h:35 msgid "Learn more about color management" msgstr "Per ne saber mai sus la gestion de las colors" -#: ../panels/color/color.ui.h:35 -#| msgid "Set for all users" +#: ../panels/color/color.ui.h:36 msgid "_Set for all users" msgstr "_Definir per totes los utilizaires" -#: ../panels/color/color.ui.h:36 +#: ../panels/color/color.ui.h:37 msgid "Set this profile for all users on this computer" msgstr "Definir aqueste perfil per totes los utilizaires d'aqueste ordenador" -#: ../panels/color/color.ui.h:37 -#| msgid "Enable" +#: ../panels/color/color.ui.h:38 msgid "_Enable" msgstr "A_ctivar " -#: ../panels/color/color.ui.h:38 -#| msgid "Add profile" +#: ../panels/color/color.ui.h:39 msgid "_Add profile" msgstr "_Apondre un perfil" -#: ../panels/color/color.ui.h:39 -#| msgid "Calibrate…" +#: ../panels/color/color.ui.h:40 msgid "_Calibrate…" msgstr "Escan_dalhar…" -#: ../panels/color/color.ui.h:40 +#: ../panels/color/color.ui.h:41 msgid "Calibrate the device" msgstr "Escandalhar lo periferic" -#: ../panels/color/color.ui.h:41 -#| msgid "Remove profile" +#: ../panels/color/color.ui.h:42 msgid "_Remove profile" msgstr "_Suprimir un perfil" -#: ../panels/color/color.ui.h:42 -#| msgid "View details" +#: ../panels/color/color.ui.h:43 msgid "_View details" msgstr "A_fichar los detalhs" -#: ../panels/color/color.ui.h:43 +#: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" msgstr "Impossible de detectar un periferic per gerir sa color" -#: ../panels/color/color.ui.h:44 +#: ../panels/color/color.ui.h:45 msgid "LCD" msgstr "LCD" -#: ../panels/color/color.ui.h:45 +#: ../panels/color/color.ui.h:46 msgid "LED" msgstr "LED" -#: ../panels/color/color.ui.h:46 +#: ../panels/color/color.ui.h:47 msgid "CRT" msgstr "CRT" -#: ../panels/color/color.ui.h:47 +#: ../panels/color/color.ui.h:48 msgid "Projector" msgstr "Projector" -#: ../panels/color/color.ui.h:48 +#: ../panels/color/color.ui.h:49 msgid "Plasma" msgstr "Plasma" -#: ../panels/color/color.ui.h:49 +#: ../panels/color/color.ui.h:50 msgid "LCD (CCFL backlight)" msgstr "LCD (retroesclairatge CCFL)" -#: ../panels/color/color.ui.h:50 +#: ../panels/color/color.ui.h:51 msgid "LCD (RGB LED backlight)" msgstr "LCD (retroesclairatge de LED RVB)" -#: ../panels/color/color.ui.h:51 +#: ../panels/color/color.ui.h:52 msgid "LCD (white LED backlight)" msgstr "LCD (retroesclairatge de LED blancas)" -#: ../panels/color/color.ui.h:52 +#: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" msgstr "LCD a gamut larg (retroesclairatge CCFL)" -#: ../panels/color/color.ui.h:53 +#: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" msgstr "LCD de gamut larg (retroesclairatge de LED RVB)" -#: ../panels/color/color.ui.h:54 +#: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" msgid "High" msgstr "Elevada" -#: ../panels/color/color.ui.h:55 +#: ../panels/color/color.ui.h:56 msgid "40 minutes" msgstr "40 minutas" -#: ../panels/color/color.ui.h:56 +#: ../panels/color/color.ui.h:57 msgctxt "Calibration quality" msgid "Medium" msgstr "Mejana" -#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:2 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 #: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "30 minutas" -#: ../panels/color/color.ui.h:58 +#: ../panels/color/color.ui.h:59 msgctxt "Calibration quality" msgid "Low" msgstr "Bassa" -#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:1 +#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1 msgid "15 minutes" msgstr "15 minutas" -#: ../panels/color/color.ui.h:60 +#: ../panels/color/color.ui.h:61 msgid "Native to display" msgstr "Nativa amb ecran" -#: ../panels/color/color.ui.h:61 +#: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" msgstr "D50 (impression e publicacion)" -#: ../panels/color/color.ui.h:62 +#: ../panels/color/color.ui.h:63 msgid "D55" msgstr "D55" -#: ../panels/color/color.ui.h:63 +#: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" msgstr "D65 (fòtos e grafismes)" -#: ../panels/color/color.ui.h:64 +#: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Color" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -879,7 +866,7 @@ "de fòtos o las imprimentas" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Color;ICC;Perfil;Escandalhar;Escandalhatge;Imprimenta;Ecran;" @@ -897,6 +884,26 @@ msgid "No languages found" msgstr "Cap de lenga pas trobada" +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:102 +msgid "Today" +msgstr "Uèi" + +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:104 +msgid "Yesterday" +msgstr "Ièr" + +#. Translators: This is a date format string in the style of "Feb 24". +#: ../panels/common/cc-util.c:138 +msgid "%b %e" +msgstr "%b %e" + +#. Translators: This is a date format string in the style of "Feb 24, 2013". +#: ../panels/common/cc-util.c:143 +msgid "%b %e, %Y" +msgstr "%b %e, %Y" + #: ../panels/common/language-chooser.ui.h:1 msgid "Language" msgstr "Lenga" @@ -929,8 +936,6 @@ #. Translators: "city, country" #: ../panels/datetime/cc-datetime-panel.c:523 #, c-format -#| msgctxt "login date-time" -#| msgid "%s, %s" msgctxt "timezone loc" msgid "%s, %s" msgstr "%s, %s" @@ -1015,8 +1020,9 @@ msgid "December" msgstr "decembre" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data & ora" @@ -1058,7 +1064,6 @@ msgstr "Data & _ora" #: ../panels/datetime/datetime.ui.h:24 -#| msgid "Time Zone" msgid "Time Z_one" msgstr "Fus _orari" @@ -1074,12 +1079,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Modificar la data e l'ora, inclús lo fus orari" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Relòtge;Fus;Ora;Data;Emplaçament;" @@ -1101,20 +1106,20 @@ msgstr "Clonats" #: ../panels/display/cc-display-panel.c:578 -#: ../panels/display/cc-display-panel.c:2195 +#: ../panels/display/cc-display-panel.c:2430 msgid "Primary" msgstr "Principal" #: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 #: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/privacy/cc-privacy-panel.c:172 +#: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "O" @@ -1129,7 +1134,7 @@ msgstr "Organizar los ecrans associats" #: ../panels/display/cc-display-panel.c:1562 -#: ../panels/display/cc-display-panel.c:2024 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" @@ -1139,147 +1144,169 @@ msgid "Drag displays to rearrange them" msgstr "Fasètz lisar los ecrans per los reorganizar" -#: ../panels/display/cc-display-panel.c:2073 +#. translators: example string is "60 Hz (NTSC)" +#. * NTSC is https://en.wikipedia.org/wiki/NTSC +#: ../panels/display/cc-display-panel.c:1793 +#, c-format +msgid "%d Hz (NTSC)" +msgstr "" + +#. translators: example string is "60 Hz" +#: ../panels/display/cc-display-panel.c:1799 +#, c-format +msgid "%d Hz" +msgstr "" + +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Pivotar de 90° cap a esquèrra" -#: ../panels/display/cc-display-panel.c:2091 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Pivotar de 180°" -#: ../panels/display/cc-display-panel.c:2109 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" -msgstr "Pivotar de 90° cap a drecha" +msgstr "Pivotar de 90° cap a dreita" -#: ../panels/display/cc-display-panel.c:2130 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Talha" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2143 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporcion" -#: ../panels/display/cc-display-panel.c:2165 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolucion" -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:2375 +msgid "Adjust for TV" +msgstr "" + +#: ../panels/display/cc-display-panel.c:2399 +msgid "Refresh Rate" +msgstr "Fréquence de rafraîchissement" + +#: ../panels/display/cc-display-panel.c:2431 msgid "Show the top bar and Activities Overview on this display" msgstr "" "Afichar la barra superiora e la vista d'ensemble de las activitats sus " "aqueste ecran" -#: ../panels/display/cc-display-panel.c:2202 +#: ../panels/display/cc-display-panel.c:2437 msgid "Secondary Display" msgstr "Ecran segondari" -#: ../panels/display/cc-display-panel.c:2203 +#: ../panels/display/cc-display-panel.c:2438 msgid "Join this display with another to create an extra workspace" -msgstr "Associar aqueste ecran a un autre per alargir l'espaci de trabalh" +msgstr "Associar aqueste ecran a un autre per alarguir l'espaci de trabalh" -#: ../panels/display/cc-display-panel.c:2210 +#: ../panels/display/cc-display-panel.c:2445 msgid "Presentation" msgstr "Presentacion" -#: ../panels/display/cc-display-panel.c:2211 +#: ../panels/display/cc-display-panel.c:2446 msgid "Show slideshows and media only" msgstr "Afichar pas que los diaporamas e los mèdias" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2216 +#: ../panels/display/cc-display-panel.c:2451 msgid "Mirror" msgstr "Clonar" -#: ../panels/display/cc-display-panel.c:2217 +#: ../panels/display/cc-display-panel.c:2452 msgid "Show your existing view on both displays" msgstr "Afichar vòstra vista actuala suls dos ecrans" -#: ../panels/display/cc-display-panel.c:2223 +#: ../panels/display/cc-display-panel.c:2458 msgid "Turn Off" msgstr "Atudar" -#: ../panels/display/cc-display-panel.c:2224 +#: ../panels/display/cc-display-panel.c:2459 msgid "Don't use this display" msgstr "Utilizetz pas aqueste ecran" -#: ../panels/display/cc-display-panel.c:2525 +#: ../panels/display/cc-display-panel.c:2770 msgid "Could not get screen information" msgstr "Impossible d'obténer las informacions a prepaus de l'ecran" -#: ../panels/display/cc-display-panel.c:2556 +#: ../panels/display/cc-display-panel.c:2801 msgid "_Arrange Combined Displays" msgstr "_Organizar los ecrans clonats" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ecrans" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Causir lo mòde d'utilizacion dels ecrans e projectors connectats" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" -"Panneau;Projecteur;xrandr;Ecran;Définition;Résolution;Rafraîchissement;" +"Panneau;Projecteur;xrandr;Ecran;Definicion;Résolution;Rafraîchissement;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:127 msgid "Unknown" msgstr "Desconegut" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:433 #, c-format msgid "%s %d-bit" msgstr "%s %d bits" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:435 #, c-format msgid "%d-bit" msgstr "%d bits" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1115 msgid "Ask what to do" msgstr "Demandar de qué far" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1119 msgid "Do nothing" msgstr "Far pas res" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1123 msgid "Open folder" msgstr "Dobrir lo dorsièr" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1214 msgid "Other Media" msgstr "Autres mèdias" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1245 msgid "Select an application for audio CDs" msgstr "Seleccionatz una aplicacion per vòstres CD àudio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1246 msgid "Select an application for video DVDs" msgstr "Seleccionatz una aplicacion per vos DVD àudio" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1247 msgid "Select an application to run when a music player is connected" msgstr "" "Seleccionatz una aplicacion d'aviar quand un lector de musica es connectat" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1248 msgid "Select an application to run when a camera is connected" msgstr "" "Seleccionatz una aplicacion d'aviar quand un aparelh de fòto es connectat" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1249 msgid "Select an application for software CDs" msgstr "Seleccionatz una aplicacion pels CD que contenon de logicials" @@ -1288,88 +1315,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1261 msgid "audio DVD" msgstr "DVD àudio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1262 msgid "blank Blu-ray disc" msgstr "disc Blu-ray vèrge" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1263 msgid "blank CD disc" msgstr "disc CD vèrge" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1264 msgid "blank DVD disc" msgstr "disc DVD vèrge" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1265 msgid "blank HD DVD disc" msgstr "disc HD DVD vèrge" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1266 msgid "Blu-ray video disc" msgstr "disc vidèo Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1267 msgid "e-book reader" msgstr "lector e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1268 msgid "HD DVD video disc" msgstr "disc vidèo HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1269 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1270 msgid "Super Video CD" msgstr "Super Vidèo CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1271 msgid "Video CD" msgstr "CD vidèo" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1272 msgid "Windows software" msgstr "Logicials Windows" -#: ../panels/info/cc-info-panel.c:1435 +#: ../panels/info/cc-info-panel.c:1395 #: ../panels/keyboard/keyboard-shortcuts.c:1949 msgid "Section" msgstr "Seccion" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1404 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Vista d'ensemble" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1410 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicacions per defaut" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1415 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Mèdias amovibles" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1440 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalhs" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Afichar las informacions sul sistèma" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1424,7 +1450,7 @@ #: ../panels/info/info.ui.h:13 msgid "Check for updates" -msgstr "Recherche de mises a jour" +msgstr "Recèrca de mesas a jorn" #: ../panels/info/info.ui.h:15 msgid "_Web" @@ -1484,7 +1510,7 @@ #: ../panels/keyboard/00-multimedia.xml.in.h:2 msgid "Volume mute" -msgstr "Talhar lo son" +msgstr "Copar lo son" #: ../panels/keyboard/00-multimedia.xml.in.h:3 msgid "Volume down" @@ -1520,7 +1546,7 @@ #: ../panels/keyboard/00-multimedia.xml.in.h:11 msgid "Eject" -msgstr "Éjectar" +msgstr "Ejectar" #: ../panels/keyboard/01-input-sources.xml.in.h:1 #: ../panels/universal-access/uap.ui.h:11 @@ -1543,7 +1569,7 @@ msgid "Launch help browser" msgstr "Aviar lo navigador d'ajuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1605 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 #: ../shell/gnome-control-center.desktop.in.in.h:1 msgid "Settings" msgstr "Paramètres" @@ -1617,7 +1643,6 @@ msgstr "Verrolhar l'ecran" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Accès universal" @@ -1660,7 +1685,7 @@ #: ../panels/keyboard/keyboard-shortcuts.c:1220 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:213 +#: ../panels/user-accounts/um-fingerprint-dialog.c:215 msgid "Disabled" msgstr "Desactivat" @@ -1681,21 +1706,24 @@ msgstr "Tòca de composicion" #: ../panels/keyboard/cc-keyboard-option.c:368 +#, fuzzy +#| msgid "Modificars-only switch to next source" msgid "Modifiers-only switch to next source" msgstr "Amb las tòcas de modificacion solas, bascular cap a la font seguenta" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" msgstr "Clavièr" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Afichar, modificar los acorchis de clavièr e definir vòstras preferéncias de " "picada" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Acorchi;Repeticion;Cluquejament;" @@ -1781,8 +1809,8 @@ "\"%s\" is currently associated with \"%s\", this shortcut will be disabled " "if you move forward." msgstr "" -"Comme « %s » es actuellement associé a « %s », ce raccourci sera désactivé " -"si vous continuez." +"Comme « %s » es actualament associé a « %s », ce raccourci serà désactivé se " +"vous continuez." #: ../panels/keyboard/keyboard-shortcuts.c:1458 msgid "_Assign" @@ -1792,19 +1820,20 @@ msgid "Test Your _Settings" msgstr "Testar vòstres p_aramètres" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Mirga & pavat tactil" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" -"Modificar la sensibilitat del pavat tactil e causir entre drechièr o " +"Modificar la sensibilitat del pavat tactil e causir entre dreitièr o " "esquerrièr" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Pavat;Tactil;Puntador;Clic;Quichada;Doble;Boton;Bola;Desfilament;" @@ -1813,7 +1842,6 @@ msgstr "General" #: ../panels/mouse/gnome-mouse-properties.ui.h:2 -#| msgid "Primary _button" msgid "Primary Button" msgstr "Boton principal" @@ -1822,23 +1850,18 @@ msgstr "" #: ../panels/mouse/gnome-mouse-properties.ui.h:4 -#| msgctxt "balance" -#| msgid "Left" msgid "Left" msgstr "Esquèrra" #: ../panels/mouse/gnome-mouse-properties.ui.h:5 -#| msgctxt "balance" -#| msgid "Right" msgid "Right" -msgstr "Drecha" +msgstr "Dreita" #: ../panels/mouse/gnome-mouse-properties.ui.h:6 msgid "Mouse" msgstr "Mirga" #: ../panels/mouse/gnome-mouse-properties.ui.h:7 -#| msgid "_Mouse Keys" msgid "Mouse Speed" msgstr "Tòcas de la mirga" @@ -1848,13 +1871,10 @@ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. #: ../panels/mouse/gnome-mouse-properties.ui.h:10 -#| msgid "_Natural scrolling" msgid "Natural Scrolling" msgstr "Desfilament natural" #: ../panels/mouse/gnome-mouse-properties.ui.h:11 -#, fuzzy -#| msgid "This will not remove the account on the server." msgid "Scrolling moves the content, not the view." msgstr "Lo compte sul servidor serà pas suprimit." @@ -1863,20 +1883,16 @@ msgstr "Pavat tactil" #: ../panels/mouse/gnome-mouse-properties.ui.h:13 -#| msgid "Touchpad" msgid "Touchpad Speed" msgstr "Velocitat del pavat tactil" #: ../panels/mouse/gnome-mouse-properties.ui.h:14 -#| msgid "Tap to _click" msgid "Tap to Click" msgstr "Picar per clicar" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 -#, fuzzy -#| msgid "Scroll Right" msgid "Edge Scrolling" -msgstr "Desfilament cap a drecha" +msgstr "Desfilament cap a dreita" #: ../panels/mouse/gnome-mouse-test.c:130 #: ../panels/mouse/gnome-mouse-test.ui.h:1 @@ -1979,17 +1995,22 @@ msgid "automatic" msgstr "automatic" +#: ../panels/network/connection-editor/ce-page.c:545 +#, c-format +msgid "Profile %d" +msgstr "Perfil %d" + #. TRANSLATORS: this WEP WiFi security #: ../panels/network/connection-editor/ce-page-details.c:52 #: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/net-device-wifi.c:395 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security #: ../panels/network/connection-editor/ce-page-details.c:56 #: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/net-device-wifi.c:400 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" @@ -2008,7 +2029,7 @@ #: ../panels/network/connection-editor/ce-page-details.c:70 #: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/net-device-wifi.c:385 msgctxt "Wifi security" msgid "None" msgstr "Pas cap" @@ -2018,19 +2039,9 @@ msgid "Never" msgstr "Pas jamai" -#: ../panels/network/connection-editor/ce-page-details.c:102 -#: ../panels/user-accounts/um-utils.c:815 -msgid "Today" -msgstr "Uèi" - -#: ../panels/network/connection-editor/ce-page-details.c:104 -#: ../panels/user-accounts/um-utils.c:818 -msgid "Yesterday" -msgstr "Ièr" - #: ../panels/network/connection-editor/ce-page-details.c:106 #: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/net-device-wifi.c:489 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2040,43 +2051,48 @@ #. Translators: network device speed #: ../panels/network/connection-editor/ce-page-details.c:155 #: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/net-device-wifi.c:546 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" #: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "None" msgstr "Pas cap" #: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Weak" msgstr "Feble" #: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Ok" msgstr "Corrècte" #: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/net-device-wifi.c:581 msgctxt "Signal strength" msgid "Good" msgstr "Bon" #: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/net-device-wifi.c:583 msgctxt "Signal strength" msgid "Excellent" msgstr "Excellent" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 +#: ../panels/network/connection-editor/ce-page-details.c:240 +#: ../panels/network/network-wifi.ui.h:46 +msgid "Details" +msgstr "Detalhs" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:228 +#: ../panels/network/connection-editor/ce-page-vpn.c:222 #: ../panels/network/connection-editor/ce-page-wifi.c:262 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" @@ -2142,7 +2158,7 @@ #: ../panels/network/connection-editor/ce-page-ip4.c:619 #: ../panels/network/connection-editor/ce-page-ip6.c:621 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:199 msgid "Manual" msgstr "Manual" @@ -2166,7 +2182,7 @@ #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:199 msgid "Automatic" msgstr "Automatic" @@ -2341,13 +2357,13 @@ msgid "Firewall _Zone" msgstr "_Zòna del parafuòc" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Per defaut" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "La zòna definís lo nivèl de fisança de la connexion" @@ -2417,15 +2433,15 @@ msgid "VLAN" msgstr "VLAN" -#: ../panels/network/connection-editor/net-connection-editor.c:740 +#: ../panels/network/connection-editor/net-connection-editor.c:738 msgid "Could not load VPN plugins" msgstr "Impossible de cargar los empeutons del VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:807 msgid "Import from file…" msgstr "Importar dempuèi un fichièr…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 +#: ../panels/network/connection-editor/net-connection-editor.c:878 msgid "Add Network Connection" msgstr "Apondre una connexion ret" @@ -2435,7 +2451,7 @@ msgstr "_Reïnicializar" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1482 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Doblidar" @@ -2461,11 +2477,11 @@ msgid "S_ecurity" msgstr "Seg_uretat" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:210 msgid "Cannot import VPN connection" msgstr "Impossible d'importar la connexion VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:212 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2478,36 +2494,36 @@ "\n" "Error : %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:247 msgid "Select file to import" msgstr "Seleccionar lo fichièr d'importar" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:1932 +#: ../panels/network/connection-editor/vpn-helpers.c:251 +#: ../panels/printers/cc-printers-panel.c:2053 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Dobrir" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:299 #, c-format msgid "A file named \"%s\" already exists." msgstr "Un fichièr nomenat « %s » existís ja." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:301 msgid "_Replace" msgstr "_Remplaçar" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:303 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Volètz remplaçar %s amb la connexion VPN en cors d'enregistrament ?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:339 msgid "Cannot export VPN connection" msgstr "Impossible d'exportar la connexion VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:341 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2518,7 +2534,7 @@ "\n" "Error : %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:376 msgid "Export VPN connection" msgstr "Exportacion de la connexion VPN" @@ -2545,23 +2561,23 @@ msgid "Make available to _other users" msgstr "Rendre accessible als _autres utilizaires" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Ret" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Contrarotlar vòstre biais de vos connectar a Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" "vlan;bridge;bond;DNS;" msgstr "" -"Ret;Sens fial;Wi-Fi;Wifi;IP;LAN;Mandatari;WAN;Benda " -"larga;Modèm;Bluetooth;vpn;vlan;pont;ligam;ligada;DNS;" +"Ret;Sens fial;Wi-Fi;Wifi;IP;LAN;Mandatari;WAN;Benda larga;Modèm;Bluetooth;" +"vpn;vlan;pont;ligam;ligada;DNS;" #: ../panels/network/net-device-bond.c:77 msgid "Bond slaves" @@ -2571,24 +2587,24 @@ #: ../panels/network/net-device-bridge.c:102 #: ../panels/network/net-device-team.c:102 msgid "(none)" -msgstr "(rien)" +msgstr "(pas res)" #: ../panels/network/net-device-bridge.c:77 msgid "Bridge slaves" msgstr "Esclaus pont" #: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-wifi.c:475 msgid "never" msgstr "pas jamai" #: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-wifi.c:485 msgid "today" msgstr "uèi" #: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-wifi.c:487 msgid "yesterday" msgstr "ièr" @@ -2615,27 +2631,22 @@ msgstr "Filara" #: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-wifi.c:1640 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opcions…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Perfil %d" - #: ../panels/network/net-device-mobile.c:232 msgid "Add new connection" msgstr "Apondre una novèla connexion" #: ../panels/network/net-device-team.c:77 msgid "Team slaves" -msgstr "Esclaves de l’agrégat de type « Équipe »" +msgstr "Esclaves de l’agrégat de tipe « Équipe »" -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1188 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2643,12 +2654,12 @@ "Se dispausatz d'una connexion filara cap a Internet, podètz crear un punt " "d'accès sens fial per partejar vòstra connexion amb los autres." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1192 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Bascular sul punt d'accès sens fial vos va desconnectar de %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1196 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2656,23 +2667,23 @@ "Podètz pas accedir a Internet per vòstra connexion sens fial pendent que lo " "punt d'accès es actiu." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1279 msgid "Stop hotspot and disconnect any users?" msgstr "Interrompre lo punt d'accès e desconnectar totes los utilizaires ?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1282 msgid "_Stop Hotspot" msgstr "_Interrompre lo punt d'accès" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1346 msgid "System policy prohibits use as a Hotspot" msgstr "Las règlas del sistèma interdison son utilizacion coma punt d'accès" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1349 msgid "Wireless device does not support Hotspot mode" msgstr "Lo periferic sens fial pren pas en carga lo mòde « punt d'accès »" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1478 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2680,11 +2691,11 @@ "Las informacions de las rets seleccionadas, incluses los senhals e tota " "configuracion personalizada seràn perduts." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1793 msgid "History" msgstr "Istoric" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1797 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2692,7 +2703,7 @@ msgstr "_Tampar" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1805 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Doblidar" @@ -2729,6 +2740,10 @@ msgid "Provider" msgstr "Provesidor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Ret" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2834,7 +2849,7 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 +#: ../panels/sharing/sharing.ui.h:9 #: ../panels/user-accounts/data/account-dialog.ui.h:9 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Password" @@ -3182,12 +3197,12 @@ #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:372 msgid "PIN check failed" -msgstr "La verificacion del còde PIN a fracassat" +msgstr "La verificacion del còdi PIN a fracassat" #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:376 msgid "Firmware for the device may be missing" -msgstr "Es possible que lo micrologicial del periferic manque" +msgstr "Es possible que lo micrologicial del periferic manca" #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:380 @@ -3217,12 +3232,12 @@ #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:400 msgid "SIM Pin required" -msgstr "Lo còde PIN de la SIM es necessari" +msgstr "Lo còdi PIN de la SIM es necessari" #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:404 msgid "SIM Puk required" -msgstr "Lo còde PUK de la SIM es requesit" +msgstr "Lo còdi PUK de la SIM es requesit" #. TRANSLATORS: device status reason #: ../panels/network/panel-common.c:408 @@ -3383,7 +3398,7 @@ #: ../panels/network/wireless-security/eap-method-tls.c:282 msgid "Unencrypted private keys are insecure" -msgstr "Las claus privadas non chifradas son pas fisablas" +msgstr "Las claus privadas pas chifradas son pas fisablas" #: ../panels/network/wireless-security/eap-method-tls.c:285 msgid "" @@ -3511,87 +3526,74 @@ #: ../panels/notifications/cc-notifications-panel.c:257 #: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/privacy/cc-privacy-panel.c:172 +#: ../panels/privacy/cc-privacy-panel.c:239 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "I" #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 -#| msgctxt "notifications" -#| msgid "Notifications" msgctxt "notifications" msgid "_Notifications" msgstr "_Notificacions" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 -#| msgctxt "notifications" -#| msgid "Sound Alerts" msgctxt "notifications" msgid "Sound _Alerts" msgstr "_Alèrtas sonòras" #: ../panels/notifications/edit-dialog.ui.h:5 -#| msgctxt "notifications" -#| msgid "Notification Banners" msgctxt "notifications" msgid "Notification _Banners" msgstr "Bandièras de notificacion" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 -#| msgctxt "notifications" -#| msgid "Show Message Content in Banners" msgctxt "notifications" msgid "Show Message _Content in Banners" msgstr "Afichar lo _contengut del messatge dins las bandièras" #: ../panels/notifications/edit-dialog.ui.h:8 -#| msgctxt "notifications" -#| msgid "Lock Screen Notifications" msgctxt "notifications" msgid "_Lock Screen Notifications" msgstr "Notificacions sus _l'ecran de verrolhatge" #: ../panels/notifications/edit-dialog.ui.h:9 -#| msgctxt "notifications" -#| msgid "Show Message Content on Lock Screen" msgctxt "notifications" msgid "Show Message C_ontent on Lock Screen" msgstr "Afichar lo c_ontengut del messatge sus l'ecran verrolhat" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificacions" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Contrarotlar quinas notificacions s'afichan e lor contengut" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notificacions;Messatges sorgissents;Messatge;Tirador;Popup;" #: ../panels/notifications/notifications.ui.h:1 -#| msgid "Notification Banners" msgid "Notification _Banners" msgstr "_Bandièras de notificacion" #: ../panels/notifications/notifications.ui.h:2 -#| msgid "Lock Screen Notifications" msgid "_Lock Screen Notifications" msgstr "Notificacions sus _l'ecran de verrolhatge" #. List of applications. #: ../panels/notifications/notifications.ui.h:4 -#: ../panels/sound/gvc-mixer-dialog.c:1781 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 msgid "Applications" msgstr "Aplicacions" @@ -3658,22 +3660,23 @@ msgid "_Remove" msgstr "_Suprimir" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Comptes en linha" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Connectatz-vos a vòstres comptes en linha e decidètz de lor utilitat" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" msgstr "" -"Google;Facebook;Twitter;Yahoo;Web;En linha;Discussion;Agenda;Corrièr;Email;Co" -"ntacte;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" +"Google;Facebook;Twitter;Yahoo;Web;En linha;Discussion;Agenda;Corrièr;Email;" +"Contacte;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" #: ../panels/online-accounts/online-accounts.ui.h:1 msgid "No online accounts configured" @@ -3823,7 +3826,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2325 msgid "Battery" msgstr "Batariá" @@ -3864,8 +3867,10 @@ msgstr "Descargada" #: ../panels/power/cc-power-panel.c:799 +#, fuzzy +#| msgid "Battery" msgid "Batteries" -msgstr "Batariás" +msgstr "Batariá" #: ../panels/power/cc-power-panel.c:1227 msgid "When _idle" @@ -3880,7 +3885,6 @@ msgstr "Luminositat de l'e_cran" #: ../panels/power/cc-power-panel.c:1694 -#| msgid "Automatic Routes" msgid "Automatic brightness" msgstr "Luminositat automatica" @@ -3909,7 +3913,6 @@ msgstr "_Mobil de benda larga" #: ../panels/power/cc-power-panel.c:1821 -#| msgid "Turns off mobile broadband (3G, 4G, WiMax, etc.) devices" msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Atuda los periferics mobils de banda larga (3G, 4G, LTE, etc.) per estalviar " @@ -3927,55 +3930,52 @@ msgid "When plugged in" msgstr "Quand lo cable es brancat" -#: ../panels/power/cc-power-panel.c:2023 -#| msgid "Don't suspend" +#: ../panels/power/cc-power-panel.c:2026 msgid "Suspend" msgstr "Metre en velha" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2027 msgid "Hibernate" msgstr "Ivernar" -#: ../panels/power/cc-power-panel.c:2025 -#| msgid "Do nothing" +#: ../panels/power/cc-power-panel.c:2028 msgid "Nothing" msgstr "Pas res" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 -#| msgid "Suspend & Power Off" +#: ../panels/power/cc-power-panel.c:2142 msgid "Suspend & Power Button" msgstr "Metre en velha & atudar " -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2185 msgid "_Automatic suspend" msgstr "Mesa en velha _automatica" -#: ../panels/power/cc-power-panel.c:2116 -#| msgid "_Automatic suspend" +#: ../panels/power/cc-power-panel.c:2186 msgid "Automatic suspend" msgstr "Mesa en _velha automatica" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2253 msgid "_When the Power Button is pressed" msgstr "_Quand lo boton Aviar es quichat" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2379 msgid "Devices" msgstr "Periferics" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Energia" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "S'informar sus l'estat de la batariá e modificar los paramètres d'estalvi " "d'energia" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4068,138 +4068,138 @@ msgstr "Autentificacion requesida" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:588 +#: ../panels/printers/cc-printers-panel.c:678 msgid "Low on toner" msgstr "Toner gaireben agotat" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:590 +#: ../panels/printers/cc-printers-panel.c:680 msgid "Out of toner" msgstr "Pas mai de toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:593 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on developer" msgstr "Revelator gaireben agotat" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:596 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of developer" msgstr "Pas mai de revelator" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:598 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on a marker supply" msgstr "Cartocha de color gaireben voida" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:600 +#: ../panels/printers/cc-printers-panel.c:690 msgid "Out of a marker supply" msgstr "Cartocha de color voida" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:602 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Open cover" msgstr "Cobertor dobèrt" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:604 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Open door" msgstr "Pòrta dobèrta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:606 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Low on paper" msgstr "Gaireben pas mai de papièr" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:608 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Out of paper" msgstr "Pas mai de papièr" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:610 +#: ../panels/printers/cc-printers-panel.c:700 msgctxt "printer state" msgid "Offline" msgstr "Fòra linha" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:612 -#: ../panels/printers/cc-printers-panel.c:803 +#: ../panels/printers/cc-printers-panel.c:702 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Stopped" msgstr "Arrestada" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:614 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Waste receptacle almost full" -msgstr "Recipient de dagalhs gaireben plen" +msgstr "Recipient de degalhs gaireben plen" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:616 +#: ../panels/printers/cc-printers-panel.c:706 msgid "Waste receptacle full" msgstr "Recipient de degalhs plen" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:618 +#: ../panels/printers/cc-printers-panel.c:708 msgid "The optical photo conductor is near end of life" msgstr "Lo fotoconductor optic es gaireben en fin de vida" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:620 +#: ../panels/printers/cc-printers-panel.c:710 msgid "The optical photo conductor is no longer functioning" msgstr "Lo fotoconductor optic es pas mai en estat" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:730 +#: ../panels/printers/cc-printers-panel.c:820 msgctxt "printer state" msgid "Configuring" msgstr "Configuracion en cors" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:789 +#: ../panels/printers/cc-printers-panel.c:879 msgctxt "printer state" msgid "Ready" msgstr "Prèsta" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:794 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Does not accept jobs" -msgstr "Accèpta pas mai de prètzfaches suplementaris" +msgstr "Accèpta pas mai de prètzfaits suplementaris" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:799 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Processing" msgstr "Tractament en cors" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:919 +#: ../panels/printers/cc-printers-panel.c:1009 msgid "Toner Level" msgstr "Nivèl de toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:922 +#: ../panels/printers/cc-printers-panel.c:1012 msgid "Ink Level" msgstr "Nivèl de tencha" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:925 +#: ../panels/printers/cc-printers-panel.c:1015 msgid "Supply Level" msgstr "Estat dels consomables" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:943 +#: ../panels/printers/cc-printers-panel.c:1033 msgctxt "printer state" msgid "Installing" msgstr "Installacion en cors" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1420 +#: ../panels/printers/cc-printers-panel.c:1541 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4207,15 +4207,15 @@ msgstr[1] "%u activas" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1761 +#: ../panels/printers/cc-printers-panel.c:1882 msgid "Failed to add new printer." msgstr "L'apondon de la novèla imprimenta a fracassat." -#: ../panels/printers/cc-printers-panel.c:1928 +#: ../panels/printers/cc-printers-panel.c:2049 msgid "Select PPD File" msgstr "Seleccionatz un fichièr PPD" -#: ../panels/printers/cc-printers-panel.c:1937 +#: ../panels/printers/cc-printers-panel.c:2058 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4223,53 +4223,52 @@ "Fichièrs de descripcion PostScript de l'imprimenta (*.ppd, *.PPD, *.ppd.gz, " "*.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2244 +#: ../panels/printers/cc-printers-panel.c:2365 msgid "No suitable driver found" msgstr "Cap de pilòt adeqüat pas trobat" -#: ../panels/printers/cc-printers-panel.c:2315 +#: ../panels/printers/cc-printers-panel.c:2436 msgid "Searching for preferred drivers…" msgstr "Recèrca de pilòts preferits…" -#: ../panels/printers/cc-printers-panel.c:2336 +#: ../panels/printers/cc-printers-panel.c:2457 msgid "Select from database…" -msgstr "Seleccionar a partir de la banca de donadas…" +msgstr "Seleccionar a partir de la basa de donadas…" -#: ../panels/printers/cc-printers-panel.c:2345 +#: ../panels/printers/cc-printers-panel.c:2466 msgid "Provide PPD File…" msgstr "Provesir lo fichièr PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2496 -#: ../panels/printers/cc-printers-panel.c:2519 +#: ../panels/printers/cc-printers-panel.c:2613 +#: ../panels/printers/cc-printers-panel.c:2636 msgid "Test page" msgstr "Pagina de tèst" -#: ../panels/printers/cc-printers-panel.c:2632 -#| msgid "Printers" +#: ../panels/printers/cc-printers-panel.c:2749 msgid "No printers" msgstr "Pas d'mprimentas" #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:2939 +#: ../panels/printers/cc-printers-panel.c:3095 #, c-format msgid "Could not load ui: %s" msgstr "Impossible de cargar l'interfàcia d'utilizaire : %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Imprimentas" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" -"Apondre d'imprimentas, afichar los prètzfaches e decidir quand volètz " -"imprimir" +"Apondre d'imprimentas, afichar los prètzfaits e decidir quand volètz imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" -msgstr "Imprimenta;File;Queue;Impression;Papièr;Tencha;Toner;" +msgstr "Imprimenta;File;Queue;Impression;Papièr;Tinta;Toner;" #. Translators: this action removes (purges) all the listed jobs from the list. #: ../panels/printers/jobs-dialog.ui.h:2 @@ -4278,9 +4277,8 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -#| msgid "%s Active Jobs" msgid "No Active Printer Jobs" -msgstr "Pas de prètzfaches d'impression actius" +msgstr "Pas de prètzfaits d'impression actius" #: ../panels/printers/new-printer-dialog.ui.h:1 msgid "Add a New Printer" @@ -4316,7 +4314,7 @@ #: ../panels/printers/ppd-selection-dialog.ui.h:4 msgid "Loading drivers database..." -msgstr "Cargament de la banca de donadas dels pilòts…" +msgstr "Cargament de la basa de donadas dels pilòts…" #. Translators: The found device is a JetDirect printer #: ../panels/printers/pp-host.c:526 @@ -4349,7 +4347,7 @@ #. Translators: this is an option of "Orientation" #: ../panels/printers/pp-ipp-option-widget.c:72 msgid "Portrait" -msgstr "Retrach" +msgstr "Retrait" #. Translators: this is an option of "Orientation" #: ../panels/printers/pp-ipp-option-widget.c:74 @@ -4364,7 +4362,7 @@ #. Translators: this is an option of "Orientation" #: ../panels/printers/pp-ipp-option-widget.c:78 msgid "Reverse portrait" -msgstr "Retrach inversat" +msgstr "Retrait inversat" #. Translators: Job's state (job is waiting to be printed) #: ../panels/printers/pp-jobs-dialog.c:103 @@ -4374,8 +4372,6 @@ #. Translators: Job's state (job is held for printing) #: ../panels/printers/pp-jobs-dialog.c:107 -#| msgctxt "printer state" -#| msgid "Paused" msgctxt "print job" msgid "Paused" msgstr "En pausa" @@ -4413,10 +4409,9 @@ #. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -#| msgid "%s Active Jobs" msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" -msgstr "%s - Prètzfaches d'impression actius" +msgstr "%s - Prètzfaits d'impression actius" #. Translators: The found device is a printer connected via USB #: ../panels/printers/pp-new-printer-dialog.c:1659 @@ -4433,6 +4428,11 @@ msgid "Parallel Port" msgstr "Pòrt parallèl" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4507,7 +4507,7 @@ #: ../panels/printers/pp-options-dialog.c:663 msgctxt "Printer Option Group" msgid "Job" -msgstr "Prètzfaches" +msgstr "Prètzfaits" #. Translators: "Image Quality" tab contains settings for quality of output print (e.g. resolution) #: ../panels/printers/pp-options-dialog.c:666 @@ -4612,12 +4612,12 @@ #: ../panels/printers/printers.ui.h:9 msgid "Jobs" -msgstr "Prètzfaches" +msgstr "Prètzfaits" #. Translators: Opens a dialog containing printer #: ../panels/printers/printers.ui.h:11 msgid "Show _Jobs" -msgstr "Afichar los _prètzfaches" +msgstr "Afichar los _prètzfaits" #: ../panels/printers/printers.ui.h:12 msgid "Model" @@ -4647,7 +4647,6 @@ #. Translators: This button adds new printer. #: ../panels/printers/printers.ui.h:24 -#| msgid "Add Printer" msgid "Add a Printer" msgstr "Apondre una imprimenta" @@ -4660,77 +4659,95 @@ "O planhèm ! Sembla que lo servici d'impression \n" "del sistèma es pas disponible." -#: ../panels/privacy/cc-privacy-panel.c:352 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Verrolhatge de l'ecran" -#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:420 +msgid "In use" +msgstr "" + +#: ../panels/privacy/cc-privacy-panel.c:425 +msgctxt "Location services status" +msgid "On" +msgstr "I" + +#: ../panels/privacy/cc-privacy-panel.c:426 +msgctxt "Location services status" +msgid "Off" +msgstr "O" + +#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +msgid "Location Services" +msgstr "Servicis de _localizacion" + +#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Utilizacion e istoric" -#: ../panels/privacy/cc-privacy-panel.c:587 +#: ../panels/privacy/cc-privacy-panel.c:1001 msgid "Empty all items from Trash?" msgstr "Voidar completament l'escobilhièr ?" -#: ../panels/privacy/cc-privacy-panel.c:588 +#: ../panels/privacy/cc-privacy-panel.c:1002 msgid "All items in the Trash will be permanently deleted." msgstr "Tot lo contengut de l'escobilhièr serà definitivament suprimit." -#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Voidar l'escobilhièr" -#: ../panels/privacy/cc-privacy-panel.c:612 +#: ../panels/privacy/cc-privacy-panel.c:1026 msgid "Delete all the temporary files?" msgstr "Suprimir totes los fichièrs temporaris ?" -#: ../panels/privacy/cc-privacy-panel.c:613 +#: ../panels/privacy/cc-privacy-panel.c:1027 msgid "All the temporary files will be permanently deleted." msgstr "Totes los fichièrs temporaris seràn definitivament suprimits." -#: ../panels/privacy/cc-privacy-panel.c:614 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Purgar los fichièrs temporaris" -#: ../panels/privacy/cc-privacy-panel.c:636 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Voidar l'escobilhièr e los fichièrs temporaris" -#: ../panels/privacy/cc-privacy-panel.c:676 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" -msgstr "Statistiques d'utilizacion des logicials" +msgstr "Estatisticas d'utilizacion dels logicials" -#: ../panels/privacy/cc-privacy-panel.c:717 ../panels/privacy/privacy.ui.h:44 +#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" -msgstr "Signalement de problèmes" +msgstr "Senhalament de problèmas" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:731 +#: ../panels/privacy/cc-privacy-panel.c:1145 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data." msgstr "" -"Envoyer des rapports o signaler des problèmes techniques nous aide a " -"améliorer %s. Les rapports son envoyés anonymement e son épurés de toute " -"donnée personal." +"Mandar de rapòrts o senhalar de problèmas tecnics nos ajuda a melhorar %s. " +"Los rapòrts son mandats anonimament e son epurats de tota donada personala." -#: ../panels/privacy/cc-privacy-panel.c:743 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" -msgstr "Politique de confidentialité" +msgstr "Politica de confidencialitat" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Confidencialitat" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Protegir vòstras informacions personalas e contrarotlar çò que d'autres " "pòdon veire" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4844,6 +4861,14 @@ msgstr "Purgar _aprèp" #: ../panels/privacy/privacy.ui.h:37 +#, fuzzy +#| msgid "" +#| "Sending us information about which software you use helps us provide you " +#| "with more accurate recomandacions. It also helps us to improve our " +#| "software.\n" +#| "\n" +#| "All the information we collect is made anonymous, and we will never share " +#| "your data with third parties." msgid "" "Sending us information about which software you use helps us provide you " "with more accurate recommendations. It also helps us to improve our " @@ -4852,27 +4877,29 @@ "All the information we collect is made anonymous, and we will never share " "your data with third parties." msgstr "" -"L'envoi d'information sus l'usage des logicials nous aide a vous fournir des " -"recommendations plus précises e a améliorer nos logicials.\n" +"Lo mandadís d'informacion sus l'usatge dels logicials nos ajuda a vos " +"provesir de recomandacions mai precisas e a melhorar nòstres logicials.\n" "\n" -"Toutes las informacions que nous récoltons son anonymisés, e nous ne " -"partagerons jamais vos données avec un tiers." +"Totas las informacions que collectam son anonimizadas, e partejarem pas " +"jamai vòstras donadas amb un tèrç." #: ../panels/privacy/privacy.ui.h:40 msgid "_Send software usage statistics" msgstr "Mandar las _estatisticas d'utilizacion del logicial" -#: ../panels/privacy/privacy.ui.h:42 -msgid "_Location Services" -msgstr "Services de _localisation" - #: ../panels/privacy/privacy.ui.h:43 -msgid "Used to determine your geographical location" -msgstr "Servent a déterminer vòstra position géographique" +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" + +#: ../panels/privacy/privacy.ui.h:44 +msgid "_Location Services" +msgstr "Servicis de _localizacion" -#: ../panels/privacy/privacy.ui.h:45 +#: ../panels/privacy/privacy.ui.h:47 msgid "_Automatic Problem Reporting" -msgstr "Signalement _automatique de problèmes" +msgstr "Senhalament _automatic de problèmas" #: ../panels/region/cc-format-chooser.c:120 msgctxt "measurement format" @@ -4898,12 +4925,12 @@ msgstr "Autre" #: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1072 +#: ../panels/user-accounts/um-user-panel.c:1069 msgid "Your session needs to be restarted for changes to take effect" msgstr "Vos cal reaviar la session per que los cambiaments sián efectius" #: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1076 +#: ../panels/user-accounts/um-user-panel.c:1073 msgid "Restart Now" msgstr "Reaviar ara" @@ -4912,7 +4939,6 @@ msgstr "Cap de font d'entrada pas seleccionada" #: ../panels/region/cc-region-panel.c:1807 -#| msgid "Login Screen" msgid "Login _Screen" msgstr "Ecran _de connexion" @@ -4944,11 +4970,12 @@ msgid "Paper" msgstr "Papièr" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "País & lenga" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4956,7 +4983,7 @@ "d'entradas" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Lenga;Disposicion;Clavièr;Entrada;" @@ -5011,7 +5038,7 @@ #: ../panels/region/input-options.ui.h:11 msgid "Left+Right Alt" -msgstr "Alt de drecha+Alt d'esquèrra" +msgstr "Alt de dreita+Alt d'esquèrra" #: ../panels/region/region.ui.h:1 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 @@ -5023,7 +5050,6 @@ msgstr "Anglés (Granda Bretanha)" #: ../panels/region/region.ui.h:3 -#| msgid "Formats" msgid "_Formats" msgstr "_Formats" @@ -5057,7 +5083,7 @@ #: ../panels/region/region.ui.h:12 msgid "Show input source keyboard layout" -msgstr "Afichar la disposition de clavier de la font d'entrada" +msgstr "Afichar la disposicion de clavièr de la font d'entrada" #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" @@ -5092,11 +5118,12 @@ msgid "No applications found" msgstr "Cap d'aplicacion pas trobada" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Recercar" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5104,7 +5131,7 @@ "vista d'ensemble de las activitats" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Recercar;Recèrca;Indèx;Amagar;Confidencialitat;Privat;Resultats;" @@ -5136,7 +5163,6 @@ msgstr "O" #: ../panels/sharing/cc-sharing-panel.c:295 -#| msgid "Enabled" msgctxt "service is enabled" msgid "Enabled" msgstr "Activat" @@ -5144,36 +5170,66 @@ #: ../panels/sharing/cc-sharing-panel.c:298 msgctxt "service is active" msgid "Active" -msgstr "Actif" +msgstr "Actiu" #: ../panels/sharing/cc-sharing-panel.c:369 msgid "Choose a Folder" msgstr "Causir un dorsièr" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Lo partiment de fichièrs personals vos permet de partejar vòstre Dorsièr " +"public amb los autres sus la ret actuala en utilizant : dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"Allow remote users to connect using the Secure Shell command:\n" +"ssh %s" +msgstr "" +"Tot utilizaire distant se deu connectar amb l'ajuda d'aquesta comanda shell " +"securizada :\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Allow remote users to view or control your screen by connecting to: vnc://%s" +msgstr "" +"Tot utilizaire distant pòt veire o contrarotlar vòstre ecran en se " +"connectant a : vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copiar" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Partiment" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Partiment" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Contrarotlar çò que volètz partejar amb los autres" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 -#| msgid "" -#| "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;" -#| "video;pictures;photos;movies;server;renderer;" +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "" -"partiment;partejar;ssh;òste;nom;distant;burèu;bluetooth;obex;mèdia;àudio;vidè" -"o;imatges;fòtos;filmes;servidor;renderer;motor de rendut;" +"partiment;partejar;ssh;òste;nom;distant;burèu;bluetooth;obex;mèdia;àudio;" +"vidèo;imatges;fòtos;filmes;servidor;renderer;motor de rendut;" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5197,27 +5253,22 @@ msgstr "Rets" #: ../panels/sharing/sharing.ui.h:1 -#| msgid "Computer Name" msgid "_Computer Name" msgstr "_Nom de l'ordenador" #: ../panels/sharing/sharing.ui.h:2 -#| msgid "Personal File Sharing" msgid "_Personal File Sharing" msgstr "_Partiment de fichièrs personals" #: ../panels/sharing/sharing.ui.h:3 -#| msgid "Screen Sharing" msgid "_Screen Sharing" msgstr "Partiment _de l'ecran" #: ../panels/sharing/sharing.ui.h:4 -#| msgid "Media Sharing" msgid "_Media Sharing" msgstr "Partejar los _mèdias" #: ../panels/sharing/sharing.ui.h:5 -#| msgid "Remote Login" msgid "_Remote Login" msgstr "Conne_xion distanta" @@ -5229,89 +5280,54 @@ msgid "Personal File Sharing" msgstr "Partiment de fichièrs personals" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Lo partiment de fichièrs personals vos permet de partejar vòstre Dorsièr " -"public amb los autres sus la ret actuala en utilizant : dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 -#| msgid "Require Password" +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Demandar lo sen_hal" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Connexion distanta" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Tot utilizaire distant se deu connectar amb l'ajuda d'aquesta comanda shell " -"securizada :\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Partiment de l'ecran" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Tot utilizaire distant pòt veire o contrarotlar vòstre ecran en se " -"connectant a : vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -#| msgid "Allow Remote Control" +#: ../panels/sharing/sharing.ui.h:12 msgid "_Allow Remote Control" msgstr "_Autorizar lo contraròtle a distància" -#: ../panels/sharing/sharing.ui.h:20 -#| msgid "_Password" +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "Se_nhal :" -#: ../panels/sharing/sharing.ui.h:21 -#| msgid "Show Password" +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Afichar lo senhal" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Opcions d'accès" -#: ../panels/sharing/sharing.ui.h:23 -#| msgid "New connections must ask for access" +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Las novèlas connexions devon èsser explicitament validadas." -#: ../panels/sharing/sharing.ui.h:24 -#| msgid "Require a password" +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Demandar lo senhal" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Partejar los mèdias" -#: ../panels/sharing/sharing.ui.h:26 +#: ../panels/sharing/sharing.ui.h:19 msgid "" "Media sharing allows you to share music, photos and videos over the network." msgstr "" "Lo partiment multimèdia vos permet d'escambiar de musica, de fòtos e de " "vidèos sus la ret." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Dorsièrs" @@ -5361,7 +5377,7 @@ #: ../panels/sound/gvc-balance-bar.c:106 msgctxt "balance" msgid "Right" -msgstr "Drecha" +msgstr "Dreita" #: ../panels/sound/gvc-balance-bar.c:109 msgctxt "balance" @@ -5488,7 +5504,7 @@ #: ../panels/sound/gvc-mixer-dialog.c:1761 msgid "Sound Effects" -msgstr "Efièches sonòrs" +msgstr "Efèits sonòrs" #: ../panels/sound/gvc-mixer-dialog.c:1768 msgid "_Alert volume:" @@ -5539,23 +5555,28 @@ msgid "Subwoofer" msgstr "Caisson de bassa" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personalizada" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Accès universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Facilitar la vision, l'escota, la picada, la seleccion e lo clic" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" msgstr "" -"Clavièr;Mirga;ligam;Accessibilitat;Contraste;Zoom;Lector " -"d'ecran;tèxte;poliça;talha;Tòcas remanentas;Tòcas lentas;Rebombs de tòcas;" -"Tòcas de la mirga;" +"Clavièr;Mirga;ligam;Accessibilitat;Contraste;Zoom;Lector d'ecran;tèxte;" +"poliça;talha;Tòcas remanentas;Tòcas lentas;Rebombs de tòcas;Tòcas de la " +"mirga;" #: ../panels/universal-access/uap.ui.h:1 msgid "_Always Show Universal Access Menu" @@ -5599,12 +5620,10 @@ msgstr "Cla_vièr visual" #: ../panels/universal-access/uap.ui.h:13 -#| msgid "Repeat Keys" msgid "R_epeat Keys" msgstr "Tòcas de r_epeticion" #: ../panels/universal-access/uap.ui.h:14 -#| msgid "Cursor Blinking" msgid "Cursor _Blinking" msgstr "Cluque_jament del cursor" @@ -5614,7 +5633,7 @@ #: ../panels/universal-access/uap.ui.h:16 msgid "Pointing & Clicking" -msgstr "Pointage e clic de souris" +msgstr "Pointage e clic de mirga" #: ../panels/universal-access/uap.ui.h:17 msgid "_Mouse Keys" @@ -5625,12 +5644,10 @@ msgstr "Assistent de _clic" #: ../panels/universal-access/uap.ui.h:19 -#| msgid "_Double-click" msgid "_Double-Click Delay" msgstr "Relambi del _clic doble" #: ../panels/universal-access/uap.ui.h:20 -#| msgid "_Double-click" msgid "Double-Click Delay" msgstr "Relambi del clic doble" @@ -5652,9 +5669,9 @@ msgstr "Tòcas son" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "" -"Emet un bip al moment d'un quichada sus las tòcas Varr. Num. o Varr. Maj." +"Emet un bip al moment d'un quichada sus las tòcas Verr. Num. o Verr. Maj." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5681,17 +5698,14 @@ msgstr "Tòcas de repeticion" #: ../panels/universal-access/uap.ui.h:32 -#| msgid "Key presses _repeat when key is held down" msgid "Key presses repeat when key is held down." msgstr "Repeticion quand una tòca es mantenguda quichada." #: ../panels/universal-access/uap.ui.h:34 -#| msgid "Repeat keys speed" msgid "Repeat keys delay" msgstr "Velocitat de repeticion de las tòcas" #: ../panels/universal-access/uap.ui.h:35 -#| msgid "_Speed:" msgid "Speed" msgstr "Velocitat" @@ -5704,12 +5718,10 @@ msgstr "Cluquejament del cursor" #: ../panels/universal-access/uap.ui.h:38 -#| msgid "Cursor _blinks in text fields" msgid "Cursor blinks in text fields." msgstr "Lo cursor cluqueja dins los camps tèxte." #: ../panels/universal-access/uap.ui.h:39 -#| msgid "Cursor blink speed" msgid "Cursor blinking speed" msgstr "Velocitat de cluquejament del cursor" @@ -5722,6 +5734,8 @@ msgstr "Tòcas _remanentas" #: ../panels/universal-access/uap.ui.h:42 +#, fuzzy +#| msgid "Treats a sequence of modificar keys as a key combination" msgid "Treats a sequence of modifier keys as a key combination" msgstr "" "Tractar la picada d'una seguida de tòcas modificatrises coma una combinason " @@ -5732,8 +5746,10 @@ msgstr "_Desactivar se doas tòcas son quichadas simultanèament" #: ../panels/universal-access/uap.ui.h:44 +#, fuzzy +#| msgid "Beep when a _modifer key is pressed" msgid "Beep when a _modifier key is pressed" -msgstr "Emetrà un bip quand una tòca _modificatritz es quichada" +msgstr "Emetre un bip quand una tòca _modificatritz es quichada" #: ../panels/universal-access/uap.ui.h:45 msgid "S_low Keys" @@ -5909,44 +5925,37 @@ #: ../panels/universal-access/zoom-options.ui.h:5 msgid "Right Half" -msgstr "Mitat drecha" +msgstr "Mitat dreita" #: ../panels/universal-access/zoom-options.ui.h:6 msgid "Zoom Options" msgstr "Opcions del zoom" #: ../panels/universal-access/zoom-options.ui.h:8 -#| msgid "Magnification:" msgid "_Magnification:" msgstr "A_grandiment :" #: ../panels/universal-access/zoom-options.ui.h:9 -#| msgid "Follow mouse cursor" msgid "_Follow mouse cursor" msgstr "_Seguís lo cursor de la mirga" #: ../panels/universal-access/zoom-options.ui.h:10 -#| msgid "Screen part:" msgid "_Screen part:" msgstr "Partida d'_ecran :" #: ../panels/universal-access/zoom-options.ui.h:11 -#| msgid "Magnifier extends outside of screen" msgid "Magnifier _extends outside of screen" msgstr "La lópia s'_espandís en defòra de l'ecran" #: ../panels/universal-access/zoom-options.ui.h:12 -#| msgid "Keep magnifier cursor centered" msgid "_Keep magnifier cursor centered" msgstr "_Garda lo cursor de la lópia centrat" #: ../panels/universal-access/zoom-options.ui.h:13 -#| msgid "Magnifier cursor pushes contents around" msgid "Magnifier cursor _pushes contents around" msgstr "Lo cursor de la _lópia escarta lo contengut" #: ../panels/universal-access/zoom-options.ui.h:14 -#| msgid "Magnifier cursor moves with contents" msgid "Magnifier cursor moves with _contents" msgstr "Lo cursor de la lópia seguís lo _contengut" @@ -5959,7 +5968,6 @@ msgstr "Lópia" #: ../panels/universal-access/zoom-options.ui.h:17 -#| msgid "Thickness:" msgid "_Thickness:" msgstr "_Espessor :" @@ -5974,23 +5982,19 @@ msgstr "Espessa" #: ../panels/universal-access/zoom-options.ui.h:20 -#| msgid "Length:" msgid "_Length:" msgstr "_Largor :" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -#| msgid "Color:" msgid "Co_lor:" msgstr "Co_lor :" #: ../panels/universal-access/zoom-options.ui.h:23 -#| msgid "Crosshairs:" msgid "_Crosshairs:" msgstr "Puntadors en _crotz :" #: ../panels/universal-access/zoom-options.ui.h:24 -#| msgid "Overlaps mouse cursor" msgid "_Overlaps mouse cursor" msgstr "Rec_obrís lo cursor de la mirga" @@ -5999,17 +6003,14 @@ msgstr "Puntadors en crotz" #: ../panels/universal-access/zoom-options.ui.h:26 -#| msgid "White on black:" msgid "_White on black:" msgstr "_Blanc sus negre :" #: ../panels/universal-access/zoom-options.ui.h:27 -#| msgid "Brightness:" msgid "_Brightness:" msgstr "_Luminositat :" #: ../panels/universal-access/zoom-options.ui.h:28 -#| msgid "Contrast:" msgid "_Contrast:" msgstr "_Contraste :" @@ -6051,11 +6052,11 @@ #: ../panels/universal-access/zoom-options.ui.h:37 msgid "Color Effects:" -msgstr "Efièches de color :" +msgstr "Efèits de color :" #: ../panels/universal-access/zoom-options.ui.h:38 msgid "Color Effects" -msgstr "Efièches de color" +msgstr "Efèits de color" #: ../panels/user-accounts/data/account-dialog.ui.h:1 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 @@ -6081,12 +6082,10 @@ msgstr "_Tipe de compte" #: ../panels/user-accounts/data/account-dialog.ui.h:7 -#| msgid "Allow user to set a password when they next login" msgid "Allow user to set a password when they next _login" msgstr "Autorizar _l'utilizaire a definir un senhal a la connexion que ven" #: ../panels/user-accounts/data/account-dialog.ui.h:8 -#| msgid "Set a password now" msgid "Set a password _now" msgstr "Definir _un senhal ara" @@ -6139,7 +6138,7 @@ "type their domain password here." msgstr "" "Per utilizar d'identificants d'entrepresa, aqueste ordenador deu\n" -"èsser inscrich al domeni. Demandatz a vòstre administrator de\n" +"èsser inscrit al domeni. Demandatz a vòstre administrator de\n" "ret de picar son senhal del domeni aicí." #: ../panels/user-accounts/data/account-dialog.ui.h:24 @@ -6168,28 +6167,28 @@ #: ../panels/user-accounts/data/account-fingerprint.ui.h:5 msgid "Right thumb" -msgstr "Poce drech" +msgstr "Poce dreit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:6 msgid "Right middle finger" -msgstr "Major drech" +msgstr "Major dreit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:7 msgid "Right ring finger" -msgstr "Anular drech" +msgstr "Anular dreit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:8 msgid "Right little finger" -msgstr "Auricular drech" +msgstr "Auricular dreit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:688 msgid "Enable Fingerprint Login" -msgstr "Activar l'identificacion de connexion per emprencha digitala" +msgstr "Activar l'identificacion de connexion per emprenta digitala" #: ../panels/user-accounts/data/account-fingerprint.ui.h:10 msgid "_Right index finger" -msgstr "Indèx _drech" +msgstr "Indèx _dreit" #: ../panels/user-accounts/data/account-fingerprint.ui.h:11 msgid "_Left index finger" @@ -6204,8 +6203,8 @@ "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." msgstr "" -"L'enregistrament de vòstra emprencha digitala a capitat. Vos caldriá ara " -"poder vos identificar amb l'ajuda del lector d'emprenchas digitalas." +"L'enregistrament de vòstra emprenta digitala a capitat. Vos caldriá ara " +"poder vos identificar amb l'ajuda del lector d'emprentas digitalas." #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1 msgid "Users" @@ -6218,7 +6217,7 @@ #. Translators: those are keywords for the user accounts control-center panel #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" -msgstr "Connexion;Nom;Emprencha;Avatar;Lògo;Visatge;Cap;Senhal;" +msgstr "Connexion;Nom;Emprenta;Avatar;Lògo;Visatge;Cap;Senhal;" #: ../panels/user-accounts/data/history-dialog.ui.h:1 msgid "Login History" @@ -6270,7 +6269,7 @@ #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Fingerprint Login" -msgstr "Connexion per _reconeissença d'emprenchas" +msgstr "Connexion per _reconeissença d'emprentas" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "User Icon" @@ -6316,7 +6315,7 @@ #: ../panels/user-accounts/pw-utils.c:91 msgctxt "Password hint" msgid "Try to avoid some of the words included in the password." -msgstr "Ensajatz d'evitar d'unes mots contenguts dins lo senhal." +msgstr "Ensajatz d'evitar d'unas mots contenguts dins lo senhal." #: ../panels/user-accounts/pw-utils.c:95 msgctxt "Password hint" @@ -6351,8 +6350,7 @@ #: ../panels/user-accounts/pw-utils.c:107 msgctxt "Password hint" msgid "Try to use a mixture of letters, numbers and punctuation." -msgstr "" -"Ensajatz d'utilizar una mescla de letras, de chifras e de ponctuacions." +msgstr "Ensajatz d'utilizar una mescla de letras, de chifras e de pontuacions." #: ../panels/user-accounts/pw-utils.c:109 msgctxt "Password hint" @@ -6366,7 +6364,7 @@ "letters, numbers and punctuation." msgstr "" "Ensajatz d'evitar la repeticion del meteis caractèr : vos cal mesclar de " -"letras, de chifras e de ponctuacions." +"letras, de chifras e de pontuacions." #: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" @@ -6389,7 +6387,7 @@ "Good password! Adding more letters, numbers and punctuation will make it " "stronger." msgstr "" -"Senhal corrècte ! Se i apondètz mai de letras, de chifras e de ponctuacions, " +"Senhal corrècte ! Se i apondètz mai de letras, de chifras e de pontuacions, " "vendrà pus fòrt." #: ../panels/user-accounts/pw-utils.c:141 @@ -6503,7 +6501,7 @@ "Please try again." msgstr "" "Aqueste identificant de connexion fonciona pas.\n" -"Ensajatz tornarmai." +"Ensajatz tornamai." #: ../panels/user-accounts/um-account-dialog.c:1050 msgid "" @@ -6511,7 +6509,7 @@ "Please try again." msgstr "" "Aqueste senhal de connexion fonciona pas.\n" -"Ensajatz tornarmai." +"Ensajatz tornamai." #: ../panels/user-accounts/um-account-dialog.c:1058 msgid "Failed to log into domain" @@ -6521,49 +6519,49 @@ msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Impossible de trobar aqueste domeni. Verificatz son ortografia." -#: ../panels/user-accounts/um-fingerprint-dialog.c:138 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Avètz pas accès al periferic. Contactatz vòstre administrator del sistèma." -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "The device is already in use." msgstr "Lo periferic es ja utilizat." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:144 msgid "An internal error occurred." -msgstr "Una error intèrna s'es producha." +msgstr "Una error intèrna s'es produita." -#: ../panels/user-accounts/um-fingerprint-dialog.c:216 +#: ../panels/user-accounts/um-fingerprint-dialog.c:218 msgid "Enabled" msgstr "Activat" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 msgid "Delete registered fingerprints?" -msgstr "Suprimir las emprenchas enregistradas ?" +msgstr "Suprimir las emprentas enregistradas ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:269 msgid "_Delete Fingerprints" -msgstr "_Suprimir las emprenchas" +msgstr "_Suprimir las emprentas" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:275 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "" -"Volètz suprimir las emprenchas digitalas enregistradas e desactivar atal " +"Volètz suprimir las emprentas digitalas enregistradas e desactivar atal " "aqueste tipe de connexion ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:445 msgid "Done!" msgstr "Acabat !" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:506 +#: ../panels/user-accounts/um-fingerprint-dialog.c:548 #, c-format msgid "Could not access '%s' device" msgstr "Impossible d'accedir al periferic « %s »" @@ -6571,16 +6569,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:589 #, c-format msgid "Could not start finger capture on '%s' device" -msgstr "Impossible d'aviar la captura d'emprenchas amb lo periferic « %s »" +msgstr "Impossible d'aviar la captura d'emprentas amb lo periferic « %s »" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Could not access any fingerprint readers" -msgstr "Cap de lector d'emprenchas digitalas es pas accessible" +msgstr "Cap de lector d'emprentas digitalas es pas accessible" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:640 msgid "Please contact your system administrator for help." msgstr "Contactatz vòstre administrator del sistèma per assisténcia." @@ -6589,28 +6587,28 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:722 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "" -"Per activar l'autentificacion per emprenchas digitalas, vos cal enregistrar " -"una de vòstras emprenchas amb l'ajuda del periferic « %s »." +"Per activar l'autentificacion per emprentas digitalas, vos cal enregistrar " +"una de vòstras emprentas amb l'ajuda del periferic « %s »." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Selecting finger" msgstr "Seleccion del det" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Enrolling fingerprints" -msgstr "Enregistrament de las emprenchas digitalas" +msgstr "Enregistrament de las emprentas digitalas" -#: ../panels/user-accounts/um-history-dialog.c:68 +#: ../panels/user-accounts/um-history-dialog.c:70 msgid "This Week" msgstr "Aquesta setmana" -#: ../panels/user-accounts/um-history-dialog.c:71 +#: ../panels/user-accounts/um-history-dialog.c:73 msgid "Last Week" msgstr "La setmana passada" @@ -6618,22 +6616,22 @@ #. shown as the first day of a week on login history dialog. #. Translators: This is a date format string in the style of "Feb 24", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:77 -#: ../panels/user-accounts/um-history-dialog.c:81 +#: ../panels/user-accounts/um-history-dialog.c:79 +#: ../panels/user-accounts/um-history-dialog.c:83 msgctxt "login history week label" msgid "%b %e" msgstr "%b %e" #. Translators: This is a date format string in the style of "Feb 24, 2013", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:86 +#: ../panels/user-accounts/um-history-dialog.c:88 msgctxt "login history week label" msgid "%b %e, %Y" msgstr "%b %e, %Y" #. Translators: This indicates a week label on a login history. #. The first %s is the first day of a week, and the second %s the last day. -#: ../panels/user-accounts/um-history-dialog.c:91 +#: ../panels/user-accounts/um-history-dialog.c:93 #, c-format msgctxt "login history week label" msgid "%s - %s" @@ -6641,26 +6639,26 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. -#: ../panels/user-accounts/um-history-dialog.c:175 -#: ../panels/user-accounts/um-user-panel.c:844 +#: ../panels/user-accounts/um-history-dialog.c:177 +#: ../panels/user-accounts/um-user-panel.c:841 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. -#: ../panels/user-accounts/um-history-dialog.c:178 -#: ../panels/user-accounts/um-user-panel.c:848 +#: ../panels/user-accounts/um-history-dialog.c:180 +#: ../panels/user-accounts/um-user-panel.c:845 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:247 +#: ../panels/user-accounts/um-history-dialog.c:249 msgid "Session Ended" msgstr "Fin de session" -#: ../panels/user-accounts/um-history-dialog.c:253 +#: ../panels/user-accounts/um-history-dialog.c:255 msgid "Session Started" msgstr "Començament de session" @@ -6670,7 +6668,7 @@ #: ../panels/user-accounts/um-password-dialog.c:154 msgid "Please type your current password again." -msgstr "Picatz tornarmai vòstre senhal actual." +msgstr "Picatz tornamai vòstre senhal actual." #: ../panels/user-accounts/um-password-dialog.c:160 msgid "Password could not be changed" @@ -6718,37 +6716,37 @@ #: ../panels/user-accounts/um-realm-manager.c:821 msgid "Invalid password, please try again" -msgstr "Senhal invalid, ensajatz tornarmai" +msgstr "Senhal invalid, ensajatz tornamai" #: ../panels/user-accounts/um-realm-manager.c:834 #, c-format msgid "Couldn't connect to the %s domain: %s" msgstr "Connexion al domeni %s impossibla : %s" -#: ../panels/user-accounts/um-user-panel.c:240 +#: ../panels/user-accounts/um-user-panel.c:237 msgid "Other Accounts" msgstr "Autres comptes" -#: ../panels/user-accounts/um-user-panel.c:450 +#: ../panels/user-accounts/um-user-panel.c:447 msgid "Failed to delete user" msgstr "La supression de l'utilizaire a fracassat" -#: ../panels/user-accounts/um-user-panel.c:510 -#: ../panels/user-accounts/um-user-panel.c:569 -#: ../panels/user-accounts/um-user-panel.c:621 +#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:566 +#: ../panels/user-accounts/um-user-panel.c:618 msgid "Failed to revoke remotely managed user" msgstr "La revocacion de l'utilizaire gerit a distància a fracassat" -#: ../panels/user-accounts/um-user-panel.c:677 +#: ../panels/user-accounts/um-user-panel.c:674 msgid "You cannot delete your own account." msgstr "Podètz pas suprimir vòstre pròpri compte." -#: ../panels/user-accounts/um-user-panel.c:686 +#: ../panels/user-accounts/um-user-panel.c:683 #, c-format msgid "%s is still logged in" msgstr "%s es encara connectat" -#: ../panels/user-accounts/um-user-panel.c:690 +#: ../panels/user-accounts/um-user-panel.c:687 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -6756,12 +6754,12 @@ "Suprimir un utilizaire mentre qu'es connectat pòt daissar lo sistèma dins un " "estat instable." -#: ../panels/user-accounts/um-user-panel.c:699 +#: ../panels/user-accounts/um-user-panel.c:696 #, c-format msgid "Do you want to keep %s's files?" msgstr "Volètz conservar los fichièrs de %s ?" -#: ../panels/user-accounts/um-user-panel.c:703 +#: ../panels/user-accounts/um-user-panel.c:700 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -6770,51 +6768,51 @@ "espèra (lo « spool ») e los fichièrs temporaris d'un compte d'utilizaire al " "moment de sa supression." -#: ../panels/user-accounts/um-user-panel.c:706 +#: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" msgstr "_Suprimir los fichièrs" -#: ../panels/user-accounts/um-user-panel.c:707 +#: ../panels/user-accounts/um-user-panel.c:704 msgid "_Keep Files" msgstr "_Conservar los fichièrs" -#: ../panels/user-accounts/um-user-panel.c:721 +#: ../panels/user-accounts/um-user-panel.c:718 #, c-format msgid "Are you sure you want to revoke remotely managed %s's account?" -msgstr "Êtes-vous sûr de vouloir révoquer lo compte distant de %s ?" +msgstr "Sètz segur que volètz revocar lo compte distant de %s ?" -#: ../panels/user-accounts/um-user-panel.c:725 +#: ../panels/user-accounts/um-user-panel.c:722 msgid "_Delete" msgstr "_Suprimir" -#: ../panels/user-accounts/um-user-panel.c:777 +#: ../panels/user-accounts/um-user-panel.c:774 msgctxt "Password mode" msgid "Account disabled" msgstr "Compte desactivat" -#: ../panels/user-accounts/um-user-panel.c:785 +#: ../panels/user-accounts/um-user-panel.c:782 msgctxt "Password mode" msgid "To be set at next login" msgstr "De definir al moment de la connexion que ven" -#: ../panels/user-accounts/um-user-panel.c:788 +#: ../panels/user-accounts/um-user-panel.c:785 msgctxt "Password mode" msgid "None" msgstr "Pas cap" -#: ../panels/user-accounts/um-user-panel.c:837 +#: ../panels/user-accounts/um-user-panel.c:834 msgid "Logged in" msgstr "Connectat" -#: ../panels/user-accounts/um-user-panel.c:1275 +#: ../panels/user-accounts/um-user-panel.c:1272 msgid "Failed to contact the accounts service" msgstr "La connexion al servici dels comptes a fracassat" -#: ../panels/user-accounts/um-user-panel.c:1277 +#: ../panels/user-accounts/um-user-panel.c:1274 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Verificatz que AccountService es installat e activat." -#: ../panels/user-accounts/um-user-panel.c:1318 +#: ../panels/user-accounts/um-user-panel.c:1315 msgid "" "To make changes,\n" "click the * icon first" @@ -6822,12 +6820,12 @@ "Per efectuar las modificacions,\n" "clicatz primièr sus l'icòna *" -#: ../panels/user-accounts/um-user-panel.c:1356 +#: ../panels/user-accounts/um-user-panel.c:1353 msgid "Create a user account" msgstr "Crear un compte d'utilizaire" -#: ../panels/user-accounts/um-user-panel.c:1367 -#: ../panels/user-accounts/um-user-panel.c:1679 +#: ../panels/user-accounts/um-user-panel.c:1364 +#: ../panels/user-accounts/um-user-panel.c:1676 msgid "" "To create a user account,\n" "click the * icon first" @@ -6835,12 +6833,12 @@ "Per crear un compte d'utilizaire,\n" "clicatz primièr sus l'icòna *" -#: ../panels/user-accounts/um-user-panel.c:1377 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Delete the selected user account" msgstr "Suprimir lo compte d'utilizaire seleccionat" -#: ../panels/user-accounts/um-user-panel.c:1389 -#: ../panels/user-accounts/um-user-panel.c:1684 +#: ../panels/user-accounts/um-user-panel.c:1386 +#: ../panels/user-accounts/um-user-panel.c:1681 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6848,14 +6846,14 @@ "Per suprimir lo compte d'utilizaire seleccionat,\n" "clicatz primièr sus l'icòna *" -#: ../panels/user-accounts/um-user-panel.c:1593 +#: ../panels/user-accounts/um-user-panel.c:1590 msgid "My Account" msgstr "Mon compte" #: ../panels/user-accounts/um-utils.c:563 #, c-format msgid "A user with the username '%s' already exists." -msgstr "Un utilizaire nommé « %s » existe déjà." +msgstr "Un utilizaire nomenat « %s » existís ja." #: ../panels/user-accounts/um-utils.c:567 #, c-format @@ -6872,7 +6870,7 @@ "digits and any of characters '.', '-' and '_'." msgstr "" "Un nom d'utilizaire pòt pas conténer que de letras minusculas o majusculas " -"de a a z, de chifras e l'un dels caractèrs « . », « - » o « _ »." +"de a a z, de chifras e un dels caractèrs « . », « - » o « _ »." #: ../panels/user-accounts/um-utils.c:577 msgid "This will be used to name your home folder and can't be changed." @@ -6880,16 +6878,6 @@ "Aquò es utilizat per nomenar vòstre dorsièr personal e pòt pas èsser " "modificat." -#. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/user-accounts/um-utils.c:823 -msgid "%b %e" -msgstr "%b %e" - -#. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/user-accounts/um-utils.c:827 -msgid "%b %e, %Y" -msgstr "%b %e, %Y" - #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" msgstr "Associar los botons" @@ -6975,19 +6963,19 @@ msgid "Button" msgstr "Boton" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tauleta Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Associar los botons e ajustar la sensibilitat de l'estilet de las tauleta s " "graficas" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tauleta ;Wacom;Stylet;Goma;Mirga;" @@ -7005,7 +6993,7 @@ #: ../panels/wacom/gnome-wacom-properties.ui.h:4 msgid "_Help" -msgstr "_Aide" +msgstr "_Ajuda" #: ../panels/wacom/gnome-wacom-properties.ui.h:6 msgid "No tablet detected" @@ -7019,6 +7007,10 @@ msgid "Bluetooth Settings" msgstr "Paramètres del Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tauleta Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Associar a l'ecran…" @@ -7060,12 +7052,12 @@ #. If no mode is available, we use "right-ring-mode-1" for backward compat #: ../panels/wacom/gsd-wacom-device.c:1059 msgid "Right Ring" -msgstr "Ring drech" +msgstr "Ring dreit" #: ../panels/wacom/gsd-wacom-device.c:1070 #, c-format msgid "Right Ring Mode #%d" -msgstr "Mòde Ring drech numèro %d" +msgstr "Mòde Ring dreit numèro %d" #. If no mode is available, we use "left-strip-mode-1" for backward compat #: ../panels/wacom/gsd-wacom-device.c:1112 @@ -7080,12 +7072,12 @@ #. If no mode is available, we use "right-strip-mode-1" for backward compat #: ../panels/wacom/gsd-wacom-device.c:1143 msgid "Right Touchstrip" -msgstr "Touchstrip drech" +msgstr "Touchstrip dreit" #: ../panels/wacom/gsd-wacom-device.c:1154 #, c-format msgid "Right Touchstrip Mode #%d" -msgstr "Mòde Touchstrip drech numèro %d" +msgstr "Mòde Touchstrip dreit numèro %d" #: ../panels/wacom/gsd-wacom-device.c:1180 #, c-format @@ -7095,7 +7087,7 @@ #: ../panels/wacom/gsd-wacom-device.c:1182 #, c-format msgid "Right Touchring Mode Switch" -msgstr "Comutator del mòde Touchring drech" +msgstr "Comutator del mòde Touchring dreit" #: ../panels/wacom/gsd-wacom-device.c:1185 #, c-format @@ -7105,29 +7097,29 @@ #: ../panels/wacom/gsd-wacom-device.c:1187 #, c-format msgid "Right Touchstrip Mode Switch" -msgstr "Comutator del mòde Touchstrip drech" +msgstr "Comutator del mòde Touchstrip dreit" #: ../panels/wacom/gsd-wacom-device.c:1192 #, c-format msgid "Mode Switch #%d" msgstr "Comutator de mòde numèro %d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Boton esquèrra numèro %d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" -msgstr "Boton drech numèro %d" +msgstr "Boton dreit numèro %d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Boton superior numèro %d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Boton inferior numèro %d" @@ -7150,7 +7142,7 @@ #: ../panels/wacom/wacom-stylus-page.ui.h:4 msgid "Right Mouse Button Click" -msgstr "Clic del boton drech de la mirga" +msgstr "Clic del boton dreit de la mirga" #: ../panels/wacom/wacom-stylus-page.ui.h:5 msgid "Scroll Up" @@ -7166,7 +7158,7 @@ #: ../panels/wacom/wacom-stylus-page.ui.h:8 msgid "Scroll Right" -msgstr "Desfilament cap a drecha" +msgstr "Desfilament cap a dreita" #: ../panels/wacom/wacom-stylus-page.ui.h:9 msgid "Back" @@ -7221,7 +7213,6 @@ "configuracion de divèrses aspèctes de vòstre environament." #: ../shell/cc-application.c:45 -#| msgid "Display Brightness" msgid "Display version number" msgstr "Afichar lo numèro de la version" @@ -7247,7 +7238,7 @@ #: ../shell/cc-application.c:50 msgid "[PANEL] [ARGUMENT…]" -msgstr "[PANEL] [ARGUMENT…]" +msgstr "[PANÈL] [ARGUMENT…]" #: ../shell/cc-application.c:113 msgid "Available panels:" @@ -7261,22 +7252,22 @@ msgid "Quit" msgstr "Quitar" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494 +#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 msgid "All Settings" msgstr "Totes los paramètres" #. Add categories -#: ../shell/cc-window.c:880 +#: ../shell/cc-window.c:881 msgctxt "category" msgid "Personal" msgstr "Personal" -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:882 msgctxt "category" msgid "Hardware" msgstr "Material" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:883 msgctxt "category" msgid "System" msgstr "Sistèma" @@ -7286,19 +7277,16 @@ msgstr "Preferéncias;Paramètres;Reglatges;" #: ../shell/help-overlay.ui.h:1 -#| msgid "General" msgctxt "shortcut window" msgid "General" msgstr "General" #: ../shell/help-overlay.ui.h:2 -#| msgid "Quit" msgctxt "shortcut window" msgid "Quit" msgstr "Quitar" #: ../shell/help-overlay.ui.h:3 -#| msgid "Search" msgctxt "shortcut window" msgid "Search" msgstr "Recercar" @@ -7309,18 +7297,33 @@ msgstr "Panèls" #: ../shell/help-overlay.ui.h:5 -#| msgid "Show the overview" msgctxt "shortcut window" msgid "Go back to the overview" msgstr "Tornar a la vista d'ensemble" #: ../shell/help-overlay.ui.h:6 -#| msgctxt "print job" -#| msgid "Canceled" msgctxt "shortcut window" msgid "Cancel search" msgstr "Anullar la recèrca" +#~ msgid "Batariás" +#~ msgstr "Batariás" + +#~ msgid "Beep when a _modificar key is pressed" +#~ msgstr "Emetrà un bip quand una tòca _modificatritz es quichada" + +#~ msgid "Color" +#~ msgstr "Color" + +#~ msgid "Power" +#~ msgstr "Energia" + +#~ msgid "Privacy" +#~ msgstr "Confidencialitat" + +#~ msgid "Used to determine your geographical location" +#~ msgstr "Servent a déterminer vòstra position géographique" + #~ msgid "Flickr" #~ msgstr "Flickr" @@ -7364,7 +7367,7 @@ #~ "If you remove the device, you will have to set it up again before next " #~ "use." #~ msgstr "" -#~ "Se levatz lo periferic, vos lo caldrà parametrar tornarmai abans " +#~ "Se levatz lo periferic, vos lo caldrà parametrar tornamai abans " #~ "l'utilizacion que ven." #~ msgid "Done" @@ -7445,7 +7448,7 @@ #~ msgctxt "mouse, right button as primary" #~ msgid "_Right" -#~ msgstr "_Drech" +#~ msgstr "_Dreit" #~ msgid "_Pointer speed" #~ msgstr "_Velocitat del puntador" @@ -7546,7 +7549,7 @@ #~ msgstr "Cap d'imprimenta pas disponibla" #~ msgid "Active Jobs" -#~ msgstr "Prètzfaches actius" +#~ msgstr "Prètzfaits actius" #~ msgid "Close" #~ msgstr "Tampar" @@ -7558,7 +7561,7 @@ #~ msgstr "Metre l'impression en pausa" #~ msgid "Cancel Print Job" -#~ msgstr "Anullar lo preètzfach d'impression" +#~ msgstr "Anullar lo preètzfait d'impression" #~ msgid "Search for network printers or filter result" #~ msgstr "Recercar d'imprimentas de ret o filtrar lo resultat" @@ -7572,10 +7575,10 @@ #~ msgstr "Suspenduda" #~ msgid "Job Title" -#~ msgstr "Intitulat del prètzfach" +#~ msgstr "Intitulat del prètzfait" #~ msgid "Job State" -#~ msgstr "Estat del prètzfach" +#~ msgstr "Estat del prètzfait" #~ msgid "Time" #~ msgstr "Orodatatge" @@ -7661,9 +7664,6 @@ #~ msgid "Pointing and Clicking" #~ msgstr "Puntatge e clic de mirga" -#~ msgid "Beep when a _modifer key is pressed" -#~ msgstr "Emetre un bip quand una tòca _modificatritz es quichada" - #~ msgid "Zoom" #~ msgstr "Zoom" @@ -7714,29 +7714,26 @@ #~ "Image files can be dragged on this window to auto-complete the above " #~ "fields." #~ msgstr "" -#~ "Des fichièrs images peuvent être glissés dans cette fenêtre pour " -#~ "compléter automatiquement les champs ci-dessus." +#~ "Des fichièrs images pòdon èsser lisats dins aquesta fenèstra per " +#~ "completar automatiquement los camps çaisús." #~ msgid "Show your primary display on this screen also" -#~ msgstr "Afficher votre vue principale sur cet écran aussi" +#~ msgstr "Afichar vòstra vista principala sus aqueste ecran tanben" #~ msgid "Combine" #~ msgstr "Associar" #~ msgid "Join with the primary display to create an extra space" -#~ msgstr "Accoller avec l'écran principal pour élargir l'espace" +#~ msgstr "Accoller amb l'ecran principal per élargir l'espace" #~ msgid "Don't use the display" -#~ msgstr "Ne pas utiliser l'écran" - -#~ msgid "Refresh Rate" -#~ msgstr "Fréquence de rafraîchissement" +#~ msgstr "Utilizar pas l'ecran" #~ msgid "Mouse Preferences" -#~ msgstr "Préférences de la souris" +#~ msgstr "Preferéncias de la mirga" #~ msgid "Select the interface to use for the new service" -#~ msgstr "Sélectionner l'interface à utiliser pour le nouveau service" +#~ msgstr "Seleccionar l'interface a utilizar per lo nouveau service" #~ msgid "C_reate…" #~ msgstr "C_rear…" @@ -7745,30 +7742,30 @@ #~ msgstr "_Interfàcia" #~ msgid "Changing photo for:" -#~ msgstr "Modifier la photo de :" +#~ msgstr "Modificar la fòto de :" #~ msgid "" #~ "Choose a picture that will be shown at the login screen for this account." #~ msgstr "" -#~ "Choisir una image à afficher sur l'écran de connexion pour ce compte." +#~ "Causir un imatge a afichar sus l'ecran de connexion per aqueste compte." #~ msgid "Gallery" -#~ msgstr "Collection d'images" +#~ msgstr "Colleccion d'imatges" #~ msgid "Take a photograph" -#~ msgstr "Prendre una photo" +#~ msgstr "Prene una fòto" #~ msgid "Browse" -#~ msgstr "Rechercher" +#~ msgstr "Recercar" #~ msgid "Photograph" -#~ msgstr "Photo" +#~ msgstr "Fòto" #~ msgid "Account Information" -#~ msgstr "Informations del compte" +#~ msgstr "Informacions del compte" #~ msgid "Switch between AM and PM." -#~ msgstr "Basculer entre AM e PM." +#~ msgstr "Bascular entre AM e PM." #~ msgid "Estimated battery capacity: %s" #~ msgstr "Autonomie estimée : %s" @@ -7777,40 +7774,40 @@ #~ msgstr "Exporter" #~ msgid "Left Shift" -#~ msgstr "Maj de gauche" +#~ msgstr "Maj d'esquèrra" #~ msgid "Left Alt" -#~ msgstr "Alt de gauche" +#~ msgstr "Alt d'esquèrra" #~ msgid "Left Ctrl" -#~ msgstr "Ctrl de gauche" +#~ msgstr "Ctrl d'esquèrra" #~ msgid "Right Shift" -#~ msgstr "Maj de droite" +#~ msgstr "Maj de dreita" #~ msgid "Right Alt" -#~ msgstr "Alt de droite" +#~ msgstr "Alt de dreita" #~ msgid "Right Ctrl" -#~ msgstr "Ctrl de droite" +#~ msgstr "Ctrl de dreita" #~ msgid "Left Alt+Shift" -#~ msgstr "Alt+Maj de gauche" +#~ msgstr "Alt+Maj d'esquèrra" #~ msgid "Right Alt+Shift" -#~ msgstr "Alt+Maj de droite" +#~ msgstr "Alt+Maj de dreita" #~ msgid "Left Ctrl+Shift" -#~ msgstr "Ctrl+Maj de gauche" +#~ msgstr "Ctrl+Maj d'esquèrra" #~ msgid "Right Ctrl+Shift" -#~ msgstr "Ctrl+Maj de droite" +#~ msgstr "Ctrl+Maj de dreita" #~ msgid "Left+Right Shift" -#~ msgstr "Maj de droite+Maj de gauche" +#~ msgstr "Maj de dreita+Maj d'esquèrra" #~ msgid "Left+Right Ctrl" -#~ msgstr "Ctrl de gauche+Ctrl de droite" +#~ msgstr "Ctrl d'esquèrra+Ctrl de dreita" #~ msgid "Alt+Shift" #~ msgstr "Alt+Maj" @@ -7834,28 +7831,28 @@ #~ msgstr "Ctrl+Verr.Maj." #~ msgid "_Region:" -#~ msgstr "_Région :" +#~ msgstr "_Region :" #~ msgid "_City:" -#~ msgstr "_Ville :" +#~ msgstr "_Vila :" #~ msgid "_Network Time" -#~ msgstr "_Heure réseau" +#~ msgstr "_Ora ret" #~ msgid ":" #~ msgstr ":" #~ msgid "Set the time one hour ahead." -#~ msgstr "Avancer la date d'une heure." +#~ msgstr "Avançar la data d'una ora." #~ msgid "Set the time one hour back." -#~ msgstr "Reculer la date d'une heure." +#~ msgstr "Recular la data d'una ora." #~ msgid "Set the time one minute ahead." -#~ msgstr "Avancer l'heure d'une minute." +#~ msgstr "Avançar l'ora d'una minuta." #~ msgid "Set the time one minute back." -#~ msgstr "Reculer l'heure d'une minute." +#~ msgstr "Recular l'ora d'una minuta." #~ msgid "AM/PM" #~ msgstr "AM/PM " @@ -7866,60 +7863,60 @@ #~ msgctxt "display panel, rotation" #~ msgid "Counterclockwise" -#~ msgstr "Sens antihoraire" +#~ msgstr "Sens antiorari" #~ msgctxt "display panel, rotation" #~ msgid "Clockwise" -#~ msgstr "Sens horaire" +#~ msgstr "Sens orari" #~ msgctxt "display panel, rotation" #~ msgid "180 Degrees" -#~ msgstr "180 degrés" +#~ msgstr "180 grases" #~ msgid "Monitor" #~ msgstr "Ecran" #~ msgid "Drag to change primary display." -#~ msgstr "Faire glisser pour changer l'écran principal." +#~ msgstr "Far lisar per cambiar l'ecran principal." #~ msgid "" #~ "Select a monitor to change its properties; drag it to rearrange its " #~ "placement." #~ msgstr "" -#~ "Sélectionnez un écran pour modifier ses propriétés ; faites-le glisser " -#~ "pour le déplacer." +#~ "Seleccionatz un ecran per modificar ses proprietats ; fasètz-lo lisar per " +#~ "lo desplaçar." #~ msgid "%a %R" #~ msgstr "%a %R" #~ msgid "Could not save the monitor configuration" -#~ msgstr "Impossible d'enregistrer la configuration de l'écran" +#~ msgstr "Impossible d'enregistrar la configuracion de l'ecran" #~ msgid "_Resolution" -#~ msgstr "_Définition" +#~ msgstr "_Definicion" #~ msgid "R_otation" -#~ msgstr "R_otation" +#~ msgstr "R_otacion" #~ msgid "_Mirror displays" -#~ msgstr "_Même image sur tous les écrans" +#~ msgstr "_Meteis imatge sus totes los ecrans" #~ msgid "Note: may limit resolution options" -#~ msgstr "Note : cela peut restreindre les options de définition" +#~ msgstr "Nòta : aquò pòt restrénher las opcions de definicion" #~ msgid "_Detect Displays" -#~ msgstr "_Détecter les écrans" +#~ msgstr "_Detectar los ecrans" #~ msgctxt "mouse, speed" #~ msgid "Slow" -#~ msgstr "Lente" +#~ msgstr "Lenta" #~ msgctxt "mouse, speed" #~ msgid "Fast" -#~ msgstr "Rapide" +#~ msgstr "Rapida" #~ msgid "C_ontent sticks to fingers" -#~ msgstr "Le c_ontenu colle aux doigts" +#~ msgstr "Lo c_ontengut pega als dets" #~ msgid "blablabla" #~ msgstr "blablabla" @@ -7930,10 +7927,10 @@ #~ "goes\n" #~ "here" #~ msgstr "" -#~ "La section\n" -#~ "adresse\n" -#~ "vient\n" -#~ "ici" +#~ "La seccion\n" +#~ "adreça\n" +#~ "ven\n" +#~ "aicí" #~ msgid "" #~ "DNS\n" @@ -7941,10 +7938,10 @@ #~ "goes\n" #~ "here" #~ msgstr "" -#~ "La section\n" +#~ "La seccion\n" #~ "DNS\n" -#~ "vient\n" -#~ "ici" +#~ "ven\n" +#~ "aicí" #~ msgid "" #~ "Routes\n" @@ -7952,34 +7949,34 @@ #~ "goes\n" #~ "here" #~ msgstr "" -#~ "La section\n" +#~ "La seccion\n" #~ "routes\n" -#~ "vient\n" -#~ "ici" +#~ "ven\n" +#~ "aicí" #~ msgid "00:24:16:31:8G:7A" #~ msgstr "00:24:16:31:8G:7A" #~ msgid "Hidden" -#~ msgstr "Masqué" +#~ msgstr "Amagat" #~ msgid "Visible" #~ msgstr "Visible" #~ msgid "Name & Visibility" -#~ msgstr "Nom e visibilité" +#~ msgstr "Nom e visibilitat" #~ msgid "Control how you appear on the screen and the network." -#~ msgstr "Contrôler votre apparence à l'écran e sur le réseau." +#~ msgstr "Contrarotlar vòstra aparéncia a l'ecran e sus la ret." #~ msgid "Display _full name in top bar" -#~ msgstr "Afficher le nom _complet dans la barre supérieure" +#~ msgstr "Afichar lo nom _complet dins la barra superiora" #~ msgid "Display full name in _lock screen" -#~ msgstr "Afficher le nom complet quand l'écran est _verrouillé" +#~ msgstr "Afichar lo nom complet quand l'ecran es _verrolhat" #~ msgid "_Stealth Mode" -#~ msgstr "Mode _furtif" +#~ msgstr "Mòde _furtiu" #~ msgctxt "universal access, contrast" #~ msgid "Normal" @@ -7987,10 +7984,10 @@ #~ msgctxt "universal access, contrast" #~ msgid "High/Inverse" -#~ msgstr "Élevé/inversé" +#~ msgstr "Elevat/inversat" #~ msgid "On screen keyboard" -#~ msgstr "Clavier visuel" +#~ msgstr "Clavièr visual" #~ msgid "OnBoard" #~ msgstr "OnBoard" @@ -8003,7 +8000,7 @@ #~ msgctxt "universal access, text size" #~ msgid "Normal" -#~ msgstr "Normale" +#~ msgstr "Normala" #~ msgid "125%" #~ msgstr "125 %" @@ -8013,13 +8010,13 @@ #~ msgctxt "universal access, text size" #~ msgid "Larger" -#~ msgstr "Plus grand" +#~ msgstr "Mai grand" #~ msgid "Beep on Caps and Num Lock" -#~ msgstr "Émettre un bip quand Maj. e Verr. Num. son enfoncés" +#~ msgstr "Emetre un bip quand Maj. e Verr. Num. son enfoncés" #~ msgid "Turn on or off:" -#~ msgstr "Activer o désactiver :" +#~ msgstr "Activar o desactivar :" #~ msgctxt "universal access, zoom" #~ msgid "Zoom" @@ -8029,56 +8026,56 @@ #~ msgstr "Zoom avant :" #~ msgid "Zoom out:" -#~ msgstr "Zoom arrière :" +#~ msgstr "Zoom arrièr :" #~ msgid "Closed Captioning" -#~ msgstr "Sous-titrage" +#~ msgstr "Sostitolatge" #~ msgid "Display a textual description of speech and sounds" -#~ msgstr "Affiche una description textuelle de la parole e des sons" +#~ msgstr "Aficha una descripcion textuala de la paraula e dels sons" #~ msgctxt "universal access, delay" #~ msgid "Short" -#~ msgstr "Court" +#~ msgstr "Cort" #~ msgctxt "universal access, delay" #~ msgid "Long" #~ msgstr "Long" #~ msgid "Beep when a key is" -#~ msgstr "Émettre un bip quand una touche est" +#~ msgstr "Emetre un bip quand una tòca es" #~ msgid "pressed" -#~ msgstr "enfoncée" +#~ msgstr "quichada" #~ msgid "accepted" -#~ msgstr "acceptée" +#~ msgstr "acceptada" #~ msgid "rejected" -#~ msgstr "refusée" +#~ msgstr "refusada" #~ msgid "Acc_eptance delay:" -#~ msgstr "Délai d'acc_eptation :" +#~ msgstr "Relambi d'acc_eptacion :" #~ msgid "Control the pointer using the keypad" -#~ msgstr "Contrôle del pointeur à l'aide del pavé numérique" +#~ msgstr "Contraròtle del puntador amb l'ajuda del pavat numeric" #~ msgid "Video Mouse" -#~ msgstr "Souris vidéo" +#~ msgstr "Souris vidèo" #~ msgid "Control the pointer using the video camera." -#~ msgstr "Contrôle del pointeur à l'aide de la caméra vidéo." +#~ msgstr "Contraròtle del puntador amb l'ajuda de la camèra vidèo." #~ msgctxt "universal access, threshold" #~ msgid "Small" -#~ msgstr "Faible" +#~ msgstr "Feble" #~ msgctxt "universal access, threshold" #~ msgid "Large" -#~ msgstr "Élevé" +#~ msgstr "Elevat" #~ msgid "Add account" -#~ msgstr "Ajouter un compte" +#~ msgstr "Apondre un compte" #~ msgid "_Local Account" #~ msgstr "Compte _local" @@ -8087,51 +8084,51 @@ #~ msgstr "No_m de connexion" #~ msgid "Tip: Enterprise domain or realm name" -#~ msgstr "Astuce : domaine d'entreprise o nom de domaine" +#~ msgstr "Astúcia : domeni d'entrepresa o nom de domeni" #~ msgid "C_ontinue" -#~ msgstr "C_ontinuer" +#~ msgstr "C_ontunhar" #~ msgid "Previous Week" -#~ msgstr "La semaine précédente" +#~ msgstr "La setmana precedenta" #~ msgid "Next Week" -#~ msgstr "La semaine suivante" +#~ msgstr "La setmana seguenta" #~ msgid "Next week" -#~ msgstr "La semaine suivante" +#~ msgstr "La setmana seguenta" #~ msgid "Log in without a password" -#~ msgstr "Connexion sans mot de passe" +#~ msgstr "Connexion sens senhal" #~ msgid "Disable this account" -#~ msgstr "Désactiver ce compte" +#~ msgstr "Desactivar aqueste compte" #~ msgid "Enable this account" -#~ msgstr "Activer ce compte" +#~ msgstr "Activar aqueste compte" #~ msgid "C_onfirm password" -#~ msgstr "C_onfirmer le mot de passe" +#~ msgstr "C_onfirmar lo senhal" #~ msgid "Generate a password" -#~ msgstr "Générer un mot de passe" +#~ msgstr "Generar un senhal" #~ msgid "_Action" -#~ msgstr "_Action" +#~ msgstr "_Accion" #~ msgid "_Show password" -#~ msgstr "Affi_cher le mot de passe" +#~ msgstr "Afi_char lo senhal" #~ msgid "How to choose a strong password" -#~ msgstr "Comment choisir un mot de passe fort" +#~ msgstr "Cossí causir un senhal fòrt" #~ msgctxt "Password strength" #~ msgid "Too short" -#~ msgstr "Trop court" +#~ msgstr "Tròp cort" #~ msgctxt "Password strength" #~ msgid "Not good enough" -#~ msgstr "Insuffisant" +#~ msgstr "Insufisent" #~ msgctxt "Password strength" #~ msgid "Weak" @@ -8139,7 +8136,7 @@ #~ msgctxt "Password strength" #~ msgid "Fair" -#~ msgstr "Correct" +#~ msgstr "Corrècte" #~ msgctxt "Password strength" #~ msgid "Good" @@ -8147,72 +8144,72 @@ #~ msgctxt "Password strength" #~ msgid "Strong" -#~ msgstr "Fort" +#~ msgstr "Fòrt" #~ msgid "_Generate a password" -#~ msgstr "_Générer un mot de passe" +#~ msgstr "_Generar un senhal" #~ msgid "You need to enter a new password" -#~ msgstr "Vous devez saisir un nouveau mot de passe" +#~ msgstr "Vos cal sasir un senhal novèl" #~ msgid "The new password is not strong enough" -#~ msgstr "Le nouveau mot de passe est trop faible" +#~ msgstr "Lo senhal novèl es trop faible" #~ msgid "You need to confirm the password" -#~ msgstr "Vous devez confirmer le mot de passe" +#~ msgstr "Vos cal confirmer lo senhal" #~ msgid "You need to enter your current password" -#~ msgstr "Il est nécessaire que vous saisissiez votre mot de passe actuel" +#~ msgstr "Es necessari que sasiscatz vòstre senhal actual" #~ msgid "The current password is not correct" -#~ msgstr "Le mot de passe actuel est incorrect" +#~ msgstr "Lo senhal actual es incorrècte" #~ msgid "Wrong password" -#~ msgstr "Mauvais mot de passe" +#~ msgstr "Marrit senhal" #~ msgid "Switch Modes" -#~ msgstr "Inverser les modes" +#~ msgstr "Inversar los mòdes" #~ msgid "Action" -#~ msgstr "Action" +#~ msgstr "Accion" #~ msgid "_Options…" -#~ msgstr "_Options…" +#~ msgstr "_Opcions…" #~ msgctxt "Input source" #~ msgid "None" -#~ msgstr "Aucun" +#~ msgstr "Pas cap" #~ msgid "Change the background" -#~ msgstr "Modifier l'arrière-plan" +#~ msgstr "Modificar lo rèireplan" #~ msgid "Configure Bluetooth settings" -#~ msgstr "Configurer les paramètres del Bluetooth" +#~ msgstr "Configurar los paramètres del Bluetooth" #~ msgid "Browse Files..." -#~ msgstr "Rechercher des fichièrs..." +#~ msgstr "Recercar de fichièrs..." #~ msgctxt "Power" #~ msgid "Bluetooth" #~ msgstr "Bluetooth" #~ msgid "Create virtual device" -#~ msgstr "Créer un périphérique virtuel" +#~ msgstr "Crear un periferic virtual" #~ msgid "Available Profiles for Displays" -#~ msgstr "Profils disponibles pour les écrans" +#~ msgstr "Perfils disponibles pels ecrans" #~ msgid "Available Profiles for Scanners" -#~ msgstr "Profils disponibles pour les scanners" +#~ msgstr "Perfils disponibles pels scanners" #~ msgid "Available Profiles for Printers" -#~ msgstr "Profils disponibles pour les imprimantes" +#~ msgstr "Perfils disponibles per las imprimentas" #~ msgid "Available Profiles for Cameras" -#~ msgstr "Profils disponibles pour les appareils photo" +#~ msgstr "Perfils disponibles pels aparelhs de fòto" #~ msgid "Available Profiles for Webcams" -#~ msgstr "Profils disponibles pour les webcams" +#~ msgstr "Perfils disponibles per las webcams" #~ msgid "%i year" #~ msgid_plural "%i years" @@ -8221,65 +8218,66 @@ #~ msgid "%i month" #~ msgid_plural "%i months" -#~ msgstr[0] "%i mois" -#~ msgstr[1] "%i mois" +#~ msgstr[0] "%i mes" +#~ msgstr[1] "%i meses" #~ msgid "%i week" #~ msgid_plural "%i weeks" -#~ msgstr[0] "%i semaine" -#~ msgstr[1] "%i semaines" +#~ msgstr[0] "%i setmana" +#~ msgstr[1] "%i setmanas" #~ msgid "Less than 1 week" -#~ msgstr "Moins d'une semaine" +#~ msgstr "Moins d'una setmana" #~ msgid "This device is not color managed." -#~ msgstr "Ce périphérique es pas pris en carga au niveau des couleurs." +#~ msgstr "Aqueste periferic es pas pres en carga al niveau des colors." #~ msgid "This device is using manufacturing calibrated data." -#~ msgstr "Ce périphérique utilise des données étalonnées en usine." +#~ msgstr "Aqueste periferic utiliza de donadas étalonnées en usine." #~ msgid "" #~ "This device does not have a profile suitable for whole-screen color " #~ "correction." #~ msgstr "" -#~ "Ce périphérique ne possède pas un profil approprié pour la correction des " -#~ "couleurs de l'écran complet." +#~ "Aqueste periferic possedís pas un perfil apropriat per la correccion de " +#~ "las colors de l'ecran complet." #~ msgid "Not specified" -#~ msgstr "Non spécifié" +#~ msgstr "Pas especificat" #~ msgid "No devices supporting color management detected" -#~ msgstr "Aucun périphérique acceptant la gestion de couleur n'a été détecté" +#~ msgstr "" +#~ "Cap de periferic acceptant la gestion de color es pas estat detectat" #~ msgid "Add device" -#~ msgstr "Ajouter le périphérique" +#~ msgstr "Apondre lo periferic" #~ msgid "Add a virtual device" -#~ msgstr "Ajouter un périphérique virtuel" +#~ msgstr "Apondre un periferic virtual" #~ msgid "Remove a device" -#~ msgstr "Retirer un périphérique" +#~ msgstr "Retirer un periferic" #~ msgid "Color management settings" -#~ msgstr "Paramètres de gestion des couleurs" +#~ msgstr "Paramètres de gestion de las colors" #~ msgid "English" -#~ msgstr "Anglais" +#~ msgstr "Anglés" #~ msgid "British English" -#~ msgstr "Anglais britannique" +#~ msgstr "Anglés britanic" #~ msgid "German" -#~ msgstr "Allemand" +#~ msgstr "Alemand" #~ msgid "French" -#~ msgstr "Français" +#~ msgstr "Francés" #~ msgid "Spanish" -#~ msgstr "Espagnol" +#~ msgstr "Espanhòl" #~ msgid "Chinese (simplified)" -#~ msgstr "Chinois (simplifié)" +#~ msgstr "Chinés (simplifié)" #~ msgid "Russian" #~ msgstr "Russe" @@ -8288,13 +8286,13 @@ #~ msgstr "Arabe" #~ msgid "Unspecified" -#~ msgstr "Indéterminé" +#~ msgstr "Indeterminat" #~ msgid "Select a language" -#~ msgstr "Sélectionner una langue" +#~ msgstr "Seleccionar una lenga" #~ msgid "Date and Time preferences panel" -#~ msgstr "Volet des préférences pour la date e l'heure" +#~ msgstr "Panèl de las preferéncias per la data e l'ora" #~ msgid "%d x %d (%s)" #~ msgstr "%d x %d (%s)" @@ -8306,358 +8304,357 @@ #~ msgstr "VESA : %s" #~ msgid "Unknown model" -#~ msgstr "Modèle inconnu" +#~ msgstr "Modèl desconegut" #~ msgid "The next login will attempt to use the standard experience." #~ msgstr "" -#~ "La configuration standard sera essayée lors de la prochaine connexion." +#~ "La configuracion estandarda serà ensajada al moment de ka connexion que " +#~ "ven." #~ msgid "" #~ "The next login will use the fallback mode intended for unsupported " #~ "graphics hardware." #~ msgstr "" -#~ "Le mode restreint, conçu pour les cartes graphiques non prises en charge, " -#~ "sera utilisé lors de la prochaine connexion." +#~ "Lo mode restrent, conçu per las cartas graficas non presas en carga, serà " +#~ "utilizat al moment de ka connexion que ven." #~ msgctxt "Experience" #~ msgid "Fallback" -#~ msgstr "Restreint" +#~ msgstr "Restrent" #~ msgid "System Information" -#~ msgstr "Informations système" +#~ msgstr "Informacions sistèma" #~ msgid "OS type" -#~ msgstr "Type d'OS" +#~ msgstr "Tipe d'OS" #~ msgid "_Other Media..." -#~ msgstr "_Autres médias..." +#~ msgstr "_Autres mèdias..." #~ msgid "Experience" -#~ msgstr "Expérience" +#~ msgstr "Experiéncia" #~ msgid "Forced _Fallback Mode" -#~ msgstr "Mode _restreint forcé" +#~ msgstr "Mòde _restrent forcé" #~ msgid "Change keyboard settings" -#~ msgstr "Modifier les paramètres clavier" +#~ msgstr "Modificar los paramètres clavièr" #~ msgid "Layout Settings" -#~ msgstr "Paramètres d'agencement" +#~ msgstr "Paramètres d'agençament" #~ msgid "Set your mouse and touchpad preferences" -#~ msgstr "Définir les préférences pour la souris e le pavé tactile" +#~ msgstr "Definir las preferéncias per la mirga e lo pavat tactil" #~ msgid "Network settings" -#~ msgstr "Paramètres réseau" +#~ msgstr "Paramètres ret" #~ msgid "_Options..." -#~ msgstr "_Options..." +#~ msgstr "_Opcions..." #~ msgid "C_reate..." -#~ msgstr "C_réer..." +#~ msgstr "C_rear..." #~ msgid "_Configure..." -#~ msgstr "_Configuration..." +#~ msgstr "_Configuracion..." #~ msgid "Wireless" -#~ msgstr "Sans fil" +#~ msgstr "Sens fial" #~ msgid "_Disconnect" -#~ msgstr "Se _déconnecter" +#~ msgstr "Se _desconnectar" #~ msgid "_Connect" -#~ msgstr "Se _connecter" +#~ msgstr "Se _connectar" #~ msgid "Mesh" #~ msgstr "Mesh" #~ msgid "Disconnected" -#~ msgstr "Déconnecté" +#~ msgstr "Desconnectat" #~ msgid "Carrier/link changed" -#~ msgstr "Porteuse/lien modifié" +#~ msgstr "Porteuse/ligam modificat" #~ msgid "Expired credentials. Please log in again." -#~ msgstr "Données d'authentification expirées. Connectez-vous à nouveau." +#~ msgstr "Donadas d'autentificacion expiradas. Connectatz-vos tornamai." #~ msgid "_Log In" -#~ msgstr "Se co_nnecter" +#~ msgstr "Se co_nnectar" #~ msgid "Manage online accounts" -#~ msgstr "Gérer les comptes en ligne" +#~ msgstr "Gerir los comptes en linha" #~ msgid "Caution low battery, %s remaining" -#~ msgstr "Attention batterie faible, il reste environ %s d'utilisation" +#~ msgstr "Atencion batariá febla, demòra environ %s d'utilizacion" #~ msgid "Using battery power - %s remaining" -#~ msgstr "Sur batterie - Il reste environ %s d'utilisation" +#~ msgstr "Sus batariá - Demòra environ %s d'utilizacion" #~ msgid "Using battery power" -#~ msgstr "Sur batterie" +#~ msgstr "Sus batariá" #~ msgid "Charging - fully charged" -#~ msgstr "En charge - complètement chargée" +#~ msgstr "En carga - completament cargada" #~ msgid "Using UPS power - %s remaining" -#~ msgstr "Sur onduleur - il reste environ %s d'utilisation" +#~ msgstr "Sus ondulator - demòra environ %s d'utilizacion" #~ msgid "Caution low UPS" -#~ msgstr "Attention, onduleur faible" +#~ msgstr "Atencion, ondulator feble" #~ msgid "Using UPS power" -#~ msgstr "Sur onduleur" +#~ msgstr "Sus ondulator" #~ msgid "Your secondary battery is fully charged" -#~ msgstr "Votre batterie secondaire est complètement chargée" +#~ msgstr "Vòstra batariá segondària es completament cargada" #~ msgid "Your secondary battery is empty" -#~ msgstr "Votre batterie secondaire est déchargée" +#~ msgstr "Vòstra batariá segondària es descargada" #~ msgctxt "Battery power" #~ msgid "Charging - fully charged" -#~ msgstr "En charge - complètement chargée" +#~ msgstr "En carga - completament cargada" #~ msgid "" #~ "Tip: screen brightness affects how much power is " #~ "used" #~ msgstr "" -#~ "Astuce : la luminosité de l'écran influence la " -#~ "consommation d'énergie" +#~ "Astúcia : la luminositat de l'ecran influence la " +#~ "consommation d'energia" #~ msgid "Power management settings" -#~ msgstr "Paramètres de gestion de l'énergie" +#~ msgstr "Paramètres de gestion de l'energia" #~ msgid "Suspend when inactive for" -#~ msgstr "Mettre en veille si inactif depuis" +#~ msgstr "Metre en velha se inactiu dempuèi" #~ msgid "Change printer settings" -#~ msgstr "Modifier les paramètres de l'imprimante" +#~ msgstr "Modificar los paramètres de l'imprimenta" #~ msgid "%s Options" -#~ msgstr "Options pour %s" +#~ msgstr "Opcions per %s" #~ msgid "Manufacturers" #~ msgstr "Fabricants" #~ msgid "Drivers" -#~ msgstr "Pilotes" +#~ msgstr "Pilòts" #~ msgid "_Show" -#~ msgstr "_Afficher" +#~ msgstr "_Afichar" #~ msgid "Change your region and language settings" -#~ msgstr "Modifier les paramètres de pays e de langue" +#~ msgstr "Modificar los paramètres de país e de lenga" #~ msgid "Choose an input source" -#~ msgstr "Sélectionner una source d'entrée" +#~ msgstr "Seleccionar una font d'entrada" #~ msgid "Select an input source to add" -#~ msgstr "Sélectionner una source d'entrée à ajouter" +#~ msgstr "Seleccionar una font d'entrada a apondre" #~ msgid "" #~ "The login screen, system accounts and new user accounts use the system-" #~ "wide Region and Language settings." #~ msgstr "" -#~ "L'écran de connexion, les comptes système e ceux des nouveaux " -#~ "utilisateurs utilisent les paramètres de pays e de langue del système." +#~ "L'ecran de connexion, los comptes sistèma e ceux des nouveaux utilizaires " +#~ "utilizan los paramètres de país e de lenga del sistèma." #~ msgid "" #~ "The login screen, system accounts and new user accounts use the system-" #~ "wide Region and Language settings. You may change the system settings to " #~ "match yours." #~ msgstr "" -#~ "L'écran de connexion, les comptes système e ceux des nouveaux " -#~ "utilisateurs utilisent les paramètres de pays e de langue del système. " -#~ "Vous pouvez modifier les paramètres del système pour les faire " -#~ "correspondre aux vôtres." +#~ "L'ecran de connexion, los comptes sistèma e ceux des nouveaux utilizaires " +#~ "utilizan los paramètres de país e de lenga del sistèma. Podètz modificar " +#~ "los paramètres del sistèma per los far correspondre als vòstres." #~ msgid "Copy Settings" -#~ msgstr "Copier les paramètres" +#~ msgstr "Copiar los paramètres" #~ msgid "Copy Settings..." -#~ msgstr "Copier les paramètres..." +#~ msgstr "Copiar los paramètres..." #~ msgid "Region and Language" -#~ msgstr "Pays e langue" +#~ msgstr "Pays e lenga" #~ msgid "" #~ "Select a display language (change will be applied next time you log in)" #~ msgstr "" -#~ "Choisissez una langue d'affichage (la modification sera prise en compte à " -#~ "la prochaine connexion)" +#~ "Causissètz una lenga d'afichatge (la modificacion serà presa en compte a " +#~ "la connexion que ven)" #~ msgid "Add Language" -#~ msgstr "Ajouter una langue" +#~ msgstr "Apondre una lenga" #~ msgid "Remove Language" -#~ msgstr "Supprimer la langue" +#~ msgstr "Suprimir la lenga" #~ msgid "Install languages..." -#~ msgstr "Installer des langues..." +#~ msgstr "Installar de lengas..." #~ msgid "Select a region (change will be applied the next time you log in)" #~ msgstr "" -#~ "Choisissez una région (la modification sera prise en compte à la " -#~ "prochaine connexion)" +#~ "Causissètz una region (la modificacion serà presa en compte a la " +#~ "connexion que ven)" #~ msgid "Add Region" -#~ msgstr "Ajouter una région" +#~ msgstr "Apondre una region" #~ msgid "Currency" -#~ msgstr "Monnaie" +#~ msgstr "Moneda" #~ msgid "Examples" #~ msgstr "Exemples" #~ msgid "Select keyboards or other input sources" -#~ msgstr "Sélectionner les claviers o les autres sources d'entrée" +#~ msgstr "Seleccionar los clavièrs o les autres sources d'entrada" #~ msgid "Remove Input Source" -#~ msgstr "Supprimer la source d'entrée" +#~ msgstr "Suprimir la font d'entrada" #~ msgid "Move Input Source Up" -#~ msgstr "Déplacer la source d'entrée vers le haut" +#~ msgstr "Desplaçar la font d'entrada cap amont" #~ msgid "Show Keyboard Layout" -#~ msgstr "Afficher l'agencement del clavier" +#~ msgstr "Afichar l'agençament del clavièr" #~ msgid "Ctrl+Alt+Space" -#~ msgstr "Ctrl+Alt+Barre d'espace" +#~ msgstr "Ctrl+Alt+Barra d'espaci" #~ msgid "Shortcut Settings" -#~ msgstr "Paramètres de raccourci" +#~ msgstr "Paramètres d'acorchi" #~ msgid "Display language:" -#~ msgstr "Langue d'affichage :" +#~ msgstr "Lenga d'afichatge :" #~ msgid "Input source:" -#~ msgstr "Source d'entrée :" +#~ msgstr "Font d'entrada :" #~ msgid "Format:" #~ msgstr "Format :" #~ msgid "Your settings" -#~ msgstr "Vos paramètres" +#~ msgstr "Vòstres paramètres" #~ msgid "System settings" -#~ msgstr "Paramètres système" +#~ msgstr "Paramètres sistèma" #~ msgid "Brightness & Lock" -#~ msgstr "Luminosité & verrouillage" +#~ msgstr "Luminositat & verrolhatge" #~ msgid "Screen brightness and lock settings" -#~ msgstr "Paramètres de luminosité de l'écran e de verrouillage" +#~ msgstr "Paramètres de luminositat de l'ecran e de verrolhatge" #~ msgid "Brightness;Lock;Dim;Blank;Monitor;" -#~ msgstr "Luminosité;Verrouillage;Verrouiller;Estomper;Veille;Éteindre;Ecran;" +#~ msgstr "Luminositat;Verrolhatge;Verrolhar;Estomper;Velha;Atudar;Ecran;" #~ msgid "_Dim screen to save power" -#~ msgstr "_Diminuer la luminosité pour économiser la batterie" +#~ msgstr "_Diminuer la luminositat per économiser la batariá" #~ msgid "Don't lock when at home" -#~ msgstr "Ne pas verrouiller chez soi" +#~ msgstr "Verrolhar pas en çò seu" #~ msgid "Locations..." -#~ msgstr "Emplacements..." +#~ msgstr "Emplaçaments..." #~ msgid "Lock" -#~ msgstr "Verrouiller" +#~ msgstr "Verrolhar" #~ msgid "Enable debugging code" -#~ msgstr "Activer le code de débogage" +#~ msgstr "Activar lo còdi de desbugatge" #~ msgid "Version of this application" -#~ msgstr "Version de l'application" +#~ msgstr "Version de l'aplicacion" #~ msgid " — GNOME Volume Control Applet" -#~ msgstr " — Applet del contrôle de volume GNOME" +#~ msgstr " — Applet del contraròtle de volum GNOME" #~ msgid "Show desktop volume control" -#~ msgstr "Afficher le contrôle de volume sur le bureau" +#~ msgstr "Afichar lo contraròtle de volum sul burèu" #~ msgid "Sound Output Volume" -#~ msgstr "Volume sonore en sortie" +#~ msgstr "Volum sonore en sortida" #~ msgid "Microphone Volume" -#~ msgstr "Volume del micro" +#~ msgstr "Volum del micro" #~ msgid "Failed to start Sound Preferences: %s" -#~ msgstr "Échec à l'ouverture des préférences pour le son : %s" +#~ msgstr "Échec a l'ouverture des preferéncias per lo son : %s" #~ msgid "_Mute" -#~ msgstr "_Muet" +#~ msgstr "_Mut" #~ msgid "_Sound Preferences" -#~ msgstr "Préférences del _son" +#~ msgstr "Preferéncias del _son" #~ msgid "Muted" -#~ msgstr "Assourdi" +#~ msgstr "Assordit" #~ msgid "Universal Access Preferences" -#~ msgstr "Préférences de l'accès universel" +#~ msgstr "Preferéncias de l'accès universel" #~ msgid "Options..." -#~ msgstr "Options..." +#~ msgstr "Opcions..." #~ msgctxt "Zoom Grayscale" #~ msgid "Color" -#~ msgstr "Couleur" +#~ msgstr "Color" #~ msgctxt "Zoom Grayscale" #~ msgid "None" -#~ msgstr "Aucune" +#~ msgstr "Pas cap" #~ msgid "User Accounts" -#~ msgstr "Comptes utilisateur" +#~ msgstr "Comptes utilizaire" #~ msgid "_Hint" -#~ msgstr "_Indication" +#~ msgstr "_Indicacion" #~ msgid "" #~ "This hint may be displayed at the login screen. It will be visible to " #~ "all users of this system. Do not include the password here." #~ msgstr "" -#~ "Cette indication est affichée sur l'écran de connexion. Elle est visible " -#~ "à tous les utilisateurs del système. Ne pas y inclure le mot de " -#~ "passe." +#~ "Aquesta indication es afichada sus l'ecran de connexion. Elle es visible a " +#~ "totes los utilizaires del sistèma. Ne pas i inclure lo senhal." #~ msgid "Fair" -#~ msgstr "Correct" +#~ msgstr "Corrècte" #~ msgid "Browse for more pictures..." -#~ msgstr "Rechercher d'autres images..." +#~ msgstr "Recercar d'autres imatges..." #~ msgid "No user with the name '%s' exists." -#~ msgstr "Il n'y a pas d'utilisateur nommé « %s »." +#~ msgstr "I a pas d'utilizaire nomenat « %s »." #~ msgid "This user does not exist." -#~ msgstr "Cet utilisateur n'existe pas." +#~ msgstr "Aqueste utilizaire existís pas." #~ msgid "Set your Wacom tablet preferences" -#~ msgstr "Définir les préférences pour la tablette Wacom" +#~ msgstr "Definir las preferéncias per la tauleta Wacom" #~ msgid "Map Buttons..." -#~ msgstr "Associer les boutons..." +#~ msgstr "Associar los botons..." #~ msgid "Calibrate..." -#~ msgstr "Étalonner..." +#~ msgstr "Escandalhar..." #~ msgid "- System Settings" -#~ msgstr "- Paramètres système" +#~ msgstr "- Paramètres sistèma" #~ msgid "Control Center" #~ msgstr "Centre de contrôle" #~ msgid "System Settings" -#~ msgstr "Paramètres système" +#~ msgstr "Paramètres sistèma" #~ msgid "Wireless devices require extra power" -#~ msgstr "Les périphériques sans fil ont besoin de puissance supplémentaire" +#~ msgstr "Los periferics sens fial an besonh de poténcia suplementària" #~ msgid "Mobile broadband (3G, 4G, WiMax, etc.) devices require extra power" #~ msgstr "" -#~ "Les périphériques mobiles à large bande (3G, 4G, WiMax, etc.) ont besoin " -#~ "de puissance supplémentaire" +#~ "Los periferics mobiles a large bande (3G, 4G, WiMax, etc.) ont besonh de " +#~ "poténcia suplementària" #~ msgid "Password:" -#~ msgstr "Senhalse :" +#~ msgstr "Senhal :" diff -Nru gnome-control-center-3.20.2/po/pa.po gnome-control-center-3.22.1/po/pa.po --- gnome-control-center-3.20.2/po/pa.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/pa.po 2016-09-08 11:48:12.000000000 +0000 @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-02-20 08:41+0000\n" -"PO-Revision-Date: 2016-02-20 20:23UTC-0600\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-co" +"ntrol-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-08-16 20:59+0000\n" +"PO-Revision-Date: 2016-09-05 07:22-0600\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" "Language: pa\n" @@ -24,7 +24,6 @@ "X-Generator: Lokalize 2.0\n" #: ../panels/background/background.ui.h:1 -#| msgid "Background" msgid "_Background" msgstr "ਬੈਕਗਰਾਊਂਡ(_B)" @@ -35,7 +34,6 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -#| msgid "Lock Screen" msgid "_Lock Screen" msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ(_L)" @@ -95,7 +93,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "ਘਰ" @@ -109,31 +107,30 @@ #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 -#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:29 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 #: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2023 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1295 +#: ../panels/network/net-device-wifi.c:1532 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:1952 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:568 +#: ../panels/privacy/cc-privacy-panel.c:1032 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 -#: ../panels/user-accounts/um-user-panel.c:708 -#: ../panels/user-accounts/um-user-panel.c:726 +#: ../panels/user-accounts/um-user-panel.c:705 +#: ../panels/user-accounts/um-user-panel.c:723 msgid "_Cancel" msgstr "ਰੱਦ ਕਰੋ(_C)" @@ -160,26 +157,26 @@ msgid "Current background" msgstr "ਮੌਜੂਦਾ ਬੈਕਗਰਾਊਂਡ" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#| msgid "Background" +msgid "Back­ground" msgstr "ਬੈਕਗਰਾਊਂਡ" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "ਆਪਣੇ ਬੈਕਗਰਾਊਂਡ ਚਿੱਤਰ ਨੂੰ ਵਾਲਪੇਪਰ ਜਾਂ ਫੋਟੋ ਨਾਲ ਬਦਲੋ" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "ਵਾਲਪੇਪਰ;ਸਕਰੀਨ;ਡੈਸਕਟਾਪ;Wallpaper;Screen;Desktop;" #: ../panels/bluetooth/cc-bluetooth-panel.c:264 -#| msgid "Air_plane Mode" msgid "Turn Off Airplane Mode" msgstr "ਏਅਰਪਲੇਨ ਮੋਡ ਬੰਦ ਕਰੋ" #: ../panels/bluetooth/cc-bluetooth-panel.c:330 -#| msgid "No Bluetooth adapters found" msgid "No Bluetooth Found" msgstr "ਕੋਈ ਬਲਿਊਟੁੱਥ ਨਹੀਂ ਲੱਭਾ" @@ -188,7 +185,6 @@ msgstr "ਬਲਿਊਟੁੱਥ ਵਰਤਣ ਲਈ ਡੌਂਗਲ ਪਲੱਗਇਨ ਕਰੋ।" #: ../panels/bluetooth/cc-bluetooth-panel.c:331 -#| msgid "Bluetooth Sharing" msgid "Bluetooth Turned Off" msgstr "ਬਲਿਊਟੁੱਥ ਬੰਦ ਕਰੋ" @@ -197,17 +193,14 @@ msgstr "ਜੰਤਰਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਅਤੇ ਫਾਇਲ ਟਰਾਂਸਫਰ ਕਰਨ ਲਈ ਚਾਲੂ ਕਰੋ।" #: ../panels/bluetooth/cc-bluetooth-panel.c:332 -#| msgid "Air_plane Mode" msgid "Airplane Mode is on" msgstr "ਏਅਰਪਲੇਨ ਮੋਡ ਚਾਲੂ ਹੈ" #: ../panels/bluetooth/cc-bluetooth-panel.c:332 -#| msgid "Bluetooth is disabled by hardware switch" msgid "Bluetooth is disabled when airplane mode is on." msgstr "ਬਲਿਊਟੁੱਥ ਬੰਦ ਹੁੰਦਾ ਹੈ, ਜਦੋਂ ਏਅਰਪਲੇਨ ਮੋਡ ਚਾਲੂ ਹੈ।" #: ../panels/bluetooth/cc-bluetooth-panel.c:333 -#| msgid "Air_plane Mode" msgid "Hardware Airplane Mode is on" msgstr "ਹਾਰਡਵੇਅਰ ਏਅਰਪਲੇਨ ਮੋਡ ਚਾਲੂ ਹੈ" @@ -215,18 +208,18 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "ਬਲਿਊਟੁੱਥ ਨੂੰ ਸਮਰੱਥ ਕਰਨ ਲਈ ਏਅਰਪਲੇਨ ਮੋਡ ਨੂੰ ਬੰਦ ਕਰੋ।" -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#| msgid "Bluetooth" +msgid "Blue­tooth" msgstr "ਬਲਿਊਟੁੱਥ" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਨੂੰ ਚਾਲੂ ਤੇ ਬੰਦ ਕਰੋ ਅਤੇ ਆਪਣੇ ਜੰਤਰਾਂ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "ਸਾਂਝਾ ਕਰਨਾ,ਸਾਂਝਾ,ਬਲਿਊਟੂੱਥ,obex;" @@ -396,7 +389,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "ਸਭ ਫਾਇਲਾਂ" @@ -436,7 +429,7 @@ msgstr "ਪਰੋਫਾਇਲ ਸੰਭਾਲੋ" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "ਸੰਭਾਲੋ(_S)" @@ -451,8 +444,8 @@ "The measuring instrument is not detected. Please check it is turned on and " "correctly connected." msgstr "" -"ਮਾਪ ਜੰਤਰ ਖੋਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ। ਚੈੱਕ ਕਰੋ ਕਿ ਇਹ ਚਾਲੂ ਹੈ ਅਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਕੂਨੈਕਟ ਕੀਤਾ " -"ਹੋਇਆ ਹੈ।" +"ਮਾਪ ਜੰਤਰ ਖੋਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ। ਚੈੱਕ ਕਰੋ ਕਿ ਇਹ ਚਾਲੂ ਹੈ ਅਤੇ ਠੀਕ ਤਰ੍ਹਾਂ ਕੂਨੈਕਟ ਕੀਤਾ" +" ਹੋਇਆ ਹੈ।" #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1373 @@ -546,13 +539,11 @@ #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -#| msgid "Start" msgid "_Start" msgstr "ਸ਼ੁਰੂ ਕਰੋ(_S)" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -#| msgid "Resume" msgid "_Resume" msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ ਕਰੋ(_R)" @@ -577,10 +568,10 @@ "screen. The longer you spend on calibration, the better the quality of the " "color profile." msgstr "" -"ਕੈਲੀਬਰੇਸ਼ਨ ਇੱਕ ਪਰੋਫਾਇਲ ਦੇਵੇਗੀ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਆਪਣੀ ਸਕਰੀਨ ਦੇ ਰੰਗ ਦੇ ਪਰਬੰਧ ਲਈ ਵਰਤ " -"ਸਕਦੇ ਹੋ। " -"ਕੈਲੀਬਰੇਸ਼ਨ ਉੱਤੇ ਜਿੰਨਾ ਵੱਧ ਸਮਾਂ ਤੁਸੀਂ ਲਗਾਉਗੇ, ਰੰਗ ਪਰੋਫਾਇਲ ਉਹਨਾ ਹੀ ਵੱਧ ਚੰਗਾ " -"ਹੋਵੇਗਾ।" +"ਕੈਲੀਬਰੇਸ਼ਨ ਇੱਕ ਪਰੋਫਾਇਲ ਦੇਵੇਗੀ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਆਪਣੀ ਸਕਰੀਨ ਦੇ ਰੰਗ ਦੇ ਪਰਬੰਧ ਲਈ ਵਰਤ" +" ਸਕਦੇ ਹੋ। " +"ਕੈਲੀਬਰੇਸ਼ਨ ਉੱਤੇ ਜਿੰਨਾ ਵੱਧ ਸਮਾਂ ਤੁਸੀਂ ਲਗਾਉਗੇ, ਰੰਗ ਪਰੋਫਾਇਲ ਉਹਨਾ ਹੀ ਵੱਧ ਚੰਗਾ" +" ਹੋਵੇਗਾ।" #: ../panels/color/color.ui.h:3 msgid "" @@ -622,8 +613,8 @@ "Select a display target white point. Most displays should be calibrated to a " "D65 illuminant." msgstr "" -"ਡਿਸਪਲੇਅ ਟਾਰਗੇਟ ਚਿੱਟਾ ਬਿੰਦੂ ਚੁਣੋ। ਬਹੁਤੇ ਡਿਸਪਲੇਅ ਨੂੰ D65 illuminant ਤੱਕ " -"ਕੈਲੀਬਰੇਟ ਕੀਤਾ ਜਾਣਾ " +"ਡਿਸਪਲੇਅ ਟਾਰਗੇਟ ਚਿੱਟਾ ਬਿੰਦੂ ਚੁਣੋ। ਬਹੁਤੇ ਡਿਸਪਲੇਅ ਨੂੰ D65 illuminant ਤੱਕ" +" ਕੈਲੀਬਰੇਟ ਕੀਤਾ ਜਾਣਾ " "ਚਾਹੀਦਾ ਹੈ।" #: ../panels/color/color.ui.h:14 @@ -635,8 +626,8 @@ "Please set the display to a brightness that is typical for you. Color " "management will be most accurate at this brightness level." msgstr "" -"ਡਿਸਪਲੇਅ ਲਈ ਚਮਕ ਪੱਧਰ ਸੈੱਟ ਕਰੋ, ਜੋ ਤੁਸੀਂ ਆਮ ਤੌਰ ਉੱਤੇ ਵਰਤਦੇ ਹੋ। ਰੰਗ ਪਰਬੰਧ ਉਸ ਚਮਕ " -"ਪੱਧਰ ਉੱਤੇ ਸਭ ਤੋਂ " +"ਡਿਸਪਲੇਅ ਲਈ ਚਮਕ ਪੱਧਰ ਸੈੱਟ ਕਰੋ, ਜੋ ਤੁਸੀਂ ਆਮ ਤੌਰ ਉੱਤੇ ਵਰਤਦੇ ਹੋ। ਰੰਗ ਪਰਬੰਧ ਉਸ ਚਮਕ" +" ਪੱਧਰ ਉੱਤੇ ਸਭ ਤੋਂ " "ਵੱਧ ਸ਼ੁੱਧ ਹੋਵੇਗਾ।" #: ../panels/color/color.ui.h:16 @@ -644,8 +635,8 @@ "Alternatively, you can use the brightness level used with one of the other " "profiles for this device." msgstr "" -"ਬਦਲਵੇਂ ਰੂਪ ਵਿੱਚ, ਤੁਸੀਂ ਇਹ ਜੰਤਰ ਲਈ ਹੋਰ ਪਰੋਫਾਇਲਾਂ ਵਿੱਚੋਂ ਇੱਕ ਨੂੰ ਚਮਕ ਪੱਧਰ ਲਈ " -"ਵਰਤ ਸਕਦੇ ਹੋ।" +"ਬਦਲਵੇਂ ਰੂਪ ਵਿੱਚ, ਤੁਸੀਂ ਇਹ ਜੰਤਰ ਲਈ ਹੋਰ ਪਰੋਫਾਇਲਾਂ ਵਿੱਚੋਂ ਇੱਕ ਨੂੰ ਚਮਕ ਪੱਧਰ ਲਈ" +" ਵਰਤ ਸਕਦੇ ਹੋ।" #: ../panels/color/color.ui.h:17 msgid "Display Brightness" @@ -656,8 +647,8 @@ "You can use a color profile on different computers, or even create profiles " "for different lighting conditions." msgstr "" -"ਤੁਸੀਂ ਵੱਖਰੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਰੰਗ ਪਰੋਫਾਇਲ ਵਰਤ ਸਕਦੇ ਹੋ ਜਾਂ ਵੱਖਰੀਆਂ ਚਾਨਣ ਸ਼ਰਤਾਂ " -"ਮੁਤਾਬਕ ਰੰਗ ਪਰੋਫਾਇਲ ਬਣਾ " +"ਤੁਸੀਂ ਵੱਖਰੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਰੰਗ ਪਰੋਫਾਇਲ ਵਰਤ ਸਕਦੇ ਹੋ ਜਾਂ ਵੱਖਰੀਆਂ ਚਾਨਣ ਸ਼ਰਤਾਂ" +" ਮੁਤਾਬਕ ਰੰਗ ਪਰੋਫਾਇਲ ਬਣਾ " "ਸਕਦੇ ਹੋ।" #: ../panels/color/color.ui.h:19 @@ -696,189 +687,188 @@ msgstr "" "ਤੁਸੀਂ ਪਰੋਫਾਇਲ ਨੂੰ GNU/ਲੀਨਕਸ, ਐਪਲ OS X<" "/a> " -"ਅਤੇ Microsoft Windows ਸਿਸਟਮ ਉੱਤੇ ਕਿਵੇਂ ਵਰਤੀਏ ਬਾਰੇ " -"ਹਦਾਇਤਾਂ " +"ਅਤੇ Microsoft Windows ਸਿਸਟਮ ਉੱਤੇ ਕਿਵੇਂ ਵਰਤੀਏ ਬਾਰੇ" +" ਹਦਾਇਤਾਂ " "ਵੇਖ ਸਕਦੇ ਹੋ।" #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "ਸੰਖੇਪ" #: ../panels/color/color.ui.h:28 -#| msgid "Import File…" +#| msgid "_Add profile" +msgid "Add profile" +msgstr "ਪਰੋਫਾਇਲ ਨੂੰ ਜੋੜੋ" + +#: ../panels/color/color.ui.h:29 msgid "_Import File…" msgstr "…ਫਾਇਲ ਇੰਪੋਰਟ ਕਰੋ(_I)" -#: ../panels/color/color.ui.h:30 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "ਸ਼ਾਮਲ(_A)" -#: ../panels/color/color.ui.h:31 +#: ../panels/color/color.ui.h:32 msgid "" "Problems detected. The profile may not work correctly. Show " "details." msgstr "" "ਸਮੱਸਿਆ ਆਈ ਹੈ। ਪਰੋਫਾਇਲ ਠੀਕ ਤਰ੍ਹਾਂ ਸ਼ਾਇਦ ਕੰਮ ਨਾ ਕਰੇ। ਵੇਰਵਾ ਵੇਖੋ" -#: ../panels/color/color.ui.h:32 +#: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." msgstr "ਹਰੇਕ ਜੰਤਰ ਲਈ ਰੰਗ ਪਰਬੰਧ ਲਈ ਮਿਤੀ ਰੰਗ ਪਰੋਫਾਇਲ ਅੱਪਡੇਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।" -#: ../panels/color/color.ui.h:33 +#: ../panels/color/color.ui.h:34 msgid "Learn more" msgstr "ਹੋਰ ਸਿੱਖੋ" -#: ../panels/color/color.ui.h:34 +#: ../panels/color/color.ui.h:35 msgid "Learn more about color management" msgstr "ਰੰਗ ਪਰਬੰਧ ਬਾਰੇ ਸਿੱਖੋ" -#: ../panels/color/color.ui.h:35 -#| msgid "Set for all users" +#: ../panels/color/color.ui.h:36 msgid "_Set for all users" msgstr "ਸਭ ਯੂਜ਼ਰ ਲਈ ਸੈੱਟ ਕਰੋ(_S)" -#: ../panels/color/color.ui.h:36 +#: ../panels/color/color.ui.h:37 msgid "Set this profile for all users on this computer" msgstr "ਇਹ ਪਰੋਫਾਇਲ ਨੂੰ ਇਸ ਕੰਪਿਊਟਰ ਦੇ ਸਭ ਯੂਜ਼ਰ ਲਈ ਸੈੱਟ ਕਰੋ" -#: ../panels/color/color.ui.h:37 -#| msgid "Enable" +#: ../panels/color/color.ui.h:38 msgid "_Enable" msgstr "ਚਾਲੂ ਕਰੋ(_E)" -#: ../panels/color/color.ui.h:38 -#| msgid "Add profile" +#: ../panels/color/color.ui.h:39 msgid "_Add profile" msgstr "ਪਰੋਫਾਇਲ ਸ਼ਾਮਲ(_A)" -#: ../panels/color/color.ui.h:39 -#| msgid "Calibrate…" +#: ../panels/color/color.ui.h:40 msgid "_Calibrate…" msgstr "ਕੈਲੇਬਰੇਟ(_C)…" -#: ../panels/color/color.ui.h:40 +#: ../panels/color/color.ui.h:41 msgid "Calibrate the device" msgstr "ਜੰਤਰ ਕੈਲੀਬਰੇਟ ਕਰੋ" -#: ../panels/color/color.ui.h:41 -#| msgid "Remove profile" +#: ../panels/color/color.ui.h:42 msgid "_Remove profile" msgstr "ਪਰੋਫਾਇਲ ਹਟਾਓ(_R)" -#: ../panels/color/color.ui.h:42 -#| msgid "View details" +#: ../panels/color/color.ui.h:43 msgid "_View details" msgstr "ਵੇਰਵੇ ਵੇਖੋ(_V)" -#: ../panels/color/color.ui.h:43 +#: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" msgstr "ਕਿਸੇ ਵੀ ਜੰਤਰ ਨੂੰ ਖੋਜਣ ਲਈ ਅਸਮਰੱਥ, ਜੋ ਕਿ ਰੰਗਾਂ ਦਾ ਪਰਬੰਧ ਕਰ ਸਕਦਾ ਹੈ" -#: ../panels/color/color.ui.h:44 +#: ../panels/color/color.ui.h:45 msgid "LCD" msgstr "LCD" -#: ../panels/color/color.ui.h:45 +#: ../panels/color/color.ui.h:46 msgid "LED" msgstr "LED" -#: ../panels/color/color.ui.h:46 +#: ../panels/color/color.ui.h:47 msgid "CRT" msgstr "CRT" -#: ../panels/color/color.ui.h:47 +#: ../panels/color/color.ui.h:48 msgid "Projector" msgstr "ਪਰੋਜੈਕਟਰ" -#: ../panels/color/color.ui.h:48 +#: ../panels/color/color.ui.h:49 msgid "Plasma" msgstr "ਪਲਾਜ਼ਮਾ" -#: ../panels/color/color.ui.h:49 +#: ../panels/color/color.ui.h:50 msgid "LCD (CCFL backlight)" msgstr "LCD (CCFL ਬੈਕਲਾਈਟ)" -#: ../panels/color/color.ui.h:50 +#: ../panels/color/color.ui.h:51 msgid "LCD (RGB LED backlight)" msgstr "LCD (RGB LED ਬੈਕਲਾਈਟ)" -#: ../panels/color/color.ui.h:51 +#: ../panels/color/color.ui.h:52 msgid "LCD (white LED backlight)" msgstr "LCD (ਵਾਈਟ LED ਬੈਕਲਾਈਟ)" -#: ../panels/color/color.ui.h:52 +#: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" msgstr "ਵਾਈਡ ਗਾਮੁਟ LCD (CCFL ਬੈਕਲਾਈਟ)" -#: ../panels/color/color.ui.h:53 +#: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" msgstr "ਵਾਈਡ ਗਾਮੁਟ LCD (RGB LED ਬੈਕਲਾਈਟ)" -#: ../panels/color/color.ui.h:54 +#: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" msgid "High" msgstr "ਉੱਚ" -#: ../panels/color/color.ui.h:55 +#: ../panels/color/color.ui.h:56 msgid "40 minutes" msgstr "੪੦ ਮਿੰਟ" -#: ../panels/color/color.ui.h:56 +#: ../panels/color/color.ui.h:57 msgctxt "Calibration quality" msgid "Medium" msgstr "ਮੱਧਮ" -#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:2 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 #: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "੩੦ ਮਿੰਟ" -#: ../panels/color/color.ui.h:58 +#: ../panels/color/color.ui.h:59 msgctxt "Calibration quality" msgid "Low" msgstr "ਘੱਟ" -#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:1 +#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1 msgid "15 minutes" msgstr "੧੫ ਮਿੰਟ" -#: ../panels/color/color.ui.h:60 +#: ../panels/color/color.ui.h:61 msgid "Native to display" msgstr "ਡਿਸਪਲੇਅ ਲਈ ਨੇਟਿਵ" -#: ../panels/color/color.ui.h:61 +#: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" msgstr "D50 (ਪਰਿੰਟ ਤੇ ਪਬਲਿਸ਼ ਕਰਨ)" -#: ../panels/color/color.ui.h:62 +#: ../panels/color/color.ui.h:63 msgid "D55" msgstr "D55" -#: ../panels/color/color.ui.h:63 +#: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" msgstr "D65 (ਫੋਟੋਗਰਾਫ਼ੀ ਅਤੇ ਗਰਾਫਿਕਸ)" -#: ../panels/color/color.ui.h:64 +#: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "ਰੰਗ" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "ਆਪਣੇ ਜੰਤਰਾਂ, ਜਿਵੇਂ ਕਿ ਡਿਸਪਲੇਅ, ਕੈਮਰੇ ਜਾਂ ਪਰਿੰਟਰਾਂ ਦੇ ਰੰਗ ਨੂੰ ਕੈਲੀਬਰੇਟ ਕਰੋ" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "ਰੰਗ,Color;ICC;Profile;Calibrate;ਪ੍ਰਿੰਟਰ;ਪਰਿੰਟਰ;Printer;Display;ਡਿਸਪਲੇਅ;" @@ -897,6 +887,26 @@ msgid "No languages found" msgstr "ਕੋਈ ਭਾਸ਼ਾ ਨਹੀਂ ਲੱਭੀ।" +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 +msgid "Today" +msgstr "ਅੱਜ" + +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 +msgid "Yesterday" +msgstr "ਕੱਲ੍ਹ" + +#. Translators: This is a date format string in the style of "Feb 24". +#: ../panels/common/cc-util.c:138 +msgid "%b %e" +msgstr "%e %b" + +#. Translators: This is a date format string in the style of "Feb 24, 2013". +#: ../panels/common/cc-util.c:143 +msgid "%b %e, %Y" +msgstr "%e %b %Y" + #: ../panels/common/language-chooser.ui.h:1 msgid "Language" msgstr "ਭਾਸ਼ਾ" @@ -1013,8 +1023,9 @@ msgid "December" msgstr "ਦਸੰਬਰ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ" @@ -1056,7 +1067,6 @@ msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ(_T)" #: ../panels/datetime/datetime.ui.h:24 -#| msgid "Time Zone" msgid "Time Z_one" msgstr "ਸਮਾਂ ਖੇਤਰ(_o)" @@ -1072,12 +1082,12 @@ msgid "AM / PM" msgstr "ਸਵੇਰ/ਸ਼ਾਮ" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "ਮਿਤੀ ਤੇ ਸਮਾਂ ਬਦਲੋ, ਸਮਾਂ ਖੇਤਰ ਸਮੇਤ" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "ਘੜੀ;ਸਮਾਂ-ਖੇਤਰ;ਟਿਕਾਣਾ;" @@ -1099,20 +1109,20 @@ msgstr "ਮਿਰਰ ਕੀਤੇ" #: ../panels/display/cc-display-panel.c:578 -#: ../panels/display/cc-display-panel.c:2195 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "ਪ੍ਰਾਇਮਰੀ" #: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:174 +#: ../panels/privacy/cc-privacy-panel.c:241 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "ਬੰਦ" @@ -1127,7 +1137,7 @@ msgstr "ਜੋੜੇ ਡਿਸਪਲੇਅ ਲਗਾਉ" #: ../panels/display/cc-display-panel.c:1562 -#: ../panels/display/cc-display-panel.c:2024 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" @@ -1137,142 +1147,175 @@ msgid "Drag displays to rearrange them" msgstr "ਡਿਸਪਲੇਅ ਦਾ ਪ੍ਰਬੰਧ ਕਰਨ ਲਈ ਖਿੱਚੋ (ਡਰੈਗ)" -#: ../panels/display/cc-display-panel.c:2073 +#. translators: example string is "60 Hz (NTSC)" +#. * NTSC is https://en.wikipedia.org/wiki/NTSC +#: ../panels/display/cc-display-panel.c:1793 +#, c-format +msgid "%d Hz (NTSC)" +msgstr "%d Hz (NTSC)" + +#. translators: example string is "60 Hz" +#: ../panels/display/cc-display-panel.c:1799 +#, c-format +msgid "%d Hz" +msgstr "%d Hz" + +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "ਖੱਬੇ ਦਾਅ 90° ਘੁੰਮਾਓ" -#: ../panels/display/cc-display-panel.c:2091 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "180° ਘੁੰਮਾਓ" -#: ../panels/display/cc-display-panel.c:2109 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "ਸੱਜੇ ਦਾਅ 90° ਘੁੰਮਾਓ" -#: ../panels/display/cc-display-panel.c:2130 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "ਅਕਾਰ" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2143 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "ਅਕਾਰ ਅਨੁਪਾਤ" -#: ../panels/display/cc-display-panel.c:2165 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ" -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "" + +#: ../panels/display/cc-display-panel.c:2398 +msgid "Refresh Rate" +msgstr "ਤਾਜ਼ਾ ਕਰਨ ਦਰ" + +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "ਟਾਪ ਪੱਟੀ ਅਤੇ ਸਰਗਰਮੀ ਝਲਕ ਨੂੰ ਇਸ ਡਿਸਪਲੇਅ ਉੱਤੇ ਵੇਖਾਓ" -#: ../panels/display/cc-display-panel.c:2202 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "ਸੈਕੰਡਰੀ ਡਿਸਪਲੇਅ" -#: ../panels/display/cc-display-panel.c:2203 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "ਵਾਧੂ ਵਰਕਸਪੇਸ ਬਣਾਉਣ ਲਈ ਡਿਸਪਲੇਅ ਨੂੰ ਹੋਰ ਨਾਲ ਜੋੜੋ" -#: ../panels/display/cc-display-panel.c:2210 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "ਪਰਿਜ਼ੈੱਨਟੇਸ਼ਨ" -#: ../panels/display/cc-display-panel.c:2211 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "ਕੇਵਲ ਸਲਾਈਡਸ਼ੋ ਤੇ ਮੀਡਿਆ ਹੀ ਵੇਖਾਓ" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2216 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "ਮਿੱਰਰ" -#: ../panels/display/cc-display-panel.c:2217 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਵਿਊ ਨੂੰ ਦੋਵੇਂ ਡਿਸਪਲੇਅ ਉੱਤੇ ਵੇਖਾਓ" -#: ../panels/display/cc-display-panel.c:2223 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "ਬੰਦ ਕਰੋ" -#: ../panels/display/cc-display-panel.c:2224 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "ਇਹ ਡਿਸਪਲੇਅ ਨਾ ਵਰਤੋਂ" -#: ../panels/display/cc-display-panel.c:2525 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "ਸਕਰੀਨ ਜਾਣਕਾਰੀ ਲਈ ਨਹੀਂ ਜਾ ਸਕੀ" -#: ../panels/display/cc-display-panel.c:2556 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "ਜੋੜੇ ਡਿਸਪਲੇਅ ਲਗਾਉ" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#| msgid "Displays" +msgid "Dis­plays" msgstr "ਡਿਸਪਲੇਅ" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "ਚੁਣੋ ਕਿ ਮਾਨੀਟਰਾਂ ਤੇ ਪਰੋਜੈਕਟਰ ਨਾਲ ਕਿਵੇਂ ਜੁੜਨਾ ਹੈ" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "ਪੈਨਲ;ਪਰੋਜੈਕਟਰ;xrandr;ਸਕਰੀਨ;ਰੈਜ਼ੋਲੂਸ਼ਨ;ਤਾਜ਼ਾ;ਮਾਨੀਟਰ;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "ਵੇਲੈਂਡ" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "ਅਣਜਾਣ" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-ਬਿੱਟ (ਬਿਲਡ ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-ਬਿੱਟ" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-ਬਿੱਟ" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "ਪੁੱਛੋ ਕਿ ਕੀ ਕਰਨਾ ਹੈ" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "ਕੁਝ ਨਹੀਂ" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "ਫੋਲਡਰ ਖੋਲ੍ਹੋ" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "ਹੋਰ ਮੀਡਿਆ" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "ਆਡੀਓ ਸੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "ਵਿਡੀਓ ਡੀਵੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "ਜਦੋਂ ਸੰਗੀਤ ਪਲੇਅਰ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਚਲਾਉਣ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "ਜਦੋਂ ਕੈਮਰਾ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇ ਤਾਂ ਚਲਾਉਣ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "ਸਾਫਟਵੇਅਰ ਸੀਡੀ ਲਈ ਐਪਲੀਕੇਸ਼ਨ ਚੁਣੋ" @@ -1281,88 +1324,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "ਆਡੀਓ ਡੀਵੀਡੀ" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "ਖਾਲੀ ਬਲੁ-ਰੇ ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "ਖਾਲੀ CD ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "ਖਾਲੀ DVD ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "ਖਾਲੀ HD DVD ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "ਬਲੁ-ਰੇ ਵਿਡੀਓ ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "ਈ-ਬੁੱਕ ਰੀਡਰ" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD ਵਿਡੀਓ ਡਿਸਕ" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "ਤਸਵੀਰ ਸੀਡੀ" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "ਸੁਪਰ ਵਿਡੀਓ ਸੀਡੀ" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "ਵਿਡੀਓ ਸੀਡੀ" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "ਵਿੰਡੋਜ਼ ਸਾਫਟਵੇਅਰ" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "ਭਾਗ" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "ਸੰਖੇਪ" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "ਡਿਫਾਲਟ ਐਪਲੀਕੇਸ਼ਨ" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "ਹਟਾਉਣਯੋਗ ਮੀਡਿਆ" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "ਵਰਜਨ %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "ਵੇਰਵਾ" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#| msgid "Details" +msgid "De­tails" +msgstr "ਵੇਰਵੇ" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "ਆਪਣੇ ਸਿਸਟਮ ਬਾਰੇ ਜਾਣਕਾਰੀ ਵੇਖੋ" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1538,8 +1580,9 @@ msgid "Launch help browser" msgstr "ਮੱਦਦ-ਝਲਕਾਰਾ ਚਲਾਓ" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1605 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "ਸੈਟਿੰਗ" @@ -1612,7 +1655,6 @@ msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "ਯੂਨੀਵਰਸਲ ਅਸੈੱਸ" @@ -1648,11 +1690,21 @@ msgid "High contrast on or off" msgstr "ਵੱਧ-ਗੂੜ੍ਹਾ ਕਰਨਾ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "ਕਸਟਮ ਸ਼ਾਰਟਕੱਟ" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:417 +#: ../panels/keyboard/shortcut-editor.ui.h:1 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1679,128 +1731,130 @@ msgid "Modifiers-only switch to next source" msgstr "ਮਾਡੀਫਾਇਰ-ਕੇਵਲ ਅਗਲੇ ਸਰੋਤ ਲਈ ਬਦਲੋ" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "ਕੀ-ਬੋਰਡ" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:308 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:444 +#, c-format +msgid "Keyboard shortcut for %s. Enter new shortcut to change." +msgstr "" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:799 +#| msgid "Custom Shortcut" +msgid "Add Custom Shortcut" +msgstr "ਕਸਟਮ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਜੋੜੋ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#| msgid "Keyboard" +msgid "Key­board" +msgstr "ਕੀ-ਬੋਰਡ" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਵੇਖੋ ਤੇ ਬਦਲੋ ਅਤੇ ਆਪਣੀ ਟਾਈਪ ਕਰਨ ਲਈ ਪਸੰਦ ਦਿਉ" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "ਸ਼ਾਰਟਕੱਟ;ਦੁਹਰਾਉ;ਬਲਿੰਕ;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "ਕਸਟਮ ਸ਼ਾਰਟਕੱਟ" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "ਨਵਾਂ(_N):" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "ਕਮਾਂਡ(_o):" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਿਲ" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "ਸ਼ਾਰਟਕੱਟ ਹਟਾਓ" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 msgid "" "To edit a shortcut, click the row and hold down the new keys or press " "Backspace to clear." msgstr "" -"ਸ਼ਾਰਟਕੱਟ ਸੋਧਣ ਲਈ, ਕਤਾਰ ਕਲਿੱਕ ਕਰੋ ਅਤੇ ਨਵੀਆਂ ਸਵਿੱਚ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ ਜਾਂ ਬੈਕਸਪੇਸ " -"ਸਾਫ਼ ਕਰਨ ਲਈ ਵਰਤੋਂ।" +"ਸ਼ਾਰਟਕੱਟ ਸੋਧਣ ਲਈ, ਕਤਾਰ ਕਲਿੱਕ ਕਰੋ ਅਤੇ ਨਵੀਆਂ ਸਵਿੱਚ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ ਜਾਂ ਬੈਕਸਪੇਸ" +" ਸਾਫ਼ ਕਰਨ ਲਈ ਵਰਤੋਂ।" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "ਕਸਟਮ ਸ਼ਾਰਟਕੱਟ" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#| msgid "Keyboard Shortcuts" +msgid "No keyboard shortcut found" +msgstr "ਕੋਈ ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਨਹੀਂ ਲੱਭਿਆ" + +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +msgid "Try a different search" +msgstr "ਵੱਖਰੀ ਖੋਜ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<ਅਣਜਾਣੀ ਕਾਰਵਾਈ>" +#: ../panels/keyboard/shortcut-editor.ui.h:2 +#: ../panels/network/connection-editor/ce-page-reset.c:89 +#: ../panels/network/network-wifi.ui.h:51 +msgid "Reset" +msgstr "ਮੁੜ-ਸੈੱਟ" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"ਸ਼ਾਰਟਕੱਟ \"%s\" ਨੂੰ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਇਹ ਸਵਿੱਚ ਦੀ ਵਰਤੋਂ ਕਰਕੇ " -"ਲਿਖਣਾ ਮੁਸ਼ਕਿਲ ਹੋ " -"ਜਾਵੇਗਾ।\n" -"ਇੱਕ ਅਜੇਹੀ ਸਵਿੱਚ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਸ ਵਿੱਚ ਇੱਕ ਸਮੇਂ Control, Alt ਜਾਂ Shift " -"ਇੱਕਠੇ ਹੋਣ।" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "ਨਾਂ" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"ਸ਼ਾਰਟਕੱਟ \"%s\" ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ\n" -" \"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +#| msgid "_Command:" +msgid "Command" +msgstr "ਕਮਾਂਡ" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "ਸ਼ਾਰਟਕੱਟ" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "ਸੋਧ" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "ਜੇ ਤੁਸੀਂ ਸ਼ਾਰਟਕੱਟ \"%s\" ਲਈ ਦਿੱਤਾ ਤਾਂ \"%s\" ਸ਼ਾਰਟਕੱਟ ਆਯੋਗ ਹੋ ਜਾਵੇਗਾ।" +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "ਕੋਈ ਨਹੀਂ" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "ਮੁੜ-ਜਾਰੀ(_R)" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#| msgid "_Remove" +msgid "Remove" +msgstr "ਹਟਾਓ" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"ਸ਼ਾਰਟਕੱਟ \"%s\" ਨਾਲ ਸੰਬੰਧਿਤ \"%s\" ਸ਼ਾਰਟਕ਼ਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ \"%s\" ਲਈ " -"ਆਟੋਮੈਟਿਕ ਸੈੱਟ " -"ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "ਰੱਦ ਕਰੋ" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" ਇਸ ਸਮੇਂ \"%s\" ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ, ਇਹ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ, " -"ਜੇ ਤੁਸੀਂ ਅੱਗੇ " -"ਜਾਰੀ ਰੱਖਿਆ।" +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "ਸ਼ਾਮਲ" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "ਮੁੜ-ਜਾਰੀ(_A)" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#| msgid "_Replace" +msgid "Replace" +msgstr "ਬਦਲੋ" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "ਆਪਣੀ ਸੈਟਿੰਗ ਜਾਂਚੋ(_S)" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#| msgid "Mouse & Touchpad" +msgid "Mouse & Touch­pad" msgstr "ਮਾਊਸ ਤੇ ਟੱਚਪੈਚ" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "ਆਪਣੇ ਮਾਊਸ ਜਾਂ ਟੱਚਪੈਡ ਦੀ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਬਦਲੋ ਅਤੇ ਸੱਜੇ ਜਾਂ ਖੱਬੇ-ਹੱਥ ਦੀ ਚੋਣ ਕਰੋ" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;ਟਰੈਕਪੈਂਡ;ਪੁਆਇੰਟਰ;ਕਲਿੱਕ;ਟੈਪ;" @@ -1812,7 +1866,6 @@ msgstr "ਆਮ" #: ../panels/mouse/gnome-mouse-properties.ui.h:2 -#| msgid "Primary _button" msgid "Primary Button" msgstr "ਪ੍ਰਾਇਮਰੀ ਬਟਨ" @@ -1821,14 +1874,10 @@ msgstr "ਮਾਊਸ ਅਤੇ ਟੱਚ-ਪੈਡ ਉੱਤੇ ਮੌਜੂਦ ਬਟਨਾਂ ਦਾ ਕ੍ਰਮ ਸੈੱਟ ਕਰੋ" #: ../panels/mouse/gnome-mouse-properties.ui.h:4 -#| msgctxt "balance" -#| msgid "Left" msgid "Left" msgstr "ਖੱਬੇ" #: ../panels/mouse/gnome-mouse-properties.ui.h:5 -#| msgctxt "balance" -#| msgid "Right" msgid "Right" msgstr "ਸੱਜੇ" @@ -1837,7 +1886,6 @@ msgstr "ਮਾਊਸ" #: ../panels/mouse/gnome-mouse-properties.ui.h:7 -#| msgid "_Mouse Keys" msgid "Mouse Speed" msgstr "ਮਾਊਸ ਸਪੀਡ" @@ -1847,12 +1895,10 @@ #. Translators: This switch reverses the scrolling direction for touchpads. The term used comes from OS X so use the same translation if possible. #: ../panels/mouse/gnome-mouse-properties.ui.h:10 -#| msgid "_Natural scrolling" msgid "Natural Scrolling" msgstr "ਨੈਚਰਲ ਸਕਰੋਲਿੰਗ" #: ../panels/mouse/gnome-mouse-properties.ui.h:11 -#| msgid "This will not remove the account on the server." msgid "Scrolling moves the content, not the view." msgstr "ਸਕਰੋਲ ਕਰਨ ਨਾਲ ਸਮੱਗਰੀ ਹਿਲਦੀ ਹੈ, ਝਲਕ ਨਹੀਂ।" @@ -1861,17 +1907,19 @@ msgstr "ਟੱਚਪੈਡ" #: ../panels/mouse/gnome-mouse-properties.ui.h:13 -#| msgid "Touchpad" msgid "Touchpad Speed" msgstr "ਟੱਚਪੈਡ ਸਪੀਡ" #: ../panels/mouse/gnome-mouse-properties.ui.h:14 -#| msgid "Tap to _click" msgid "Tap to Click" msgstr "ਕਲਿੱਕ ਲਈ ਛੂਹੋੋ" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 -#| msgid "Scrolling" +#| msgid "Two _finger scroll" +msgid "Two-finger Scrolling" +msgstr "ਦੋ ਉਂਗਲਾਂ ਨਾਲ ਸਕਰੋਲ" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "ਕੋਨਾ ਸਕਰੋਲਿੰਗ" @@ -1910,11 +1958,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "ਏਅਰਪਲੇਨ ਮੋਡ(_p)" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "ਨੈੱਟਵਰਕ ਪਰਾਕਸੀ" @@ -1922,17 +1970,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "ਓਹ ਹੋ, ਕੁਝ ਗਲਤ ਵਾਪਰਿਆ। ਆਪਣੇ ਸਾਫਟਵੇਅਰ ਵੇਂਡਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।" -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "ਨੈਟਵਰਕਮੈਨੇਜਰ ਚੱਲਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ" @@ -1948,7 +1996,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1965,69 +2013,64 @@ msgid "page 2" msgstr "ਸਫ਼ਾ 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:458 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "ਸੁਰੱਖਿਆ" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "ਆਟੋਮੈਟਿਕ" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "ਪਰੋਫਾਇਲ %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "ਇੰਟਰਪ੍ਰਾਈਜ਼" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "ਕਦੇ ਨਹੀਂ" -#: ../panels/network/connection-editor/ce-page-details.c:102 -#: ../panels/user-accounts/um-utils.c:815 -msgid "Today" -msgstr "ਅੱਜ" - #: ../panels/network/connection-editor/ce-page-details.c:104 -#: ../panels/user-accounts/um-utils.c:818 -msgid "Yesterday" -msgstr "ਕੱਲ੍ਹ" - -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2035,179 +2078,174 @@ msgstr[1] "%i ਦਿਨ ਪਹਿਲਾਂ" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "ਕਮਜ਼ੋਰ" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "ਠੀਕ ਹੈ" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "ਚੰਗਾ" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "ਬਹੁਤ ਵਧੀਆ" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:236 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "ਵੇਰਵਾ" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "ਪਛਾਣ" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "ਐਡਰੈੱਸ" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "ਨੈੱਟਮਾਸਕ" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "ਗੇਟਵੇ" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "ਐਡਰੈਸ ਹਟਾਓ" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "ਸ਼ਾਮਲ" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "ਸਰਵਰ" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS ਸਰਵਰ ਹਟਾਓ" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "ਮੈਟਰਿਕ" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "ਰੂਟ ਹਟਾਓ" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "ਆਟੋਮੈਟਿਕ (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:201 msgid "Manual" msgstr "ਦਸਤੀ" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "ਕੇਵਲ ਲੋਕਲ-ਲਿੰਕ" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "ipv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "ਪ੍ਰੀ-ਫਿਕਸ" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:201 msgid "Automatic" msgstr "ਆਟੋਮੈਟਿਕ" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "ਆਟੋਮੈਟਿਕ, ਕੇਵਲ DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:893 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "ipv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 -#: ../panels/network/network-wifi.ui.h:51 -msgid "Reset" -msgstr "ਮੁੜ-ਸੈੱਟ" - -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-ਬਿੱਟ ਕੁੰਜੀ (Hex ਜਾਂ ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-ਬਿੱਟ ਵਾਕ" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA ਤੇ WPA੨ ਨਿੱਜੀ" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA ਤੇ WPA੨ ਇੰਟਰਪ੍ਰਾਈਜ" @@ -2222,30 +2260,30 @@ msgstr "ਲਿੰਕ ਸਪੀਡ" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 ਐਡਰੈੱਸ" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 ਐਡਰੈੱਸ" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2255,7 +2293,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2338,13 +2376,13 @@ msgid "Firewall _Zone" msgstr "ਫਾਇਰਵਾਲ ਜ਼ੋਨ(_z)" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "ਡਿਫਾਲਟ" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "ਜ਼ੋਨ ਕੁਨੈਕਸ਼ਨ ਲਈ ਭਰੋਸੇਯੋਗਤਾ (ਟਰਸਟ ਲੈਵਲ) ਦਰਸਾਉਂਦਾ ਹੈ" @@ -2386,45 +2424,26 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "ਕੁਨੈਕਸ਼ਨ ਐਡੀਟਰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "ਨਵਾਂ ਪਰੋਫਾਇਲ" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "ਬੌਂਡ" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "ਟੀਮ" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "ਬਰਿੱਜ਼" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "VPN ਪਲੱਗਇਨ ਲੋਡ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "…ਫਾਇਲ ਤੋਂ ਇੰਪੋਰਟ ਕਰੋ" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +#| msgid "%s VPN" +msgid "Add VPN" +msgstr "VPN ਨੂੰ ਜੋੜੋ" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2432,7 +2451,7 @@ msgstr "ਮੁਡ਼-ਸੈੱਟ(_R)" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1533 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "ਭੁੱਲ ਜਾਓ(_F)" @@ -2442,8 +2461,8 @@ "Reset the settings for this network, including passwords, but remember it as " "a preferred network" msgstr "" -"ਇਹ ਨੈੱਟਵਰਕ ਲਈ ਸੈਟਿੰਗ, ਜਿਸ ਵਿੱਚ ਪਾਸਵਰਡ ਹਨ, ਨੂੰ ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਪਰ ਪਸੰਦੀਦਾ " -"ਨੈੱਟਵਰਕ ਵਜੋਂ ਯਾਦ ਰੱਖੋ।" +"ਇਹ ਨੈੱਟਵਰਕ ਲਈ ਸੈਟਿੰਗ, ਜਿਸ ਵਿੱਚ ਪਾਸਵਰਡ ਹਨ, ਨੂੰ ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਪਰ ਪਸੰਦੀਦਾ" +" ਨੈੱਟਵਰਕ ਵਜੋਂ ਯਾਦ ਰੱਖੋ।" #: ../panels/network/connection-editor/reset-page.ui.h:4 msgid "" @@ -2457,11 +2476,11 @@ msgid "S_ecurity" msgstr "ਸੁਰੱਖਿਆ(_e)" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2473,36 +2492,36 @@ "\n" "ਗਲਤੀ: %s।" -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:1953 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "ਖੋਲ੍ਹੋ(_O)" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "\"%s\" ਫਾਇਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "ਬਦਲੋ(_R)" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ VPN, ਜੋ ਤੁਸੀਂ ਸੰਭਾਲ ਰਹੇ ਹੋ, ਨਾਲ ਬਦਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2513,7 +2532,7 @@ "\n" "ਗਲਤੀ: %s" -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ ਕਰੋ" @@ -2540,61 +2559,49 @@ msgid "Make available to _other users" msgstr "ਹੋਰ ਵਰਤੋਂਕਾਰ ਨੂੰ ਉਪਲੱਬਧ ਕਰਵਾਉ(_o)" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#| msgid "Network" +msgid "Net­work" msgstr "ਨੈੱਟਵਰਕ" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਇੰਟਰਨੈੱਟ ਨਾਲ ਤੁਸੀਂ ਕਿਵੇਂ ਕੁਨੈਕਟ ਹੋ" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +#| msgid "" +#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" +#| "vpn;vlan;bridge;bond;DNS;" msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"ਨੈੱਟਵਰਕ;ਬੇਤਾਰ;ਵਾਈ-ਫਾਈ;ਆਈਪੀ;ਬਰਾਡਬੈਂਡ;ਮਾਡਮ;ਬਲਿਊਟੁੱਥ;Wireless;Wi-Fi;Wifi;IP;LAN;P" -"roxy;" -"WAN;Broadband;Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "ਬੌਂਡ ਸਲੇਵ" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ਕੋਈ ਨਹੀਂ)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "ਬਰਿੱਜ ਸਲੇਵ" +"ਨੈੱਟਵਰਕ;ਬੇਤਾਰ;ਵਾਈ-ਫਾਈ;ਆਈਪੀ;ਬਰਾਡਬੈਂਡ;ਮਾਡਮ;ਬਲਿਊਟੁੱਥ;vpn;vlan;bridge;bond;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ਕਦੇ ਨਹੀਂ" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "ਅੱਜ" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ਕੱਲ੍ਹ" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP ਐਡਰੈੱਸ" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "ਆਖਰੀ ਵਰਤੋਂ" @@ -2604,85 +2611,76 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "ਤਾਰ ਵਾਲਾ" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1691 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "…ਚੋਣਾਂ" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "ਪਰੋਫਾਇਲ %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਕਰੋ" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "ਟੀਮ ਸਲੇਵ" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1202 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." msgstr "" -"ਜੇ ਤੁਸੀਂ ਬੇਤਾਰ ਤੋਂ ਬਿਨਾਂ ਕਿਸੇ ਹੋਰ ਤਰ੍ਹਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਤਾਂ ਤੁਸੀਂ ਇਸ " -"ਨੂੰ ਹੋਰਾਂ ਨਾਲ ਆਪਣੇ ਇੰਟਰਨੈੱਟ " +"ਜੇ ਤੁਸੀਂ ਬੇਤਾਰ ਤੋਂ ਬਿਨਾਂ ਕਿਸੇ ਹੋਰ ਤਰ੍ਹਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਤਾਂ ਤੁਸੀਂ ਇਸ" +" ਨੂੰ ਹੋਰਾਂ ਨਾਲ ਆਪਣੇ ਇੰਟਰਨੈੱਟ " "ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਵਰਤ ਸਕਦੇ ਹੋ।" -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1206 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "ਬੇਤਾਰ ਹਾਟਸਪਾਟ ਚਾਲੂ ਕਰਨ ਨਾਲ ਤੁਹਾਨੂੰ %s ਤੋਂ ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਵੇਗਾ।" -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1210 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" "ਤੁਹਾਡੇ ਬੇਤਾਰ ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਵਰਤਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ, ਜਦੋਂ ਕਿ ਹਾਟਸਪਾਟ ਸਰਗਰਮ ਹੋਵੇ।" -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1293 msgid "Stop hotspot and disconnect any users?" msgstr "ਕੀ ਹਾਟਸਪਾਟ ਰੋਕਣਾ ਹੈ ਅਤੇ ਯੂਜ਼ਰ ਨੂੰ ਡਿਸ-ਕੁਨੈਕਟ ਕਰਨਾ ਹੈ?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1296 msgid "_Stop Hotspot" msgstr "ਹਾਟਸਪਾਟ ਰੋਕੋ(_S)" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1394 msgid "System policy prohibits use as a Hotspot" msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਹਾਟ-ਸਪਾਟ ਵਜੋਂ ਵਰਤਣ ਤੋਂ ਰੋਕਦੀ ਹੈ" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1397 msgid "Wireless device does not support Hotspot mode" msgstr "ਵਾਇਰਲੈਸ ਜੰਤਰ ਹਾਟਸਪਾਟ ਮੋਡ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1529 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "" -"ਚੁਣੇ ਗਏ ਨੈੱਟਵਰਕਾਂ ਲਈ ਨੈੱਟਵਰਕ ਵੇਰਵਾ, ਜਿਸ ਵਿੱਚ ਪਾਸਵਰਡ ਅਤੇ ਹੋਰ ਪਸੰਦੀਦਾ ਸੰਰਚਨਾ " -"ਦਿੱਤੀ ਸੀ, ਖਤਮ ਹੋ " +"ਚੁਣੇ ਗਏ ਨੈੱਟਵਰਕਾਂ ਲਈ ਨੈੱਟਵਰਕ ਵੇਰਵਾ, ਜਿਸ ਵਿੱਚ ਪਾਸਵਰਡ ਅਤੇ ਹੋਰ ਪਸੰਦੀਦਾ ਸੰਰਚਨਾ" +" ਦਿੱਤੀ ਸੀ, ਖਤਮ ਹੋ " "ਜਾਵੇਗਾ।" -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1839 msgid "History" msgstr "ਅਤੀਤ" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1843 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2690,7 +2688,7 @@ msgstr "ਬੰਦ ਕਰੋ(_C)" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1851 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "ਭੁੱਲ ਜਾਓ(_F)" @@ -2726,6 +2724,10 @@ msgid "Provider" msgstr "ਪਰੋਵਾਇਡਰ" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "ਨੈੱਟਵਰਕ" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2831,16 +2833,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "ਪਾਸਵਰਡ(_P)" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "ਕੋਈ ਨਹੀਂ" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_a)" @@ -2890,16 +2888,16 @@ "Reset the settings for this connection to their defaults, but remember as a " "preferred connection." msgstr "" -"ਇਹ ਕੁਨੈਕਸ਼ਨ ਲਈ ਸੈਟਿੰਗ ਉਹਨਾਂ ਦੇ ਡਿਫਾਲਟ ਲਈ ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਪਰ ਪਸੰਦੀਦਾ ਕੁਨੈਕਸ਼ਨ ਵਜੋਂ " -"ਯਾਦ ਰੱਖੋ।" +"ਇਹ ਕੁਨੈਕਸ਼ਨ ਲਈ ਸੈਟਿੰਗ ਉਹਨਾਂ ਦੇ ਡਿਫਾਲਟ ਲਈ ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਪਰ ਪਸੰਦੀਦਾ ਕੁਨੈਕਸ਼ਨ ਵਜੋਂ" +" ਯਾਦ ਰੱਖੋ।" #: ../panels/network/network-wifi.ui.h:44 msgid "" "Remove all details relating to this network and do not try to automatically " "connect to it." msgstr "" -"ਇਹ ਨੈੱਟਵਰਕ ਨਾਲ ਸਬੰਧਿਤ ਵੇਰਵਾ ਹਟਾਉ ਅਤੇ ਇਸ ਨਾਲ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਨਾ " -"ਕਰੋ।" +"ਇਹ ਨੈੱਟਵਰਕ ਨਾਲ ਸਬੰਧਿਤ ਵੇਰਵਾ ਹਟਾਉ ਅਤੇ ਇਸ ਨਾਲ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਨਾ" +" ਕਰੋ।" #: ../panels/network/network-wifi.ui.h:45 msgid "reset" @@ -2934,7 +2932,6 @@ msgstr "…ਲੁਕਵੇਂ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ(_C)" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "ਅਤੀਤ(_H)" @@ -2956,360 +2953,338 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "ਪਾਸਵਰਡ" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "ਐਡ-ਹਾਕ" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "ਇੰਫਰਾਸਟੱਕਚਰ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "ਹਾਲਤ ਅਣਜਾਣ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "ਬਿਨ-ਪਰਬੰਧ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "ਨਾ-ਉਪਲੱਬਧ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "ਕੁਨੈਕਟ ਹੈ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "ਹਾਲਤ ਅਣਜਾਣ (ਗੁੰਮ)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "ਕੁਨੈਕਟ ਨਹੀਂ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੋਈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੋਈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP ਸੰਰਚਨਾ ਦੀ ਮਿਆਦ ਪੁੱਗੀ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "ਭੇਦ ਦੀ ਲੋੜ ਸੀ, ਪਰ ਦਿੱਤਾ ਨਹੀਂ ਗਿਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x ਸਪਲੀਮੈਂਟ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x ਸਪਲੀਮੈਂਟ ਸੰਰਚਨਾ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x ਸਪਲੀਮੈਂਟ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x ਸਪਲੀਮੈਂਟ ਨੇ ਪਰਮਾਣਿਤ ਹੋਣ ਲਈ ਬਹੁਤ ਲੰਮਾ ਸਮਾਂ ਲੈ ਲਿਆ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP ਸਰਵਿਸ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP ਕਲਾਇਟ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP ਕਲਾਇਟ ਗਲਤੀ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP ਕਲਾਇਟ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "ਸਾਂਝੀ ਕੀਤੀ ਕੁਨੈਕਸ਼ਨ ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "ਸਾਂਝਾ ਕੀਤੀ ਕੁਨੈਕਸ਼ਨ ਸਰਵਿਸ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਗਲਤੀ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "ਆਟੋ-IP ਸਰਵਿਸ ਫੇਲ੍ਹ ਹੋਈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "ਲਾਈਨ ਰੁਝੀ ਹੋਈ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "ਕੋਈ ਡਾਇਲ ਟੋਨ ਨਹੀਂ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "ਕੋਈ ਕੈਰੀਅਰ ਤਿਆਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "ਡਾਇਲ ਕਰਨ ਲਈ ਸਮਾਂ-ਸਮਾਪਤ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "ਡਾਇਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਫੇਲ੍ਹ ਹੋਈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "ਮਾਡਮ ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "ਦਿੱਤੇ APN ਨੂੰ ਚੁਣਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "ਨੈੱਟਵਰਕ ਲਈ ਖੋਜ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "ਨੈੱਟਵਰਕ ਰਜਿਸਟਰੇਸ਼ਨ ਉੱਤੇ ਪਾਬੰਦੀ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "ਨੈੱਟਵਰਕ ਰਜਿਸਟਰ ਲਈ ਸਮਾਂ-ਸਮਾਪਤ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "ਮੰਗੇ ਗਏ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN ਚੈਕ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "ਜੰਤਰ ਲਈ ਫਿਰਮਵੇਅਰ ਸ਼ਾਇਦ ਮੌਜੂਦ ਨਹੀਂ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "ਕੁਨੈਕਸ਼ਨ ਅਲੋਪ ਹੋਇਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "ਮੌਜੂਦਾ ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਪ੍ਰਾਪਤ ਕੀਤਾ ਗਿਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "ਮਾਡਮ ਨਹੀਂ ਲੱਭਿਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "ਬਲਿਉਟੁੱਥ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM ਕਾਰਡ ਨਹੀਂ ਪਾਇਆ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM ਪਿੰਨ ਚਾਹੀਦਾ ਹੈ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM Puk ਦੀ ਲੋੜ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM ਗਲਤ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "ਇੰਫੀਬੀਮ ਜੰਤਰ ਕੁਨੈਕਟ ਕੀਤੇ ਮੋਡ ਵਿੱਚ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "ਕੁਨੈਕਸ਼ਨ ਨਿਰਭਰਤਾ ਫੇਲ੍ਹ ਹੋਈ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "ਫਿਰਮਵੇਅਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "ਕੇਬਲ ਕੱਢੀ ਹੋਈ ਹੈ" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "" + +#: ../panels/network/wireless-security/eap-method.c:245 +#| msgid "No input source selected" +msgid "no file selected" +msgstr "ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਚੁਣੀ" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ (CA) ਸਰਟੀਫਿਕੇਟ ਦੀ ਵਰਤੋਂ ਨਾ ਕਰਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਸੁਰੱਖਿਅਤ, ਠੱਗ " -"ਵਾਈ-ਫਾਈ " -"ਨੈੱਟਵਰਕ ਹੋ ਸਕਦੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਟੀਫਿਕੇਟ ਚੁਣਨਾ ਚਾਹੁੰਦੇ ਹੋ?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "ਅਣਡਿੱਠਾ" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "CA ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, ਜਾਂ PKCS#12 ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, ਜਾਂ PKCS#12 ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER ਜਾਂ PEM ਸਰਟੀਫਿਕੇਟ (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "PAC ਫਾਇਲ ਚੁਣੋ" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC ਫਾਇਲਾਂ (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC ਫਾਇਲ(_f)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "ਅੰਦਰੂਨੀ ਪਰਮਾਣਕਿਤਾ(_I)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC ਪਰੋਵਿਜ਼ਨਿੰਗ(_v)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3318,41 +3293,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "ਅਗਿਆਤ" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "ਪਰਮਾਣਿਤ ਕੀਤਾ" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "ਦੋਵੇਂ" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC ਫਾਇਲ(_f)" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "ਅੰਦਰੂਨੀ ਪਰਮਾਣਕਿਤਾ(_I)" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#| msgid "PAC pro_visioning" +msgid "Allow automatic PAC pro_visioning" +msgstr "ਆਟੋਮੈਟਿਕ PAC ਪਰੋਵਿਜ਼ਨਿੰਗ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ(_v)" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U)" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਫੀਟਿਕੇਟ ਚੁਣੋ" @@ -3370,19 +3378,58 @@ msgid "C_A certificate" msgstr "C_A ਸਰਟੀਫਿਕੇਟ" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#| msgid "Authentication required" +msgid "No CA certificate is _required" +msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ(_r)" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP ਵਰਜਨ(_v)" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਪੁੱਛੋ(_k)" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +#| msgid "Wrong password" +msgid "missing EAP password" +msgstr "ਗਲਤ EAP ਪਾਸਵਰਡ" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "ਬਿਨ-ਇੰਕ੍ਰਿਪਸ਼ਨ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ ਅਸੁਰੱਖਿਅਤ ਹਨ" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3390,17 +3437,17 @@ "\n" "(You can password-protect your private key with openssl)" msgstr "" -"ਚੁਣੀ ਗਈ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਜਾਪਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ " -"ਸਨਦ ਨੂੰ ਖਤਰਾ " +"ਚੁਣੀ ਗਈ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਜਾਪਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ" +" ਸਨਦ ਨੂੰ ਖਤਰਾ " "ਪੈਦਾ ਕਰ ਸਕਦੀ ਹੈ। ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਚੁਣੋ ਜੀ।\n" "\n" "(ਤੁਸੀਂ openssl ਨਾਲ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "ਆਪਣਾ ਨਿੱਜੀ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "ਆਪਣੀ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਚੁਣੋ" @@ -3412,51 +3459,56 @@ msgid "_User certificate" msgstr "ਵਰਤੋਂਕਾਰ ਸਰਟੀਫਿਕੇਟ(_U)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ(_P)" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "ਮੈਨੂੰ ਫੇਰ ਸਾਵਧਾਨ ਨਾ ਕਰੋ(_w)" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "ਨਹੀਂ" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "ਹਾਂ" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "ਟਨਲ TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "ਸੁਰੱਖਿਅਤ EAP (PEAP)" @@ -3466,6 +3518,45 @@ msgid "Au_thentication" msgstr "ਪਰਮਾਣਿਕਤਾ(_t)" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "" + +#: ../panels/network/wireless-security/ws-leap.c:74 +#| msgid "Wrong password" +msgid "missing leap-password" +msgstr "ਗੁੰਮ ਲੀਪ-ਪਾਸਵਰਡ" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "੧ (ਡਿਫਾਲਟ)" @@ -3502,170 +3593,160 @@ msgid "WEP inde_x" msgstr "WEP ਇੰਡੈਕਸ(_x)" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "ਕਿਸਮ(_T)" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:174 +#: ../panels/privacy/cc-privacy-panel.c:241 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "ਚਾਲੂ" #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 -#| msgctxt "notifications" -#| msgid "Notifications" msgctxt "notifications" msgid "_Notifications" msgstr "ਸੂਚਨਾਵਾਂ(_N)" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 -#| msgctxt "notifications" -#| msgid "Sound Alerts" msgctxt "notifications" msgid "Sound _Alerts" msgstr "ਸਾਊਂਡ ਚੇਤਾਵਨੀਆਂ(_A)" #: ../panels/notifications/edit-dialog.ui.h:5 -#| msgctxt "notifications" -#| msgid "Notification Banners" msgctxt "notifications" msgid "Notification _Banners" msgstr "ਸੂਚਨਾਵਾਂ ਬੈਨਰ(_B)" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 -#| msgctxt "notifications" -#| msgid "Show Message Content in Banners" msgctxt "notifications" msgid "Show Message _Content in Banners" msgstr "ਬੈਨਰ ਵਿੱਚ ਸੁਨੇਹਾ ਸਮਗੱਰੀ ਵੇਖਾਓ(_C)" #: ../panels/notifications/edit-dialog.ui.h:8 -#| msgctxt "notifications" -#| msgid "Lock Screen Notifications" msgctxt "notifications" msgid "_Lock Screen Notifications" msgstr "ਲਾਕ ਸਕਰੀਨ ਨੋਟੀਫਿਕੇਸ਼ਨ(_L)" #: ../panels/notifications/edit-dialog.ui.h:9 -#| msgctxt "notifications" -#| msgid "Show Message Content on Lock Screen" msgctxt "notifications" msgid "Show Message C_ontent on Lock Screen" msgstr "ਲਾਕ ਸਕਰੀਨ ਵਿੱਚ ਸੁਨੇਹਾ ਸਮਗੱਰੀ ਵੇਖਾਓ(__o)" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#| msgid "Notifications" +msgid "No­ti­fi­ca­tions" msgstr "ਸੂਚਨਾਵਾਂ" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਕਿਹੜੀਆਂ ਸੂਚਨਾਵਾਂ ਵੇਖਾਉਣੀਆਂ ਅਤੇ ਉਹ ਕੀ ਕੁਝ ਵੇਖਾਉਣ" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "ਸੂਚਨਾ;ਬੈਨਰ;ਸੁਨੇਹਾ;ਟਰੇ;ਪੋਪਅੱਪ;Notifications;Banner;Message;Tray;Popup;" #: ../panels/notifications/notifications.ui.h:1 -#| msgid "Notification Banners" msgid "Notification _Banners" msgstr "ਸੂਚਨਾਵਾਂ ਬੈਨਰ(_B)" #: ../panels/notifications/notifications.ui.h:2 -#| msgid "Lock Screen Notifications" msgid "_Lock Screen Notifications" msgstr "ਲਾਕ ਸਕਰੀਨ ਸੂਚਨਾਵਾਂ(_L)" #. List of applications. #: ../panels/notifications/notifications.ui.h:4 -#: ../panels/sound/gvc-mixer-dialog.c:1781 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 msgid "Applications" msgstr "ਐਪਲੀਕੇਸ਼ਨਾਂ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "ਹੋਰ" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "ਅਕਾਊਂਟ ਜੋੜੋ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "ਮੇਲ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +#| msgid "_Calendar" +msgid "Calendar" +msgstr "ਕੈਲੰਡਰ" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "ਸੰਪਰਕ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "ਗੱਲਬਾਤ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "ਸਰੋਤ" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "ਅਕਾਊਂਟ ਵਿੱਚ ਲਾਗਇਨ ਵਿੱਚ ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "ਸਨਦ ਦੀ ਮਿਆਦ ਪੁੱਗੀ।" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "ਇਹ ਅਕਾਊਂਟ ਚਾਲੂ ਕਰਨ ਲਈ ਸਾਇਨ ਕਰੋ।" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "ਸਾਇਨ ਇਨ(_S)" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "ਅਕਾਊਂਟ ਹਟਾਉਣਾ ਦੌਰਾਨ ਗਲਤੀ" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "ਕੀ ਤੁਸੀਂ ਅਕਾਊਂਟ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾਏਗਾ।" -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "ਹਟਾਓ(_R)" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#| msgid "Online Accounts" +msgid "On­line Accounts" msgstr "ਆਨਲਾਈਨ ਅਕਾਊਂਟ" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "ਆਪਣੇ ਆਨਲਾਈਨ ਖਾਤਿਆਂ ਨਾਲ ਕੁਨੈਕਟ ਹੋਵੋ ਅਤੇ ਫੈਸਲਾ ਕਰੋ ਕਿ ਉਹਨਾਂ ਨੂੰ ਕਿਸ ਲਈ ਵਰਤਣਾ ਹੈ" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3680,6 +3761,7 @@ msgstr "ਕੋਈ ਆਨਲਾਈਨ ਅਕਾਊਂਟ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "ਅਕਾਊਂਟ ਹਟਾਓ" @@ -3692,8 +3774,8 @@ "Adding an account allows your applications to access it for documents, mail, " "contacts, calendar, chat and more." msgstr "" -"ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀਆਂ ਐਪਲੀਕੇਸ਼ਨ ਉਸ ਲਈ ਡੌਕੂਮੈਂਟ, ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ, " -"ਚੈਟ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ " +"ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀਆਂ ਐਪਲੀਕੇਸ਼ਨ ਉਸ ਲਈ ਡੌਕੂਮੈਂਟ, ਮੇਲ, ਸੰਪਰਕ, ਕੈਲੰਡਰ," +" ਚੈਟ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ " "ਵਰਤ ਸਕਦੀਆਂ ਹਨ।" #: ../panels/power/cc-power-panel.c:253 @@ -3823,7 +3905,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "ਬੈਟਰੀ" @@ -3871,107 +3953,102 @@ msgid "When _idle" msgstr "ਜਦੋਂ ਵੇਹਲਾ ਹੈ(_i)" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "ਪਾਵਰ ਬੱਚਤ" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "ਸਕਰੀਨ ਚਮਕ(_S)" -#: ../panels/power/cc-power-panel.c:1694 -#| msgid "Automatic Routes" +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "ਆਟੋਮੈਟਿਕ ਚਮਕ" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "ਕੀ-ਬੋਰਡ ਚਮਕ(_K)" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "ਨਾ-ਸਰਗਰਮ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ ਡਿਮ ਕਰੋ(_D)" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "ਖਾਲੀ ਸਕਰੀਨ(_B)" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "ਵਾਈ-ਫਾਈ(_W)" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "ਊਰਜਾ ਬਚਾਉਣ ਲਈ ਵਾਈ-ਫਾਈ ਬੰਦ ਕਰੋ।" -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ(_M)" -#: ../panels/power/cc-power-panel.c:1821 -#| msgid "Mobile broadband (3G, 4G, WiMax, etc.) devices require extra power" +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "ਊਰਜਾ ਬਚਾਉਣ ਲਈ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (3G, 4G, LTE ਆਦਿ) ਨੂੰ ਬੰਦ ਕਰੋ।" -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "ਬਲਿਊਟੁੱਥ(_B)" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "ਜਦੋਂ ਬੈਟਰੀ ਪਾਵਰ ਉੱਤੇ ਹੋਵੇ" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "ਜਦੋਂ ਪਲੱਗ ਲੱਗਾ ਹੋਵੇ" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "ਸਸਪੈਂਡ" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "ਹਾਈਬਰਨੇਟ" -#: ../panels/power/cc-power-panel.c:2025 -#| msgid "Do nothing" +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "ਕੁਝ ਨਹੀਂ" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 -#| msgid "Suspend & Power Off" +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "ਸਸਪੈਂਡ ਅਤੇ ਬੰਦ ਬਟਨ" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "ਆਟੋਮੈਟਿਕ ਸਸਪੈਂਡ(_A)" -#: ../panels/power/cc-power-panel.c:2116 -#| msgid "_Automatic suspend" +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "ਆਟੋਮੈਟਿਕ ਸਸਪੈਂਡ ਕਰੋ" -#: ../panels/power/cc-power-panel.c:2180 -#| msgid "When the p_ower button is pressed:" +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "ਜਦੋਂ ਪਾਵਰ ਬਟਨ ਦੱਬਿਆ ਜਾਵੇ ਤਾਂ(_W):" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "ਜੰਤਰ" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "ਪਾਵਰ" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "ਆਪਣੀ ਬੈਟਰੀ ਦੀ ਸਥਿਤੀ ਵੇਖੋ ਅਤੇ ਪਾਵਰ ਬੱਚਤ ਸੈਟਿੰਗ ਬਦਲੋ" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4050,11 +4127,6 @@ msgid "Delay" msgstr "ਦੇਰੀ" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "ਰੱਦ ਕਰੋ" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "ਪਰਮਾਣਿਤ" @@ -4064,138 +4136,138 @@ msgstr "ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:589 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "ਟੋਨਰ ਘੱਟ ਹੈ" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:591 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "ਟੋਨਰ ਖਤਮ ਹੋ ਗਿਆ" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:594 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "ਡਿਵੈਲਪਰ ਲਈ ਘੱਟ" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:597 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "ਡਿਵੈਲਪਰ ਲਈ ਖਤਮ" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:599 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "ਮਾਰਕਰ ਸਪਲਾਈ ਲਈ ਘੱਟ" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:601 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "ਮਾਰਕਰ ਸਪਲਾਈ ਲਈ ਖਤਮ" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:603 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "ਕਵਰ ਖੋਲ੍ਹੋ" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:605 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "ਦਰਵਾਜ਼ਾ ਖੋਲ੍ਹੋ" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:607 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "ਪੇਪਰ ਖਤਮ ਹੋਣ ਵਾਲੇ ਹਨ" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:609 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "ਪੇਪਰ ਖਤਮ ਹੋ ਗਏ ਹਨ" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:611 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "ਆਫਲਾਈਨ" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:613 -#: ../panels/printers/cc-printers-panel.c:804 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "ਰੁਕਿਆ ਹੈ" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:615 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "ਵੇਸਟ ਰੇਸਪਟਕੇਟ ਲਗਭਗ ਭਰ ਗਿਆ ਹੈ" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:617 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "ਵੇਸਟ ਰੇਸਪਟਕੇਟ ਭਰ ਗਿਆ ਹੈ" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:619 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "ਓਪਟੀਕਲ ਫੋਟੋ ਕੰਡਕਟਰ ਦੀ ਉਮਰ ਖਤਮ ਹੋ ਗਈ ਹੈ" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:621 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "ਓਪਟੀਕਲ ਫੋਟੋ ਕੰਡਕਟਰ ਹੁਣ ਕੰਮ ਨਹੀਂ ਕਰਦਾ ਹੈ" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:731 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "ਸੰਰਚਨਾ ਜਾਰੀ" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:790 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "ਤਿਆਰ" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:795 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "ਜਾਬ ਮਨਜ਼ੂਰ ਨਾ ਕਰੋ" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:800 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "ਪਰੋਸੈਸ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:920 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "ਟੋਨਰ ਲੈਵਲ" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:923 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "ਸਿਆਹੀ ਲੈਵਲ" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:926 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "ਸਪਲਾਈ ਲੈਵਲ" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:944 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1441 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4203,65 +4275,62 @@ msgstr[1] "%u ਸਰਗਰਮ" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1782 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "ਨਵਾਂ ਪਰਿੰਟਰ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ।" -#: ../panels/printers/cc-printers-panel.c:1949 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "PPD ਫਾਇਲ ਚੁਣੋ" -#: ../panels/printers/cc-printers-panel.c:1958 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "ਪੋਸਟ-ਸਕ੍ਰਿਪਟ ਪਰਿੰਟਰ ਵੇਰਵਾ ਫਾਇਲਾਂ (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2265 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "ਕੋਈ ਢੁੱਕਵਾਂ ਡਰਾਇਵਰ ਨਹੀਂ ਲੱਭਿਆ" -#: ../panels/printers/cc-printers-panel.c:2336 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "…ਢੁੱਕਵੇਂ ਡਰਾਇਵਰ ਲੱਭੇ ਜਾ ਰਹੇ ਹਨ" -#: ../panels/printers/cc-printers-panel.c:2357 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "…ਡਾਟਾਬੇਸ ਵਿੱਚੋਂ ਚੁਣੋ" -#: ../panels/printers/cc-printers-panel.c:2366 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "…PPD ਫਾਇਲ ਦਿਉ" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2517 -#: ../panels/printers/cc-printers-panel.c:2540 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "ਟੈਸਟ ਸਫ਼ਾ" -#: ../panels/printers/cc-printers-panel.c:2653 -#| msgid "Printers" -msgid "No printers" -msgstr "ਕੋਈ ਪਰਿੰਟਰ ਨਹੀਂ" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:2960 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "ui ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#| msgid "Printers" +msgid "Prin­ters" msgstr "ਪਰਿੰਟਰ" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "ਪਰਿੰਟਰ ਜੋੜੋ, ਪਰਿੰਟਰ ਜਾਬ ਵੇਖੋ ਅਤੇ ਤਹਿ ਕਰੋ ਤੁਸੀਂ ਕਿਵੇਂ ਪਰਿੰਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੈ" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Queue;Print;Paper;Ink;Toner;" @@ -4272,7 +4341,6 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -#| msgid "%s Active Jobs" msgid "No Active Printer Jobs" msgstr "ਕੋਈ ਸਰਗਰਮ ਪਰਿੰਟਰ ਜਾਬ ਨਹੀਂ ਹੈ" @@ -4368,8 +4436,6 @@ #. Translators: Job's state (job is held for printing) #: ../panels/printers/pp-jobs-dialog.c:107 -#| msgctxt "printer state" -#| msgid "Paused" msgctxt "print job" msgid "Paused" msgstr "ਵਿਰਾਮ ਹੈ" @@ -4407,7 +4473,6 @@ #. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -#| msgid "%s Active Jobs" msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" msgstr "%s - ਸਰਗਰਮ ਜਾਬਾਂ" @@ -4427,6 +4492,11 @@ msgid "Parallel Port" msgstr "ਪੈਰਲੈੱਲ ਪੋਰਟ" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "ਬਲਿਊਟੁੱਥ" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4637,14 +4707,17 @@ msgid "_Options" msgstr "ਚੋਣਾਂ(_O)" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "ਕੋਈ ਪਰਿੰਟਰ ਨਹੀਂ" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 -#| msgid "Add Printer" +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "ਪਰਿੰਟਰ ਜੋੜੋ" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4652,75 +4725,97 @@ "ਅਫਸੋਸ! ਸਿਸਟਮ ਪਰਿੰਟਿਗ ਸੇਵ\n" "ਉਪਲੱਬਧ ਨਹੀਂ ਜਾਪਦੀ ਹੈ।" -#: ../panels/privacy/cc-privacy-panel.c:352 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:371 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "ਸਕਰੀਨ ਲਾਕ" -#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:422 +msgid "In use" +msgstr "ਵਰਤੋਂ 'ਚ" + +#: ../panels/privacy/cc-privacy-panel.c:427 +#| msgid "On" +msgctxt "Location services status" +msgid "On" +msgstr "ਚਾਲੂ" + +#: ../panels/privacy/cc-privacy-panel.c:428 +#| msgid "Off" +msgctxt "Location services status" +msgid "Off" +msgstr "ਬੰਦ" + +#: ../panels/privacy/cc-privacy-panel.c:807 ../panels/privacy/privacy.ui.h:42 +#| msgid "_Location Services" +msgid "Location Services" +msgstr "ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ" + +#: ../panels/privacy/cc-privacy-panel.c:926 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "ਵਰਤੋਂ ਤੇ ਅਤੀਤ" -#: ../panels/privacy/cc-privacy-panel.c:587 +#: ../panels/privacy/cc-privacy-panel.c:1051 msgid "Empty all items from Trash?" msgstr "ਰੱਦੀ 'ਚੋਂ ਸਭ ਆਈਟਮਾਂ ਹਟਾਉਣੀਆਂ ਹਨ?" -#: ../panels/privacy/cc-privacy-panel.c:588 +#: ../panels/privacy/cc-privacy-panel.c:1052 msgid "All items in the Trash will be permanently deleted." msgstr "ਰੱਦੀ ਵਿੱਚ ਮੌਜੂਦਾ ਆਈਟਮਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।" -#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1053 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(_E)" -#: ../panels/privacy/cc-privacy-panel.c:612 +#: ../panels/privacy/cc-privacy-panel.c:1076 msgid "Delete all the temporary files?" msgstr "ਸਭ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਹਟਾਉਣੀਆਂ ਹਨ?" -#: ../panels/privacy/cc-privacy-panel.c:613 +#: ../panels/privacy/cc-privacy-panel.c:1077 msgid "All the temporary files will be permanently deleted." msgstr "ਸਭ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਇਆ ਜਾਵੇਗਾ।" -#: ../panels/privacy/cc-privacy-panel.c:614 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1078 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਨਸ਼ਟ ਕਰੋ(_P)" -#: ../panels/privacy/cc-privacy-panel.c:636 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1100 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "ਰੱਦੀ ਅਤੇ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨਸ਼ਟ ਕਰੋ" -#: ../panels/privacy/cc-privacy-panel.c:676 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1140 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "ਸਾਫਟਵੇਅਰ ਵਰਤੋਂ" -#: ../panels/privacy/cc-privacy-panel.c:717 ../panels/privacy/privacy.ui.h:44 +#: ../panels/privacy/cc-privacy-panel.c:1181 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "ਸਮੱਸਿਆ ਰਿਪੋਰਟ ਦੇਣੀ" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:731 +#: ../panels/privacy/cc-privacy-panel.c:1195 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data." msgstr "" -"ਤਕਨੀਕੀ ਸਮੱਸਿਆਵਾਂ ਬਾਰੇ ਰਿਪੋਰਟਾਂ ਭੇਜਣ ਨਾਲ ਸਾਨੂੰ %s ਸੁਧਾਰਨ ਲਈ ਮਦਦ ਮਿਲਦੀ ਹੈ। " -"ਰਿਪੋਰਟ ਅਣਪਛਾਤੇ " +"ਤਕਨੀਕੀ ਸਮੱਸਿਆਵਾਂ ਬਾਰੇ ਰਿਪੋਰਟਾਂ ਭੇਜਣ ਨਾਲ ਸਾਨੂੰ %s ਸੁਧਾਰਨ ਲਈ ਮਦਦ ਮਿਲਦੀ ਹੈ।" +" ਰਿਪੋਰਟ ਅਣਪਛਾਤੇ " "ਰੂਪ ਵਿੱਚ ਭੇਜੀਆਂ ਜਾਂਦੀਆਂ ਹਨ ਅਤੇ ਨਿੱਜੀ ਡਾਟੇ ਨੂੰ ਹਟਾਇਆ ਜਾਂਦਾ ਹੈ।" -#: ../panels/privacy/cc-privacy-panel.c:743 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1207 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "ਪਰਾਈਵੇਸੀ ਪਾਲਸੀ" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "ਪਰਾਈਵੇਸੀ" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "ਪਰਦੇਦਾਰੀ" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸੁਰੱਖਿਅਤ ਕਰੋ ਅਤੇ ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਹੋਰ ਕੀ ਵੇਖ ਸਕਦੇ ਹਨ" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4782,8 +4877,8 @@ "Remembering your history makes things easier to find again. These items are " "never shared over the network." msgstr "" -"ਤੁਹਾਡੇ ਅਤੀਤ ਨੂੰ ਯਾਦ ਰੱਖਣ ਨਾਲ ਚੀਜ਼ਾਂ ਨੂੰ ਮੁੜ-ਲੱਭਣਾ ਸੌਖਾ ਹੋ ਜਾਂਦਾ ਹੈ। ਇਹ ਚੀਜ਼ਾਂ " -"ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਕਦੇ " +"ਤੁਹਾਡੇ ਅਤੀਤ ਨੂੰ ਯਾਦ ਰੱਖਣ ਨਾਲ ਚੀਜ਼ਾਂ ਨੂੰ ਮੁੜ-ਲੱਭਣਾ ਸੌਖਾ ਹੋ ਜਾਂਦਾ ਹੈ। ਇਹ ਚੀਜ਼ਾਂ" +" ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਕਦੇ " "ਵੀ ਸਾਂਝਾ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।" #: ../panels/privacy/privacy.ui.h:21 @@ -4819,8 +4914,8 @@ "Automatically purge the Trash and temporary files to help keep your computer " "free of unnecessary sensitive information." msgstr "" -"ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਕਿਸੇ ਵੀ ਗ਼ੈਰ-ਜ਼ਰੂਰੀ ਸੰਵੇਦਨਸ਼ੀਲ ਜਾਣਕਾਰੀ ਤੋਂ ਮੁਕਤ ਰੱਖਣ ਲਈ ਮੱਦਦ " -"ਵਾਸਤੇ ਰੱਦੀ ਅਤੇ " +"ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਕਿਸੇ ਵੀ ਗ਼ੈਰ-ਜ਼ਰੂਰੀ ਸੰਵੇਦਨਸ਼ੀਲ ਜਾਣਕਾਰੀ ਤੋਂ ਮੁਕਤ ਰੱਖਣ ਲਈ ਮੱਦਦ" +" ਵਾਸਤੇ ਰੱਦੀ ਅਤੇ " "ਆਰਜ਼ੀਫਾਇਲਾਂ ਨੂੰ ਆਪਣੇ-ਆਪ ਨਸ਼ਟ ਕਰੋ" #: ../panels/privacy/privacy.ui.h:31 @@ -4844,28 +4939,30 @@ "All the information we collect is made anonymous, and we will never share " "your data with third parties." msgstr "" -"ਸਾਨੂੰ ਤੁਹਾਡੇ ਵਲੋਂ ਵਰਤੇ ਜਾਂਦੇ ਸਾਫਟਵੇਅਰ ਬਾਰੇ ਜਾਣਾਕਰੀ ਭੇਜਣ ਨਾਲ ਸਾਨੂੰ ਤੁਹਾਡੀ ਹੋਰ " -"ਵੀ ਠੀਕ ਢੰਗ ਨਾਲ " -"ਸਿਫਾਰਸ਼ ਕਰਨ ਲਈ ਮੱਦਦ ਹੋਵੇਗੀ। ਇਸ ਨਾਲ ਸਾਡੇ ਸਾਫਟਵੇਅਰ ਵਿੱਚ ਸੁਧਾਰ ਲਈ ਵੀ ਸਾਡੀ ਮੱਦਦ " -"ਹੋਵੇਗੀ।\n" +"ਸਾਨੂੰ ਤੁਹਾਡੇ ਵਲੋਂ ਵਰਤੇ ਜਾਂਦੇ ਸਾਫਟਵੇਅਰ ਬਾਰੇ ਜਾਣਾਕਰੀ ਭੇਜਣ ਨਾਲ ਸਾਨੂੰ ਤੁਹਾਡੀ ਹੋਰ" +" ਵੀ ਠੀਕ ਢੰਗ ਨਾਲ " +"ਸਿਫਾਰਸ਼ ਕਰਨ ਲਈ ਮੱਦਦ ਹੋਵੇਗੀ। ਇਸ ਨਾਲ ਸਾਡੇ ਸਾਫਟਵੇਅਰ ਵਿੱਚ ਸੁਧਾਰ ਲਈ ਵੀ ਸਾਡੀ ਮੱਦਦ" +" ਹੋਵੇਗੀ।\n" "\n" -"ਸਾਡੇ ਵਲੋਂ ਇੱਕਠੀ ਕੀਤੀ ਜਾਂਦੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਅਗਿਆਤ ਵਜੋਂ ਹੈ, ਅਤੇ ਅਸੀਂ ਤੁਹਾਡੇ ਡਾਟੇ " -"ਨੂੰ ਕਿਸੇ ਵੀ ਹੋਰ " +"ਸਾਡੇ ਵਲੋਂ ਇੱਕਠੀ ਕੀਤੀ ਜਾਂਦੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਅਗਿਆਤ ਵਜੋਂ ਹੈ, ਅਤੇ ਅਸੀਂ ਤੁਹਾਡੇ ਡਾਟੇ" +" ਨੂੰ ਕਿਸੇ ਵੀ ਹੋਰ " "ਸੁਤੰਤਰ ਧਿਰ ਨਾਲ ਸਾਂਝਾ ਨਹੀਂ ਕਰੇਗੇ।" #: ../panels/privacy/privacy.ui.h:40 msgid "_Send software usage statistics" msgstr "ਸਾਫਟਵੇਅਰ ਵਰਤੋਂ ਅੰਕੜੇ ਭੇਜੋ(_S)" -#: ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/privacy.ui.h:43 +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" + +#: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" msgstr "ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ(_L)" -#: ../panels/privacy/privacy.ui.h:43 -msgid "Used to determine your geographical location" -msgstr "ਤੁਹਾਡਾ ਭੂਗੋਲਿਕ ਟਿਕਾਣਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ" - -#: ../panels/privacy/privacy.ui.h:45 +#: ../panels/privacy/privacy.ui.h:47 msgid "_Automatic Problem Reporting" msgstr "ਸਮੱਸਿਆ ਬਾਰੇ ਆਟੋਮੈਟਿਕ ਰਿਪੋਰਟ ਕਰੋ(_A)" @@ -4892,22 +4989,21 @@ msgid "Other" msgstr "ਹੋਰ" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1072 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "ਬਦਲਾਅ ਪ੍ਰਭਾਵ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1076 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "ਹੁਣੇ ਮੁੜ-ਚਾਲੂ" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "ਕੋਈ ਇੰਪੁੱਟ ਸਰੋਤ ਨਹੀਂ ਚੁਣਿਆ" -#: ../panels/region/cc-region-panel.c:1807 -#| msgid "Login Screen" +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "ਲਾਗਇਨ ਸਕਰੀਨ(_S)" @@ -4939,17 +5035,19 @@ msgid "Paper" msgstr "ਪੇਪਰ" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "ਖੇਤਰ ਅਤੇ ਭਾਸ਼ਾ" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#| msgid "Region & Language" +msgid "Re­gion & Lan­guage" +msgstr "ਖੇਤਰ ਤੇ ਭਾਸ਼ਾ" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "ਆਪਣੇ ਵੇਖਾਉਣ ਵਾਲੀ ਭਾਸ਼ਾ, ਫਾਰਮੈਟ, ਕੀਬੋਰਡ ਲੇਆਉਟ ਅਤੇ ਇੰਪੁੱਟ ਸਰੋਤ ਚੁਣੋ" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "ਭਾਸ਼ਾ;ਲੇਆਉਟ;ਕੀਬੋਰਡ;ਇੰਪੁੱਟ;Language;Layout;Keyboard;Input;" @@ -5006,7 +5104,7 @@ msgstr "ਖੱਬਾ+ਸੱਜਾ Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "ਭਾਸ਼ਾ(_L)" @@ -5015,7 +5113,6 @@ msgstr "ਅੰਗਰੇਜ਼ੀ (ਬਰਤਾਨੀਆ)" #: ../panels/region/region.ui.h:3 -#| msgid "Formats" msgid "_Formats" msgstr "ਫਾਰਮੈਟ(_F)" @@ -5054,29 +5151,14 @@ #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" msgstr "" -"ਲਾਗਇਨ ਸੈਟਿੰਗ ਨੂੰ ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਵਲੋਂ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਸਿਸਟਮ ਵਿੱਚ ਲਾਗਇਨ " -"ਕਰਦੇ ਹਨ" - -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "ਥਾਵਾਂ" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "ਬੁੱਕਮਾਰਕ" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "ਹੋਰ" +"ਲਾਗਇਨ ਸੈਟਿੰਗ ਨੂੰ ਸਭ ਵਰਤੋਂਕਾਰਾਂ ਵਲੋਂ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ, ਜਦੋਂ ਸਿਸਟਮ ਵਿੱਚ ਲਾਗਇਨ" +" ਕਰਦੇ ਹਨ" -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "ਟਿਕਾਣਾ ਚੁਣੋ" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "ਠੀਕ ਹੈ(_O)" @@ -5084,17 +5166,18 @@ msgid "No applications found" msgstr "ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਲੱਭੀ" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "ਖੋਜ" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿਹੜੀਆਂ ਐਪਲੀਕੇਸ਼ਨ ਸਰਗਰਮੀ ਝਲਕ ਵਿੱਚ ਖੋਜ ਨਤੀਜਿਆਂ ਵਿੱਚ ਦਿਸਣ" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "ਖੋਜ;ਲੱਭੋ;ਲੱਭਣਾ;ਇੰਡੈਕਸ;ਤਤਕਰਾ;ਪਰਾਈਵੇਸੀ;ਨਤੀਜੇ;Search;Find;Index;Hide;Privacy;Resu" @@ -5104,6 +5187,24 @@ msgid "Search Locations" msgstr "ਟਿਕਾਣਾ ਖੋਜ" +#: ../panels/search/search-locations-dialog.ui.h:2 +#| msgctxt "Search Location" +#| msgid "Places" +msgid "Places" +msgstr "ਥਾਵਾਂ" + +#: ../panels/search/search-locations-dialog.ui.h:3 +#| msgctxt "Search Location" +#| msgid "Bookmarks" +msgid "Bookmarks" +msgstr "ਬੁੱਕਮਾਰਕ" + +#: ../panels/search/search-locations-dialog.ui.h:4 +#| msgctxt "Online Account" +#| msgid "Other" +msgid "Other" +msgstr "ਹੋਰ" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "ਉੱਤੇ ਭੇਜੋ" @@ -5116,6 +5217,11 @@ msgid "Preferences" msgstr "ਮੇਰੀ ਪਸੰਦ" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "ਸਾਂਝਾ ਕਰਨ ਲਈ ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ ਚੁਣਿਆ" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5141,30 +5247,74 @@ msgid "Choose a Folder" msgstr "ਫੋਲਡਰ ਚੁਣੋ" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਪਬਲਿਕ ਫੋਲਡਰ ਨੂੰ ਹੋਰਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੌਜੂਦਾ" +" ਨੈੱਟਵਰਕ ਉੱਤੇ dav://%s ਦੀ ਵਰਤੋਂ ਨਾਲ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +#| msgid "" +#| "Allow remote users to connect using the Secure Shell command:\n" +#| "ssh %s" +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"ਜਦੋਂ ਰਿਮੋਟ ਲਾਗਇਨ ਸਮਰੱਥ ਹੁੰਦਾ ਹੈ ਤਾਂ ਰਿਮੋਟ ਵਰਤੋਂਕਾਰ ਨੂੰ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕਮਾਂਡ" +" ਰਾਹੀਂ ਕੁਨੈਕਟ ਹੋ ਸਕਦਾ ਹੈ:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +#| msgid "" +#| "Allow remote users to view or control your screen by connecting to: vnc://%s" +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"ਸਕਰੀਨ ਸਾਂਝਾ ਕਰਨ ਨਾਲ ਰਿਮੋਟ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਆਪਣੀ ਸਕਰੀਨ ਵੇਖਣ ਜਾਂ ਕੰਟਰੋਲ ਦਿੱਤਾ" +" ਜਾਂਦਾ ਹੈ, ਇਸ ਨਾਲ ਕੁਨੈਕਟ ਕਰਕੇ: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "ਕਾਪੀ ਕਰੋ" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "ਸਾਂਝਾ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +#| msgid "Sharing" +msgid "Sha­ring" +msgstr "ਸਾਂਝ" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਤੁਸੀਂ ਹੋਰਾਂ ਨਾਲ ਕੀ ਸਾਂਝਾ ਕਰਦੇ ਹੋ" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 -#| msgid "" -#| "share;sharing;ssh;host;name;remote;desktop;bluetooth;obex;media;audio;" -#| "video;pictures;photos;movies;server;renderer;" +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "" "ਸਾਂਝਾ;ਸਾਂਝਾ ਕਰੋ;ਨਾਂ;ਨਾਮ;ਡੈਸਕਟਾਪ;ਮੀਡੀਆ;ਆਡੀਓ;ਵੀਡੀਓ;ਹੋਸਟ;ssh;ਰਿਮੋਟ;ਤਸਵੀਰ;ਫੋਟੋ;ਮੂਵ" -"ੀ;ਸਰਵਰ;ਰੈਂਡਰ;" +"ੀ;ਸਰਵਰ;" +"ਰੈਂਡਰ;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "ਨੈੱਟਵਰਕ" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5174,40 +5324,24 @@ msgid "Authentication is required to enable or disable remote login" msgstr "ਰਿਮੋਟ ਲਾਗਇਨ ਨੂੰ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਲਈ ਪਰਮਾਣਕਿਤਾ ਚਾਹੀਦੀ ਹੈ" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "ਸਾਂਝਾ ਕਰਨ ਲਈ ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ ਚੁਣਿਆ" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "ਨੈੱਟਵਰਕ" - #: ../panels/sharing/sharing.ui.h:1 -#| msgid "Computer Name" msgid "_Computer Name" msgstr "ਕੰਪਿਊਟਰ ਨਾਂ(_C)" #: ../panels/sharing/sharing.ui.h:2 -#| msgid "Personal File Sharing" -msgid "_Personal File Sharing" -msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝਾ ਕਰਨਾ(_P)" +#| msgid "_Personal File Sharing" +msgid "_File Sharing" +msgstr "ਫਾਇਲ ਸਾਂਝਾ ਕਰਨਾ(_F)" #: ../panels/sharing/sharing.ui.h:3 -#| msgid "Screen Sharing" msgid "_Screen Sharing" msgstr "ਸਕਰੀਨ ਸਾਂਝਾ ਕਰਨਾ(_S)" #: ../panels/sharing/sharing.ui.h:4 -#| msgid "Media Sharing" msgid "_Media Sharing" msgstr "ਮੀਡਿਆ ਸਾਂਝਾ ਕਰਨਾ(_M)" #: ../panels/sharing/sharing.ui.h:5 -#| msgid "Remote Login" msgid "_Remote Login" msgstr "ਰਿਮੋਟ ਲਾਗਇਨ(_R)" @@ -5216,93 +5350,58 @@ msgstr "ਕੁਝ ਸਰਵਿਸਾਂ ਬੰਦ ਹਨ, ਕਿਉਂਕਿ ਕੋਈ ਨੈੱਟਵਰਕ ਪਹੁੰਚ ਨਹੀਂ ਹੈ।" #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ" +#| msgid "Sharing" +msgid "File Sharing" +msgstr "ਫਾਇਲ ਸਾਂਝ" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਪਬਲਿਕ ਫੋਲਡਰ ਨੂੰ ਹੋਰਾਂ ਨਾਲ ਤੁਹਾਡੇ ਮੌਜੂਦਾ " -"ਨੈੱਟਵਰਕ ਉੱਤੇ dav://%s ਦੀ ਵਰਤੋਂ ਨਾਲ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ" - -#: ../panels/sharing/sharing.ui.h:10 -#| msgid "Require Password" +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ(_R)" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "ਰਿਮੋਟ ਲਾਗਇਨ" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"ਰਿਮੋਟ ਵਰਤੋਂਕਾਰ ਨੂੰ ਸੁਰੱਖਿਅਤ ਸ਼ੈੱਲ ਕਮਾਂਡ ਰਾਹੀਂ ਕੁਨੈਕਟ ਹੋਣ ਦਿਉ:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "ਸਕਰੀਨ ਸਾਂਝ" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"ਰਿਮੋਟ ਵਰਤੋਂਕਾਰ ਨੂੰ ਆਪਣੀ ਸਕਰੀਨ ਵੇਖਣ ਜਾਂ ਕੰਟਰੋਲ ਕਰਨ ਦਿਉ, ਇਸ ਨਾਲ ਕੁਨੈਕਟ ਕਰਕੇ: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -#| msgid "Allow Remote Control" -msgid "_Allow Remote Control" -msgstr "ਰਿਮੋਟ ਕੰਟਰੋਲ ਮਨਜ਼ੂਰ(_A)" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "ਸਕਰੀਨ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਵਾਸਤੇ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ(_A)" -#: ../panels/sharing/sharing.ui.h:20 -#| msgid "_Password" +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "ਪਾਸਵਰਡ(_P):" -#: ../panels/sharing/sharing.ui.h:21 -#| msgid "Show Password" +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "ਪਾਸਵਰਡ ਦਿਖਾਓ(_S)" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "ਵਰਤੋਂ ਚੋਣਾ" -#: ../panels/sharing/sharing.ui.h:23 -#| msgid "New connections must ask for access" +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "ਵਰਤਣ ਲਈ ਨਵੇਂ ਕੁਨੈਕਸ਼ਨ ਲਈ ਜ਼ਰੂਰ ਪੁੱਛੋ(_N)" -#: ../panels/sharing/sharing.ui.h:24 -#| msgid "Require a password" +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ(_R)" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "ਮੀਡਿਆ ਸਾਂਝ" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"ਮੀਡਿਆ ਸ਼ੇਅਰਿੰਗ ਤੁਹਾਨੂੰ ਮੌਜੂਦਾ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੋਰਾਂ ਨਾਲ ਸੰਗੀਤ, ਫੋਟੋ ਤੇ ਵਿਡੀਓ ਨੂੰ " -"ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਹਾਇਕ " -"ਹੈ।" +#: ../panels/sharing/sharing.ui.h:19 +#| msgid "" +#| "Media sharing allows you to share music, photos and videos over the " +#| "network." +msgid "Share music, photos and videos over the network." +msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੋਰਾਂ ਨਾਲ ਸੰਗੀਤ, ਫੋਟੋ ਤੇ ਵਿਡੀਓ ਨੂੰ ਸਾਂਝਾ ਕਰੋ।" -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "ਫੋਲਡਰ" @@ -5430,11 +5529,6 @@ msgid "Peak detect" msgstr "ਪੀਕ ਖੋਜ" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "ਨਾਂ" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "ਜੰਤਰ" @@ -5529,16 +5623,22 @@ msgid "Subwoofer" msgstr "ਸਬਵੂਫ਼ਰ" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "ਕਸਟਮ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +#| msgid "Universal Access" +msgid "Uni­ver­sal Access" +msgstr "ਯੂਨੀਵਰਸਲ ਅਸੈੱਸ" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "ਵੇਖਣਾ, ਸੁਣਨਾ, ਲਿਖਣਾ, ਪੁਆਇੰਟ ਤੇ ਕਲਿੱਕ ਕਰਨਾ ਸੌਖਾ ਬਣਾਉ" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5589,12 +5689,10 @@ msgstr "ਸਕਰੀਨ ਕੀਬੋਰਡ(_K)" #: ../panels/universal-access/uap.ui.h:13 -#| msgid "Repeat Keys" msgid "R_epeat Keys" msgstr "ਦੁਹਰਾਉ ਸਵਿੱਚਾਂ(_e)" #: ../panels/universal-access/uap.ui.h:14 -#| msgid "Cursor Blinking" msgid "Cursor _Blinking" msgstr "ਝਪਕਦੀ ਕਰਸਰ(_B)" @@ -5615,12 +5713,10 @@ msgstr "ਕਲਿੱਕ ਸਹਾਇਕ(_C)" #: ../panels/universal-access/uap.ui.h:19 -#| msgid "_Double-click" msgid "_Double-Click Delay" msgstr "ਡਬਲ ਕਲਿੱਕ ਦੇਰੀ(_D)" #: ../panels/universal-access/uap.ui.h:20 -#| msgid "Double-Click Timeout" msgid "Double-Click Delay" msgstr "ਡਬਲ ਕਲਿੱਕ ਦੇਰੀ" @@ -5641,8 +5737,9 @@ msgstr "ਸਾਊਂਡ ਸਵਿੱਚਾਂ" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "ਜਦੋਂ ਨਮ-ਲਾਕ ਜਾਂ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੀਪ" +#| msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "ਜਦੋਂ ਵੀ ਜਦੋਂ ਨਮ-ਲਾਕ ਜਾਂ ਕੈਪਸ ਲਾਕ ਚਾਲੂ ਜਾਂ ਬੰਦ ਹੋਵੇ ਤਾਂ ਬੀਪ ਕਰੋ।" #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5669,12 +5766,10 @@ msgstr "ਦੁਹਰਾਉ ਸਵਿੱਚਾਂ" #: ../panels/universal-access/uap.ui.h:32 -#| msgid "Key presses _repeat when key is held down" msgid "Key presses repeat when key is held down." msgstr "ਸਵਿੱਚ ਨੂ ਦਹਰਾਉ, ਜਦੋ ਕਿ ਸਵਿੱਚ ਨੂੰ ਦਬਾਈ ਰੱਖਿਆ ਜਾਵੇ" #: ../panels/universal-access/uap.ui.h:34 -#| msgid "Repeat keys speed" msgid "Repeat keys delay" msgstr "ਦੁਹਰਾਉਣ ਸਵਿੱਚ ਦੇਰੀ" @@ -5691,12 +5786,10 @@ msgstr "ਝਪਕਦੀ ਕਰਸਰ" #: ../panels/universal-access/uap.ui.h:38 -#| msgid "Cursor _blinks in text fields" msgid "Cursor blinks in text fields." msgstr "ਟੈਕਸਟ ਖੇਤਰਾਂ ਵਿੱਚ ਕਰਸਰ ਝਪਕਾਓ" #: ../panels/universal-access/uap.ui.h:39 -#| msgid "Cursor blink speed" msgid "Cursor blinking speed" msgstr "ਕਰਸਰ ਝਪਕਣ ਦੀ ਗਤੀ" @@ -5900,37 +5993,30 @@ msgstr "ਜ਼ੂਮ ਚੋਣਾਂ" #: ../panels/universal-access/zoom-options.ui.h:8 -#| msgid "Magnification:" msgid "_Magnification:" msgstr "ਵੱਡਦਰਸ਼ਨ(_M):" #: ../panels/universal-access/zoom-options.ui.h:9 -#| msgid "Follow mouse cursor" msgid "_Follow mouse cursor" msgstr "ਮਾਊਸ ਕਰਸਰ ਮੁਤਾਬਕ(_F)" #: ../panels/universal-access/zoom-options.ui.h:10 -#| msgid "Screen part:" msgid "_Screen part:" msgstr "ਸਕਰੀਨ ਭਾਗ(_S):" #: ../panels/universal-access/zoom-options.ui.h:11 -#| msgid "Magnifier extends outside of screen" msgid "Magnifier _extends outside of screen" msgstr "ਸਕਰੀਨ ਦੇ ਬਾਹਰਵਾਰ ਵਾਧੂ ਵੱਡਦਰਸ਼ੀ(_e)" #: ../panels/universal-access/zoom-options.ui.h:12 -#| msgid "Keep magnifier cursor centered" msgid "_Keep magnifier cursor centered" msgstr "ਵੱਡਦਰਸ਼ੀ ਕਰਸਰ ਸੈਂਟਰ 'ਚ ਰੱਖੋ(_K)" #: ../panels/universal-access/zoom-options.ui.h:13 -#| msgid "Magnifier cursor pushes contents around" msgid "Magnifier cursor _pushes contents around" msgstr "ਵੱਡਦਰਸ਼ੀ ਕਰਸਰ ਨਾਲ ਸਮੱਗਰੀ ਆਸੇ-ਪਾਸੇ ਕਰੋ(_p)" #: ../panels/universal-access/zoom-options.ui.h:14 -#| msgid "Magnifier cursor moves with contents" msgid "Magnifier cursor moves with _contents" msgstr "ਸਮੱਗਰੀ ਉੱਤੇ ਕਰਸਰ ਹਿਲਾਉਣ ਨਾਲ ਵੱਡਦਰਸ਼ਨ(_c)" @@ -5943,7 +6029,6 @@ msgstr "ਵੱਡਦਰਸ਼ੀ" #: ../panels/universal-access/zoom-options.ui.h:17 -#| msgid "Thickness:" msgid "_Thickness:" msgstr "ਮੋਟਾਈ(_T):" @@ -5958,23 +6043,19 @@ msgstr "ਮੋਟਾ" #: ../panels/universal-access/zoom-options.ui.h:20 -#| msgid "Length:" msgid "_Length:" msgstr "ਲੰਬਾਈ(_L):" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -#| msgid "Color:" msgid "Co_lor:" msgstr "ਰੰਗ(_l):" #: ../panels/universal-access/zoom-options.ui.h:23 -#| msgid "Crosshairs:" msgid "_Crosshairs:" msgstr "ਕਰਾਸ-ਹੇਅਰ(_C):" #: ../panels/universal-access/zoom-options.ui.h:24 -#| msgid "Overlaps mouse cursor" msgid "_Overlaps mouse cursor" msgstr "ਮਾਊਸ ਕਰਸਰ ਓਵਰਲੈਪ(_O)" @@ -5983,17 +6064,14 @@ msgstr "ਕਰਾਸ-ਹੇਅਰ" #: ../panels/universal-access/zoom-options.ui.h:26 -#| msgid "White on black:" msgid "_White on black:" msgstr "ਕਾਲੇ ਉੱਤੇ ਚਿੱਟਾ(_W):" #: ../panels/universal-access/zoom-options.ui.h:27 -#| msgid "Brightness:" msgid "_Brightness:" msgstr "ਚਮਕ(_B):" #: ../panels/universal-access/zoom-options.ui.h:28 -#| msgid "Contrast:" msgid "_Contrast:" msgstr "ਕਨਟਰਾਸਟ:_(C):" @@ -6042,98 +6120,80 @@ msgstr "ਰੰਗ ਪ੍ਰਭਾਵ" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "ਪੂਰਾ ਨਾਂ(_F)" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#| msgctxt "Account type" +#| msgid "Standard" msgid "Standard" msgstr "ਸਟੈਂਡਰਡ" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#| msgctxt "Account type" +#| msgid "Administrator" msgid "Administrator" -msgstr "ਪਰਸ਼ਾਸ਼ਕੀ" - -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "ਪੂਰਾ ਨਾਂ(_F)" +msgstr "ਪਰਸ਼ਾਸ਼ਕ" -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "ਅਕਾਊਂਟ ਕਿਸਮ(_T)" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 -#| msgid "Allow user to set a password when they next login" +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "ਵਰਤੋਂਕਾਰ ਨੂੰ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦਿਉ, ਜਦੋਂ ਕਿ ਉਹ ਅਗਲੀ ਵਾਰ ਲਾਗਇਨ ਕਰੇ(_l)" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 -#| msgid "Set a password now" +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "ਹੁਣੇ ਪਾਸਵਰਡ ਦਿਓ(_n)" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "ਜਾਂਚ(_V)" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +#| msgid "_Configure…" +msgid "_Confirm" +msgstr "ਤਸਦੀਕ ਕਰੋ(_C)" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +#| msgid "" +#| "Enterprise login allows an existing centrally managed user account to be " +#| "used on this device." msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ ਮੌਜੂਦਾ ਕੇਂਦਰੀਕ੍ਰਿਤ ਵਰਤੋਂਕਾਰ ਅਕਾਊਂਟ ਨੂੰ ਇਹ ਜੰਤਰ ਉੱਤੇ ਵਰਤਣ ਲਈ " -"ਸਹਾਇਕ " -"ਹੈ।" +"ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ ਮੌਜੂਦਾ ਕੇਂਦਰੀਕ੍ਰਿਤ ਵਰਤੋਂਕਾਰ ਅਕਾਊਂਟ ਨੂੰ ਇਹ ਜੰਤਰ ਉੱਤੇ ਵਰਤਣ ਲਈ" +" ਸਹਾਇਕ ਹੈ। " +"ਤੁਸੀਂ ਇਸ ਅਕਾਊਂਟ ਨੂੰ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਕੰਪਨੀ ਦੇ ਸਰੋਤਾਂ ਤੱਕ ਪਹੁੰਚ ਲਈ ਵੀ ਵਰਤ ਸਕਦੇ ਹੋ।" -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "ਡੋਮੇਨ(_D)" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ\n" -"ਅਕਾਊਂਟ ਜੋੜਨ ਲਈ ਆਨਲਾਈਨ ਹੋਵੇ।" - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ(_E)" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "ਚਾਲੂ ਕਰੋ(_E)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "ਡੋਮੇਨ ਪਰਸ਼ਾਸ਼ਕੀ ਲਾਗਇਨ" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ ਵਰਤਣ ਲਈ, ਉਹ ਕੰਪਿਊਟਰ ਨੂੰ ਡੋਮੇਨ ਵਰਤਣ ਦੀ ਲੋੜ ਹੈ।\n" -"ਆਪਣੇ ਨੈੱਟਵਰਕ ਪਰਸ਼ਾਸ਼ਕ ਕਿਸਮ ਲਈ ਉਹਨਾਂ ਦਾ ਡੋਮੇਨ ਪਾਸਵਰਡ ਇੱਥੇ\n" -"ਦਿਉ।" +#| msgctxt "printer state" +#| msgid "Offline" +msgid "You are Offline" +msgstr "ਤੁਸੀਂ ਆਫਲਾਈਨ ਹੋ" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "ਪਰਸ਼ਾਸ਼ਕੀ ਨਾਂ(_N)" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#| msgid "" +#| "Go online to add\n" +#| "enterprise login accounts." +msgid "You must be online in order to add enterprise users." +msgstr "ਇੰਟਰਪਰਾਈਜ਼ਨ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਜੋੜਨ ਲਈ ਤੁਹਾਨੂੰ ਆਨਲਾਈਨ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "ਪਰਸ਼ਾਸ਼ਕੀ ਪਾਸਵਰਡ" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ(_E)" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6168,7 +6228,7 @@ msgstr "ਸੱਜੀ ਚੀਚੀ" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "ਫਿੰਗਰਪਰਿੰਟ ਲਾਗਇਨ ਚਾਲੂ" @@ -6189,8 +6249,8 @@ "Your fingerprint was successfully saved. You should now be able to log in " "using your fingerprint reader." msgstr "" -"ਤੁਹਾਡੇ ਫਿੰਗਰਪਰਿੰਟ ਸਫ਼ਲਤਾ ਨਾਲ ਸੰਭਾਲੇ ਗਏ ਹਨ। ਹੁਣ ਤੁਸੀਂ ਫਿੰਗਰਪਰਿੰਟ ਰੀਡਰ ਦੀ ਵਰਤੋਂ " -"ਕਰਕੇ ਲਾਗਇਨ " +"ਤੁਹਾਡੇ ਫਿੰਗਰਪਰਿੰਟ ਸਫ਼ਲਤਾ ਨਾਲ ਸੰਭਾਲੇ ਗਏ ਹਨ। ਹੁਣ ਤੁਸੀਂ ਫਿੰਗਰਪਰਿੰਟ ਰੀਡਰ ਦੀ ਵਰਤੋਂ" +" ਕਰਕੇ ਲਾਗਇਨ " "ਕਰਨ ਦੇ ਯੋਗ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1 @@ -6206,9 +6266,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "ਲਾਗਇਨ;ਨਾਂ;ਫਿੰਗਰਪਰਿੰਟ;ਅਵਤਾਰ;ਲੋਗੋ;ਚਿਹਰਾ;ਪਾਸਵਰਡ;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "ਲਾਗਇਨ ਅਤੀਤ" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "ਚਾਲੂ ਕਰੋ(_E)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "ਡੋਮੇਨ ਪਰਸ਼ਾਸ਼ਕੀ ਲਾਗਇਨ" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"ਇੰਟਰਪਰਾਈਜ਼ ਲਾਗਇਨ ਵਰਤਣ ਲਈ, ਉਹ ਕੰਪਿਊਟਰ ਨੂੰ ਡੋਮੇਨ ਵਰਤਣ ਦੀ ਲੋੜ ਹੈ।\n" +"ਆਪਣੇ ਨੈੱਟਵਰਕ ਪਰਸ਼ਾਸ਼ਕ ਕਿਸਮ ਲਈ ਉਹਨਾਂ ਦਾ ਡੋਮੇਨ ਪਾਸਵਰਡ ਇੱਥੇ\n" +"ਦਿਉ।" + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "ਪਰਸ਼ਾਸ਼ਕੀ ਨਾਂ(_N)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "ਪਰਸ਼ਾਸ਼ਕੀ ਪਾਸਵਰਡ" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6231,38 +6314,32 @@ msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ(_P)" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "ਵਰਤੋਂਕਾਰ ਨੂੰ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦਿਉ, ਜਦੋਂ ਕਿ ਉਹ ਅਗਲੀ ਵਾਰ ਲਾਗਇਨ ਕਰਨ" +#| msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" +msgstr "ਵਰਤੋਂਕਾਰ ਨੂੰ ਅਗਲੇ ਲਾਗਇਨ ਉੱਤੇ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "ਹੁਣੇ ਪਾਸਵਰਡ ਦਿਓ" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਸ਼ਾਮਲ" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਹਟਾਓ" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "ਵਰਤੋਂਕਾਰ ਨੂੰ ਜੋੜੋ(_A)..." #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "ਲਾਗਇਨ ਚੋਣ" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "ਆਟੋਮੈਟਿਕ ਲਾਗਇਨ(_u)" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "ਫਿੰਗਰਪਰਿੰਟ ਲਾਗਇਨ(_F)" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "ਯੂਜ਼ਰ ਆਈਕਾਨ" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "ਆਖਰੀ ਲਾਗਇਨ" @@ -6350,8 +6427,8 @@ "Try to avoid repeating the same type of character: you need to mix up " "letters, numbers and punctuation." msgstr "" -"ਇੱਕੋ ਕਿਸਮ ਦੇ ਅੱਖਰ ਮੁੜ-ਵਰਤਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ: ਤੁਸੀਂ ਅੱਖਰਾਂ, ਅੰਕਾਂ ਅਤੇ ਵਿਰਾਮ " -"ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਮਿਲ ਸਕਦੇ ਹੋ।" +"ਇੱਕੋ ਕਿਸਮ ਦੇ ਅੱਖਰ ਮੁੜ-ਵਰਤਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ: ਤੁਸੀਂ ਅੱਖਰਾਂ, ਅੰਕਾਂ ਅਤੇ ਵਿਰਾਮ" +" ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਮਿਲ ਸਕਦੇ ਹੋ।" #: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" @@ -6364,9 +6441,11 @@ msgstr "ਹੋਰ ਅੱਖਰ, ਅੰਕ ਤੇ ਨਿਸ਼ਾਨ ਵਰਤ ਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" #: ../panels/user-accounts/pw-utils.c:117 +#| msgctxt "Password hint" +#| msgid "Mix uppercase and lowercase and use a number or two." msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "ਵੱਡੇ ਤੇ ਛੋਟੇ ਅੱਖਰ ਮਿਲਾ ਕੇ ਅਤੇ ਇੱਕ ਜਾਂ ਦੋ ਨੰਬਰ ਵਰਤੋਂ।" +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "ਵੱਡੇ ਤੇ ਛੋਟੇ ਅੱਖਰ ਮਿਲਾ ਕੇ ਅਤੇ ਇੱਕ ਜਾਂ ਦੋ ਨੰਬਰ ਵਰਤੇ ਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6456,32 +6535,33 @@ msgstr "ਅਣਜਾਣ ਗਲਤੀ" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "ਤੁਹਾਡੇ ਅਕਾਊਂਟ ਪਰੋਵਾਇਡਰ ਦੇ ਵੈੱਬ ਐਡਰੈਸ ਨਾਲ ਮਿਲਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" +#| msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." +msgstr "ਤੁਹਾਡੇ ਲਾਗਇਨ ਪਰੋਵਾਇਡਰ ਦੇ ਵੈੱਬ ਐਡਰੈਸ ਨਾਲ ਮਿਲਦਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।" #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "ਅਕਾਊਂਟ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।" -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "ਅਕਾਊਂਟ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "ਇਹ ਡੋਮੇਨ ਨਾਲ ਪਰਮਾਣਕਿਤਾ ਦਾ ਕੋਈ ਸਹਾਇਕ ਢੰਗ ਨਹੀਂ ਹੈ" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "ਡੋਮੇਨ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6489,7 +6569,7 @@ "ਉਹ ਲਾਗਇਨ ਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਦਾ।\n" "ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।" -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6497,14 +6577,24 @@ "ਇਹ ਲਾਗਇਨ ਪਾਸਵਰਡ ਕੰਮ ਨਹੀਂ ਕਰਦਾ ਹੈ।\n" "ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "ਡੋਮੇਨ ਵਿੱਚ ਲਾਗਇਨ ਲਈ ਫੇਲ੍ਹ ਹੈ" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "ਡੋਮੇਨ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ, ਸ਼ਾਇਦ ਤੁਸੀਂ ਇਹ ਗਲਤ ਲਿਖੀ ਹੋਵੇ?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "ਸਟੈਂਡਰਡ" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "ਪਰਸ਼ਾਸ਼ਕੀ" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6523,32 +6613,32 @@ msgid "Enabled" msgstr "ਯੋਗ ਕੀਤਾ" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "ਕੀ ਰਜਿਸਟਰ ਕੀਤੇ ਫਿੰਗਰ-ਪਰਿੰਟ ਹਟਾਉਣੇ ਹਨ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "ਫਿੰਗਰ-ਪਰਿੰਟ ਹਟਾਓ(_D)" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "" -"ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਰਜਿਸਟਰ ਕੀਤੇ ਫਿੰਗਰਪਰਿੰਟ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਕਿ ਫਿੰਗਰਪਰਿੰਟ " -"ਲਾਗਇਨ ਨੂੰ ਆਯੋਗ ਕੀਤਾ " +"ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਰਜਿਸਟਰ ਕੀਤੇ ਫਿੰਗਰਪਰਿੰਟ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਕਿ ਫਿੰਗਰਪਰਿੰਟ" +" ਲਾਗਇਨ ਨੂੰ ਆਯੋਗ ਕੀਤਾ " "ਜਾ ਸਕੇ?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "ਮੁਕੰਮਲ!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "ਜੰਤਰ '%s' ਲਈ ਅਸੈੱਸ ਨਹੀਂ ਹੈ" @@ -6556,16 +6646,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "ਜੰਤਰ '%s' ਉੱਤੇ ਉਂਗਲ ਪ੍ਰਾਪਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "ਕਿਸੇ ਫਿੰਗਰਪਰਿੰਟ ਰੀਡਰ ਨੂੰ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "ਮੱਦਦ ਲਈ ਆਪਣੇ ਸਿਸਟਮ ਐਡਮਿਨਸਟੇਟਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।" @@ -6574,29 +6664,29 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "" -"ਫਿੰਗਰਪਰਿੰਟ ਲਾਗਇਨ ਯੋਗ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਫਿੰਗਰਪਰਿੰਟ ਸੰਭਾਲਣ ਦੀ ਲੋੜ ਹੈ, '%s' " -"ਜੰਤਰ ਦੀ ਵਰਤੋਂ " +"ਫਿੰਗਰਪਰਿੰਟ ਲਾਗਇਨ ਯੋਗ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਫਿੰਗਰਪਰਿੰਟ ਸੰਭਾਲਣ ਦੀ ਲੋੜ ਹੈ, '%s'" +" ਜੰਤਰ ਦੀ ਵਰਤੋਂ " "ਕਰਕੇ।" -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "ਉਂਗਲ ਚੁਣੀ ਜਾ ਰਹੀ ਹੈ" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "ਫਿੰਗਰ-ਪਰਿੰਟ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../panels/user-accounts/um-history-dialog.c:68 +#: ../panels/user-accounts/um-history-dialog.c:70 msgid "This Week" msgstr "ਇਸ ਹਫ਼ਤੇ" -#: ../panels/user-accounts/um-history-dialog.c:71 +#: ../panels/user-accounts/um-history-dialog.c:73 msgid "Last Week" msgstr "ਪਿਛਲੇ ਹਫ਼ਤੇ" @@ -6604,22 +6694,22 @@ #. shown as the first day of a week on login history dialog. #. Translators: This is a date format string in the style of "Feb 24", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:77 -#: ../panels/user-accounts/um-history-dialog.c:81 +#: ../panels/user-accounts/um-history-dialog.c:79 +#: ../panels/user-accounts/um-history-dialog.c:83 msgctxt "login history week label" msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:86 +#: ../panels/user-accounts/um-history-dialog.c:88 msgctxt "login history week label" msgid "%b %e, %Y" msgstr "%e %b %Y" #. Translators: This indicates a week label on a login history. #. The first %s is the first day of a week, and the second %s the last day. -#: ../panels/user-accounts/um-history-dialog.c:91 +#: ../panels/user-accounts/um-history-dialog.c:93 #, c-format msgctxt "login history week label" msgid "%s - %s" @@ -6627,29 +6717,36 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. -#: ../panels/user-accounts/um-history-dialog.c:175 -#: ../panels/user-accounts/um-user-panel.c:844 +#: ../panels/user-accounts/um-history-dialog.c:177 +#: ../panels/user-accounts/um-user-panel.c:841 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. -#: ../panels/user-accounts/um-history-dialog.c:178 -#: ../panels/user-accounts/um-user-panel.c:848 +#: ../panels/user-accounts/um-history-dialog.c:180 +#: ../panels/user-accounts/um-user-panel.c:845 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:247 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "ਸ਼ੈਸ਼ਨ ਅੰਤ ਹੋਇਆ" -#: ../panels/user-accounts/um-history-dialog.c:253 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਹੋਇਆ" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - ਅਕਾਊਂਟ ਦੀ ਸਰਗਰਮੀ" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "ਵੱਖਰਾ ਪਾਸਵਰਡ ਚੁਣੋ ਜੀ।" @@ -6711,95 +6808,95 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "%s ਡੋਮੇਨ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s" -#: ../panels/user-accounts/um-user-panel.c:240 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "ਹੋਰ ਅਕਾਊਂਟ" -#: ../panels/user-accounts/um-user-panel.c:450 +#: ../panels/user-accounts/um-user-panel.c:447 msgid "Failed to delete user" msgstr "ਯੂਜ਼ਰ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ" -#: ../panels/user-accounts/um-user-panel.c:510 -#: ../panels/user-accounts/um-user-panel.c:569 -#: ../panels/user-accounts/um-user-panel.c:621 +#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:566 +#: ../panels/user-accounts/um-user-panel.c:618 msgid "Failed to revoke remotely managed user" msgstr "ਰਿਮੋਟ ਤੋਂ ਪ੍ਰਬੰਧ ਅਧੀਨ ਵਰਤੋਂਕਾਰ ਮਨਸੂਖ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../panels/user-accounts/um-user-panel.c:677 +#: ../panels/user-accounts/um-user-panel.c:674 msgid "You cannot delete your own account." msgstr "ਤੁਸੀਂ ਆਪਣਾ ਖੁਦ ਦਾ ਅਕਾਊਂਟ ਹਟਾ ਨਹੀਂ ਸਕਦੇ।" -#: ../panels/user-accounts/um-user-panel.c:686 +#: ../panels/user-accounts/um-user-panel.c:683 #, c-format msgid "%s is still logged in" msgstr "%s ਹਾਲੇ ਲਾਗਇਨ ਹੈ" -#: ../panels/user-accounts/um-user-panel.c:690 +#: ../panels/user-accounts/um-user-panel.c:687 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." msgstr "" -"ਜਦੋਂ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇ ਤਾਂ ਉਸ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਸਿਸਟਮ ਖਰਾਬ ਹੋਣ ਦੀ ਹਾਲਤ 'ਚ ਆ ਸਕਦਾ " -"ਹੈ।" +"ਜਦੋਂ ਯੂਜ਼ਰ ਲਾਗਇਨ ਹੋਵੇ ਤਾਂ ਉਸ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਸਿਸਟਮ ਖਰਾਬ ਹੋਣ ਦੀ ਹਾਲਤ 'ਚ ਆ ਸਕਦਾ" +" ਹੈ।" -#: ../panels/user-accounts/um-user-panel.c:699 +#: ../panels/user-accounts/um-user-panel.c:696 #, c-format msgid "Do you want to keep %s's files?" msgstr "ਕੀ ਤੁਸੀਂ %s ਦੀਆਂ ਫਾਇਲਾਂ ਰੱਖਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../panels/user-accounts/um-user-panel.c:703 +#: ../panels/user-accounts/um-user-panel.c:700 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." msgstr "" -"ਘਰ ਡਾਇਰੈਕਟਰੀ, ਮੇਲ ਸਪੂਲ ਅਤੇ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਰੱਖਣਾ ਸੰਭਵ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਅਕਾਊਂਟ " -"ਹਟਾਉਣਾ ਹੋਵੇ।" +"ਘਰ ਡਾਇਰੈਕਟਰੀ, ਮੇਲ ਸਪੂਲ ਅਤੇ ਆਰਜ਼ੀ ਫਾਇਲਾਂ ਨੂੰ ਰੱਖਣਾ ਸੰਭਵ ਹੈ, ਜਦੋਂ ਯੂਜ਼ਰ ਅਕਾਊਂਟ" +" ਹਟਾਉਣਾ ਹੋਵੇ।" -#: ../panels/user-accounts/um-user-panel.c:706 +#: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" msgstr "ਫਾਇਲਾਂ ਹਟਾਓ(_D)" -#: ../panels/user-accounts/um-user-panel.c:707 +#: ../panels/user-accounts/um-user-panel.c:704 msgid "_Keep Files" msgstr "ਫਾਇਲਾਂ ਰੱਖੋ(_K)" -#: ../panels/user-accounts/um-user-panel.c:721 +#: ../panels/user-accounts/um-user-panel.c:718 #, c-format msgid "Are you sure you want to revoke remotely managed %s's account?" msgstr "ਕੀ ਤੁਸੀਂ ਰਿਮੋਟ ਤੋਂ ਪ੍ਰਬੰਧ ਕੀਤੇ %s ਦੇ ਖਾਤੇ ਨੂੰ ਮਨਸੂਖ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../panels/user-accounts/um-user-panel.c:725 +#: ../panels/user-accounts/um-user-panel.c:722 msgid "_Delete" msgstr "ਹਟਾਓ(_D)" -#: ../panels/user-accounts/um-user-panel.c:777 +#: ../panels/user-accounts/um-user-panel.c:774 msgctxt "Password mode" msgid "Account disabled" msgstr "ਅਕਾਊਂਟ ਬੰਦ ਹੈ" -#: ../panels/user-accounts/um-user-panel.c:785 +#: ../panels/user-accounts/um-user-panel.c:782 msgctxt "Password mode" msgid "To be set at next login" msgstr "ਅਗਲੇ ਲਾਗਇਨ ਸਮੇਂ ਸੈੱਟ ਕਰੋ" -#: ../panels/user-accounts/um-user-panel.c:788 +#: ../panels/user-accounts/um-user-panel.c:785 msgctxt "Password mode" msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../panels/user-accounts/um-user-panel.c:837 +#: ../panels/user-accounts/um-user-panel.c:834 msgid "Logged in" msgstr "ਲਾਗਇਨ ਕੀਤਾ" -#: ../panels/user-accounts/um-user-panel.c:1275 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "ਅਕਾਊਂਟ ਸਰਵਿਸ ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ" -#: ../panels/user-accounts/um-user-panel.c:1277 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "ਯਕੀਨੀ ਬਣਾਉ ਕਿ ਅਕਾਊਂਟਸਰਵਿਸ (AccountService) ਇੰਸਟਾਲ ਹੈ ਅਤੇ ਯੋਗ ਹੈ" -#: ../panels/user-accounts/um-user-panel.c:1318 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6807,12 +6904,12 @@ "ਬਦਲਾਅ ਕਰਨ ਲਈ,\n" "ਪਹਿਲਾਂ * ਆਈਕਾਨ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ" -#: ../panels/user-accounts/um-user-panel.c:1356 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "ਨਵਾਂ ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਬਣਾਓ" -#: ../panels/user-accounts/um-user-panel.c:1367 -#: ../panels/user-accounts/um-user-panel.c:1679 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6820,12 +6917,12 @@ "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਬਣਾਉਣ ਲਈ,\n" "ਪਹਿਲਾਂ * ਆਈਕਾਨ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ" -#: ../panels/user-accounts/um-user-panel.c:1377 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "ਚੁਣਿਆ ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਹਟਾਓ" -#: ../panels/user-accounts/um-user-panel.c:1389 -#: ../panels/user-accounts/um-user-panel.c:1684 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6833,47 +6930,40 @@ "ਚੁਣੇ ਯੂਜ਼ਰ ਨੂੰ ਅਕਾਊਂਟ ਹਟਾਉਣ ਲਈ,\n" "ਪਹਿਲਾਂ * ਆਈਕਾਨ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ" -#: ../panels/user-accounts/um-user-panel.c:1593 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "ਮੇਰਾ ਅਕਾਊਂਟ" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "'%s' ਯੂਜ਼ਰ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "ਯੂਜ਼ਰ ਨਾਂ ਬਹੁਤ ਲੰਮਾ ਹੈ।" -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "ਯੂਜ਼ਰ ਨਾਂ '-' ਨਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।" -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 +#, fuzzy +#| msgid "" +#| "The username should only consist of lower and upper case letters from a-" +#| "z, digits and any of characters '.', '-' and '_'." msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"ਯੂਜ਼ਰ ਨਾਂ ਵਿੱਚ ਕੇਵਲ ਅੰਗਰੇਜ਼ੀ ਦੇ ਵੱਡੇ ਤੇ ਛੋਟੇ ਅੱਖਰ (a-z), ਅੰਕ, '.', '-' ਅਤੇ " -"'_' ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਅੱਖਰ " +"ਯੂਜ਼ਰ ਨਾਂ ਵਿੱਚ ਕੇਵਲ ਅੰਗਰੇਜ਼ੀ ਦੇ ਵੱਡੇ ਤੇ ਛੋਟੇ ਅੱਖਰ (a-z), ਅੰਕ, '.', '-' ਅਤੇ" +" '_' ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਅੱਖਰ " "ਹੋ ਸਕਦੇ ਹਨ।" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "ਇਹ ਤੁਹਾਡੇ ਘਰ ਫੋਲਡਰ ਨਾਂ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ ਅਤੇ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।" -#. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/user-accounts/um-utils.c:823 -msgid "%b %e" -msgstr "%e %b" - -#. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/user-accounts/um-utils.c:827 -msgid "%b %e, %Y" -msgstr "%e %b %Y" - #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" msgstr "ਬਟਨ ਮਿਲਾਉ" @@ -6887,8 +6977,8 @@ "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " "shortcut button and hold down the new keys or press Backspace to clear." msgstr "" -"ਸ਼ਾਰਟਕੱਟ ਸੋਧਣ ਲਈ, \"ਕੀ-ਸਟੋਰਕ ਭੇਜੋ\" ਕਾਰਵਾਈ ਚੁਣੋ, ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਬਟਨ ਦੱਬੋ ਅਤੇ " -"ਨਵੀਆਂ ਸਵਿੱਚਾਂ " +"ਸ਼ਾਰਟਕੱਟ ਸੋਧਣ ਲਈ, \"ਕੀ-ਸਟੋਰਕ ਭੇਜੋ\" ਕਾਰਵਾਈ ਚੁਣੋ, ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਬਟਨ ਦੱਬੋ ਅਤੇ" +" ਨਵੀਆਂ ਸਵਿੱਚਾਂ " "ਲਈ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ ਜਾਂ ਬੈਕਸਪੇਸ ਸਾਫ਼ ਕਰਨ ਲਈ ਵਰਤੋਂ।" #: ../panels/wacom/calibrator/calibrator-gui.c:83 @@ -6896,8 +6986,8 @@ "Please tap the target markers as they appear on screen to calibrate the " "tablet." msgstr "" -"ਟਾਰਗੇਟ ਮਾਰਕਰ ਲਈ ਟੈਪ ਕਰੋ ਜਿਵੇਂ ਕਿ ਉਹ ਸਕਰੀਨ ਉੱਤੇ ਟੇਬਲੇਟ ਨੂੰ ਕੈਲੀਬਰੇਟ ਕਰਨ ਲਈ " -"ਵੇਖਾਈ ਦਿੰਦਾ ਹੈ।" +"ਟਾਰਗੇਟ ਮਾਰਕਰ ਲਈ ਟੈਪ ਕਰੋ ਜਿਵੇਂ ਕਿ ਉਹ ਸਕਰੀਨ ਉੱਤੇ ਟੇਬਲੇਟ ਨੂੰ ਕੈਲੀਬਰੇਟ ਕਰਨ ਲਈ" +" ਵੇਖਾਈ ਦਿੰਦਾ ਹੈ।" #: ../panels/wacom/calibrator/calibrator-gui.c:87 msgid "Mis-click detected, restarting..." @@ -6960,17 +7050,18 @@ msgid "Button" msgstr "ਬਟਨ" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#| msgid "Wacom Tablet" +msgid "Wa­com Tab­let" msgstr "ਵਾਕੋਮ ਟੇਬਲੇਟ" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "ਗਰਾਫਿਕਸ ਟੇਬਲਟ ਲਈ ਬਟਨ ਮਿਲਾਨ ਕਰੋ ਅਤੇ ਸਟਾਇਲਸ ਸੰਵੇਦਨਸ਼ੀਲਤਾ ਅਡਜੱਸਟ ਕਰੋ" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;ਟੇਬਲੇਟ;" @@ -7002,6 +7093,10 @@ msgid "Bluetooth Settings" msgstr "ਬਲਿਊਟੁੱਥ ਸੈਟਿੰਗ" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "ਵਾਕੋਮ ਟੇਬਲੇਟ" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "…ਮਾਨੀਟਰ ਲਈ ਮਿਲਾਉ" @@ -7095,22 +7190,22 @@ msgid "Mode Switch #%d" msgstr "ਮੋਡ ਬਦਲੋ #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "ਖੱਬਾ ਬਟਨ #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "ਸੱਜਾ ਬਟਨ #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "ਟਾਪ ਬਟਨ #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "ਤਲ ਬਟਨ #%d" @@ -7187,8 +7282,12 @@ msgid "Tip Pressure Feel" msgstr "ਟਿੱਪ ਦਬਾਉ ਮਹਿਸੂਸ" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "ਸਭ ਸੈਟਿੰਗਾਂ" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 -#| msgid "Control Center" msgid "GNOME Control Center" msgstr "ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ" @@ -7201,12 +7300,10 @@ "The control center is GNOME's main interface for configuration of various " "aspects of your desktop." msgstr "" -"ਕੰਟਰੋਲ ਸੈਂਟਰ ਤੁਹਾਡੇ ਡੈਸਕਟਾਪ ਦੇ ਵੱਖ-ਵੱਖ ਪੱਖਾਂ ਦੀਆਂ ਸੰਰਚਨਾ ਕਰਨ ਵਾਸਤੇ ਗਨੋਮ ਦਾ " -"ਮੁੱਖ " -"ਇੰਟਰਫੇਸ ਹੈ।" +"ਕੰਟਰੋਲ ਸੈਂਟਰ ਤੁਹਾਡੇ ਡੈਸਕਟਾਪ ਦੇ ਵੱਖ-ਵੱਖ ਪੱਖਾਂ ਦੀਆਂ ਸੰਰਚਨਾ ਕਰਨ ਵਾਸਤੇ ਗਨੋਮ ਦਾ" +" ਮੁੱਖ ਇੰਟਰਫੇਸ ਹੈ।" #: ../shell/cc-application.c:45 -#| msgid "Display Brightness" msgid "Display version number" msgstr "ਵਰਜ਼ਨ ਨੰਬਰ ਦਿਖਾਓ" @@ -7246,22 +7343,18 @@ msgid "Quit" msgstr "ਬਾਹਰ" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494 -msgid "All Settings" -msgstr "ਸਭ ਸੈਟਿੰਗਾਂ" - #. Add categories -#: ../shell/cc-window.c:880 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "ਨਿੱਜੀ" -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "ਹਾਰਡਵੇਅਰ" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "ਸਿਸਟਮ" @@ -7271,42 +7364,213 @@ msgstr "ਮੇਰੀ ਪਸੰਦ;ਸੈਟਿੰਗ;" #: ../shell/help-overlay.ui.h:1 -#| msgid "General" msgctxt "shortcut window" msgid "General" msgstr " ਆਮ" #: ../shell/help-overlay.ui.h:2 -#| msgid "Quit" msgctxt "shortcut window" msgid "Quit" msgstr "ਬਾਹਰ" #: ../shell/help-overlay.ui.h:3 -#| msgid "Search" msgctxt "shortcut window" msgid "Search" msgstr "ਖੋਜ" #: ../shell/help-overlay.ui.h:4 -#| msgid "Panel icon" msgctxt "shortcut window" msgid "Panels" msgstr "ਪੈਨਲ" #: ../shell/help-overlay.ui.h:5 -#| msgid "Show the overview" msgctxt "shortcut window" msgid "Go back to the overview" msgstr "ਸਧਾਰਨ ਉੱਤੇ ਵਾਪਸ ਜਾਓ" #: ../shell/help-overlay.ui.h:6 -#| msgctxt "print job" -#| msgid "Canceled" msgctxt "shortcut window" msgid "Cancel search" msgstr "ਖੋਜ ਰੱਦ ਕਰੋ" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +#| msgid "_Stop Hotspot" +msgctxt "hotspot" +msgid "Hotspot" +msgstr "ਹਾਟਸਪਾਟ" + +#~ msgid "Color" +#~ msgstr "ਰੰਗ" + +#~ msgid "_Name:" +#~ msgstr "ਨਵਾਂ(_N):" + +#~ msgid "C_ommand:" +#~ msgstr "ਕਮਾਂਡ(_o):" + +#~ msgid "Add Shortcut" +#~ msgstr "ਸ਼ਾਰਟਕੱਟ ਸ਼ਾਮਿਲ" + +#~ msgid "Remove Shortcut" +#~ msgstr "ਸ਼ਾਰਟਕੱਟ ਹਟਾਓ" + +#~ msgid "" +#~ msgstr "<ਅਣਜਾਣੀ ਕਾਰਵਾਈ>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "ਸ਼ਾਰਟਕੱਟ \"%s\" ਨੂੰ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਇਹ ਸਵਿੱਚ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਿਖਣਾ ਮੁਸ਼ਕਿਲ " +#~ "ਹੋ ਜਾਵੇਗਾ।\n" +#~ "ਇੱਕ ਅਜੇਹੀ ਸਵਿੱਚ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਸ ਵਿੱਚ ਇੱਕ ਸਮੇਂ Control, Alt ਜਾਂ Shift ਇੱਕਠੇ ਹੋਣ।" + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "ਸ਼ਾਰਟਕੱਟ \"%s\" ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ\n" +#~ " \"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "ਜੇ ਤੁਸੀਂ ਸ਼ਾਰਟਕੱਟ \"%s\" ਲਈ ਦਿੱਤਾ ਤਾਂ \"%s\" ਸ਼ਾਰਟਕੱਟ ਆਯੋਗ ਹੋ ਜਾਵੇਗਾ।" + +#~ msgid "_Reassign" +#~ msgstr "ਮੁੜ-ਜਾਰੀ(_R)" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "ਸ਼ਾਰਟਕੱਟ \"%s\" ਨਾਲ ਸੰਬੰਧਿਤ \"%s\" ਸ਼ਾਰਟਕ਼ਟ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ \"%s\" ਲਈ ਆਟੋਮੈਟਿਕ ਸੈੱਟ " +#~ "ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" ਇਸ ਸਮੇਂ \"%s\" ਨਾਲ ਸੰਬੰਧਿਤ ਹੈ, ਇਹ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਅਸਮਰੱਥ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ, ਜੇ ਤੁਸੀਂ " +#~ "ਅੱਗੇ ਜਾਰੀ ਰੱਖਿਆ।" + +#~ msgid "_Assign" +#~ msgstr "ਮੁੜ-ਜਾਰੀ(_A)" + +#~ msgid "Bond" +#~ msgstr "ਬੌਂਡ" + +#~ msgid "Team" +#~ msgstr "ਟੀਮ" + +#~ msgid "Bridge" +#~ msgstr "ਬਰਿੱਜ਼" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "VPN ਪਲੱਗਇਨ ਲੋਡ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ" + +#~ msgid "Add Network Connection" +#~ msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ" + +#~ msgid "Bond slaves" +#~ msgstr "ਬੌਂਡ ਸਲੇਵ" + +#~ msgid "(none)" +#~ msgstr "(ਕੋਈ ਨਹੀਂ)" + +#~ msgid "Bridge slaves" +#~ msgstr "ਬਰਿੱਜ ਸਲੇਵ" + +#~ msgid "Team slaves" +#~ msgstr "ਟੀਮ ਸਲੇਵ" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "ਇੰਫੀਬੀਮ ਜੰਤਰ ਕੁਨੈਕਟ ਕੀਤੇ ਮੋਡ ਵਿੱਚ ਸਹਾਇਕ ਨਹੀਂ ਹੈ" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "ਕੋਈ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚੁਣਿਆ" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ (CA) ਸਰਟੀਫਿਕੇਟ ਦੀ ਵਰਤੋਂ ਨਾ ਕਰਨ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਸੁਰੱਖਿਅਤ, ਠੱਗ ਵਾਈ-ਫਾਈ " +#~ "ਨੈੱਟਵਰਕ ਹੋ ਸਕਦੇ ਹਨ। ਕੀ ਤੁਸੀਂ ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਟੀਫਿਕੇਟ ਚੁਣਨਾ ਚਾਹੁੰਦੇ ਹੋ?" + +#~ msgid "Ignore" +#~ msgstr "ਅਣਡਿੱਠਾ" + +#~ msgid "Choose CA Certificate" +#~ msgstr "CA ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ" + +#~ msgid "As_k for this password every time" +#~ msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਪੁੱਛੋ(_k)" + +#~ msgid "Don't _warn me again" +#~ msgstr "ਮੈਨੂੰ ਫੇਰ ਸਾਵਧਾਨ ਨਾ ਕਰੋ(_w)" + +#~ msgid "No" +#~ msgstr "ਨਹੀਂ" + +#~ msgid "Yes" +#~ msgstr "ਹਾਂ" + +#~ msgid "Error logging into the account" +#~ msgstr "ਅਕਾਊਂਟ ਵਿੱਚ ਲਾਗਇਨ ਵਿੱਚ ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ" + +#~ msgid "Credentials have expired." +#~ msgstr "ਸਨਦ ਦੀ ਮਿਆਦ ਪੁੱਗੀ।" + +#~ msgid "Sign in to enable this account." +#~ msgstr "ਇਹ ਅਕਾਊਂਟ ਚਾਲੂ ਕਰਨ ਲਈ ਸਾਇਨ ਕਰੋ।" + +#~ msgid "_Sign In" +#~ msgstr "ਸਾਇਨ ਇਨ(_S)" + +#~ msgid "Power" +#~ msgstr "ਪਾਵਰ" + +#~ msgid "Privacy" +#~ msgstr "ਪਰਾਈਵੇਸੀ" + +#~ msgid "Used to determine your geographical location" +#~ msgstr "ਤੁਹਾਡਾ ਭੂਗੋਲਿਕ ਟਿਕਾਣਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਹਨ" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "ਹੋਰ" + +#~ msgid "Personal File Sharing" +#~ msgstr "ਨਿੱਜੀ ਫਾਇਲ ਸਾਂਝ" + +#~| msgid "Allow Remote Control" +#~ msgid "_Allow Remote Control" +#~ msgstr "ਰਿਮੋਟ ਕੰਟਰੋਲ ਮਨਜ਼ੂਰ(_A)" + +#~ msgid "_Verify" +#~ msgstr "ਜਾਂਚ(_V)" + +#~ msgid "Login History" +#~ msgstr "ਲਾਗਇਨ ਅਤੀਤ" + +#~ msgid "Add User Account" +#~ msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਸ਼ਾਮਲ" + +#~ msgid "Remove User Account" +#~ msgstr "ਯੂਜ਼ਰ ਅਕਾਊਂਟ ਹਟਾਓ" + +#~ msgid "Login Options" +#~ msgstr "ਲਾਗਇਨ ਚੋਣ" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "'%s' ਯੂਜ਼ਰ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" + #~ msgid "Bluetooth is disabled" #~ msgstr "ਬਲਿਊਟੁੱਥ ਆਯੋਗ ਹੈ" @@ -7382,9 +7646,6 @@ #~ msgid "Fast" #~ msgstr "ਤੇਜ਼" -#~ msgid "Two _finger scroll" -#~ msgstr "ਦੋ ਉਂਗਲ ਸਕਰੋਲ(_f)" - #~ msgid "Security key" #~ msgstr "ਸੁਰੱਖਿਆ ਕੁੰਜੀ" @@ -7600,9 +7861,6 @@ #~ msgid "Don't use the display" #~ msgstr "ਡਿਸਪਲੇਅ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ" -#~ msgid "Refresh Rate" -#~ msgstr "ਤਾਜ਼ਾ ਕਰਨ ਦਰ" - #~ msgid "Install Updates" #~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ" @@ -8078,9 +8336,6 @@ #~ msgid "The current password is not correct" #~ msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਠੀਕ ਨਹੀਂ ਹੈ।" -#~ msgid "Wrong password" -#~ msgstr "ਗਲਤ ਪਾਸਵਰਡ" - #~ msgid "Switch Modes" #~ msgstr "ਮੋਡ ਬਦਲੋ" @@ -8273,10 +8528,6 @@ #~ msgid "Out of range" #~ msgstr "ਹੱਦ ਤੋਂ ਬਾਹਰ" -#~| msgid "_Configure..." -#~ msgid "_Configure…" -#~ msgstr "…ਸੰਰਚਨਾ(_C)" - #~ msgid "_Disconnect" #~ msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕਰੋ(_D)" @@ -8692,9 +8943,6 @@ #~ msgid "Take a screenshot" #~ msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ" -#~ msgid "Shortcut" -#~ msgstr "ਸ਼ਾਰਟਕੱਟ" - #~ msgid "Account _type" #~ msgstr "ਅਕਾਊਂਟ ਕਿਸਮ(_t)" @@ -9793,9 +10041,6 @@ #~ msgid "Monitors" #~ msgstr "ਮਾਨੀਟਰ" -#~ msgid "%d Hz" -#~ msgstr "%d Hz" - #~ msgid "Monitor: %s" #~ msgstr "ਮਾਨੀਟਰ: %s" @@ -11357,9 +11602,6 @@ #~ msgid "Screen Resolution" #~ msgstr "ਸਕਰੀਨ ਰੈਜੋਲੇਸ਼ਨ" -#~ msgid "_Command:" -#~ msgstr "ਕਮਾਂਡ(_C):" - #~ msgid "Retrieve and store legacy settings" #~ msgstr "ਮੁੜ ਪੁਰਾਣੀ ਸੈਟਿੰਗ ਪਰਤਾਓ ਅਤੇ ਸੰਭਾਲੋ" diff -Nru gnome-control-center-3.20.2/po/pl.po gnome-control-center-3.22.1/po/pl.po --- gnome-control-center-3.20.2/po/pl.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/pl.po 2016-09-27 12:37:36.000000000 +0000 @@ -1,32 +1,28 @@ -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aviary.pl -# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: -# gnomepl@aviary.pl -# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +# Polish translation for gnome-control-center. +# Copyright © 1998-2016 the gnome-control-center authors. +# This file is distributed under the same license as the gnome-control-center package. # Zbigniew Chyla , 1998-2003. # Artur Flinta , 2003-2007. # Tomasz Dominikowski , 2007-2009. # Wadim Dziedzic , 2007. # Piotr Drąg , 2009-2016. # Wojciech Szczęsny , 2013. -# Aviary.pl , 2007-2016. +# Aviary.pl , 2007-2016. +# msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-04 03:29+0200\n" -"PO-Revision-Date: 2016-07-04 03:30+0200\n" +"POT-Creation-Date: 2016-09-25 02:02+0200\n" +"PO-Revision-Date: 2016-09-25 02:03+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: Poland\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -35,7 +31,7 @@ #. This refers to a slideshow background #: ../panels/background/background.ui.h:3 msgid "Changes throughout the day" -msgstr "Zmienia się w ciągu dnia" +msgstr "Zmienia się w ciągu dnia" #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 @@ -98,7 +94,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Katalog domowy" @@ -107,31 +103,30 @@ #: ../panels/background/cc-background-chooser-dialog.c:573 #, c-format msgid "You can add images to your %s folder and they will show up here" -msgstr "Po dodaniu obrazów do katalogu %s pojawią się one w tym miejscu" +msgstr "Po dodaniu obrazów do katalogu %s pojawią się one w tym miejscu" #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1283 -#: ../panels/network/net-device-wifi.c:1483 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -162,16 +157,17 @@ msgid "Current background" msgstr "Obecne tło" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Tło" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Zmiana obrazu tła na tapetę lub zdjęcie" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Tapeta;Ekran;Pulpit;Blokada;" @@ -193,7 +189,7 @@ #: ../panels/bluetooth/cc-bluetooth-panel.c:331 msgid "Turn on to connect devices and receive file transfers." -msgstr "Należy go włączyć, aby łączyć z urządzeniami i odbierać pliki." +msgstr "Należy go włączyć, aby łączyć z urządzeniami i odbierać pliki." #: ../panels/bluetooth/cc-bluetooth-panel.c:332 msgid "Airplane Mode is on" @@ -211,18 +207,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Należy wyłączyć przełącznik trybu sprzętowego, aby włączyć Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Blue­tooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" -msgstr "Włączanie Bluetooth i łączenie z urządzeniami" +msgstr "Włączanie Bluetooth i łączenie z urządzeniami" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "" "udostępnianie;udostępnij;udostępniaj;współdzielenie;wysyłanie;wyślij;" @@ -232,7 +227,7 @@ #: ../panels/color/cc-color-calibrate.c:361 msgid "Place your calibration device over the square and press 'Start'" msgstr "" -"Proszę umieścić urządzenie na kwadracie i nacisnąć przycisk „Rozpocznij”" +"Proszę umieścić urządzenie na kwadracie i nacisnąć przycisk „Rozpocznij”" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them @@ -241,7 +236,7 @@ msgid "" "Move your calibration device to the calibrate position and press 'Continue'" msgstr "" -"Proszę umieścić urządzenie w pozycji kalibracji i nacisnąć przycisk " +"Proszę umieścić urządzenie w pozycji kalibracji i nacisnąć przycisk " "„Kontynuuj”" #. TRANSLATORS: Some calibration devices need the user to move a @@ -251,7 +246,7 @@ msgid "" "Move your calibration device to the surface position and press 'Continue'" msgstr "" -"Proszę umieścić urządzenie w pozycji powierzchni i nacisnąć przycisk " +"Proszę umieścić urządzenie w pozycji powierzchni i nacisnąć przycisk " "„Kontynuuj”" #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor @@ -265,7 +260,7 @@ #. * good idea why or any suggestions #: ../panels/color/cc-color-calibrate.c:410 msgid "An internal error occurred that could not be recovered." -msgstr "Wystąpił wewnętrzny błąd, z którego nie można przywrócić." +msgstr "Wystąpił wewnętrzny błąd, z którego nie można przywrócić." #. TRANSLATORS: Some required-at-runtime tools were not #. * installed, which should only affect insane distros @@ -398,7 +393,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Wszystkie pliki" @@ -426,12 +421,12 @@ #: ../panels/color/cc-color-panel.c:925 msgid "Restart this computer and boot your normal operating system." msgstr "" -"Proszę ponownie uruchomić komputer i uruchomić normalny system operacyjny." +"Proszę ponownie uruchomić komputer i uruchomić normalny system operacyjny." #: ../panels/color/cc-color-panel.c:926 msgid "Type the URL into your browser to download and install the profile." msgstr "" -"Wpisanie tego adresu URL w przeglądarce spowoduje pobranie i instalację " +"Wpisanie tego adresu URL w przeglądarce spowoduje pobranie i instalację " "profilu." #. TRANSLATORS: this is the dialog to save the ICC profile @@ -440,7 +435,7 @@ msgstr "Zapis profilu" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Zapisz" @@ -455,8 +450,8 @@ "The measuring instrument is not detected. Please check it is turned on and " "correctly connected." msgstr "" -"Nie wykryto urządzenia pomiarowego. Proszę sprawdzić, czy jest włączone i " -"poprawnie podłączone." +"Nie wykryto urządzenia pomiarowego. Proszę sprawdzić, czy jest włączone " +"i poprawnie podłączone." #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1373 @@ -635,14 +630,14 @@ "management will be most accurate at this brightness level." msgstr "" "Proszę ustawić jasność ekranu na typowo używaną. Zarządzanie kolorami będzie " -"najbardziej dokładne przy tym poziomie jasności." +"najdokładniejsze przy tym poziomie jasności." #: ../panels/color/color.ui.h:16 msgid "" "Alternatively, you can use the brightness level used with one of the other " "profiles for this device." msgstr "" -"Można też użyć poziomu jasności użytego z jednym z pozostałych profilów dla " +"Można też użyć poziomu jasności użytego z jednym z pozostałych profilów dla " "tego urządzenia." #: ../panels/color/color.ui.h:17 @@ -654,8 +649,8 @@ "You can use a color profile on different computers, or even create profiles " "for different lighting conditions." msgstr "" -"Można używać profilu kolorów na innych komputerach, lub nawet utworzyć " -"profile dla różnych warunków oświetleniowych." +"Można używać profilu kolorów na innych komputerach, albo utworzyć profile " +"dla różnych warunków oświetleniowych." #: ../panels/color/color.ui.h:19 msgid "Profile Name:" @@ -683,7 +678,7 @@ #: ../panels/color/color.ui.h:25 msgid "Requires Internet connection" -msgstr "Wymaga połączenia z Internetem" +msgstr "Wymaga połączenia z Internetem" #: ../panels/color/color.ui.h:26 msgid "" @@ -691,12 +686,12 @@ "\">GNU/Linux, Apple OS X and Microsoft Windows systems useful." msgstr "" -"Przydatne mogą być instrukcje, jak używać profilu kolorów w systemach GNU/Linux, Apple OS X i GNU/Linux, Apple OS X i Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Podsumowanie" @@ -708,11 +703,11 @@ msgid "_Import File…" msgstr "Za_importuj plik…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Dodaj" @@ -736,7 +731,7 @@ #: ../panels/color/color.ui.h:35 msgid "Learn more about color management" -msgstr "Więcej informacji o zarządzaniu kolorami" +msgstr "Więcej informacji o zarządzaniu kolorami" #: ../panels/color/color.ui.h:36 msgid "_Set for all users" @@ -772,7 +767,7 @@ #: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" -msgstr "Nie można wykryć urządzeń, które mogą korzystać z zarządzania kolorami" +msgstr "Nie można wykryć urządzeń, które mogą korzystać z zarządzania kolorami" #: ../panels/color/color.ui.h:45 msgid "LCD" @@ -808,11 +803,11 @@ #: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" -msgstr "LCD o szerokim gamucie (podświetlanie CCFL)" +msgstr "LCD o szerokim gamucie (podświetlanie CCFL)" #: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" -msgstr "LCD o szerokim gamucie (podświetlanie RGB LED)" +msgstr "LCD o szerokim gamucie (podświetlanie RGB LED)" #: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" @@ -848,7 +843,7 @@ #: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" -msgstr "D50 (drukowanie i publikowanie)" +msgstr "D50 (drukowanie i publikowanie)" #: ../panels/color/color.ui.h:63 msgid "D55" @@ -856,24 +851,25 @@ #: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" -msgstr "D65 (fotografia i grafika)" +msgstr "D65 (fotografia i grafika)" #: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Ko­lor" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" -"Kalibracja kolorów urządzeń, takich jak ekrany, aparaty, kamery i drukarki" +"Kalibracja kolorów urządzeń, takich jak ekrany, aparaty, kamery i drukarki" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Kolor;ICC;Profil;Kalibracja;Drukarka;Ekran;" @@ -892,12 +888,12 @@ msgstr "Nie odnaleziono języków" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Dzisiaj" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Wczoraj" @@ -1027,10 +1023,11 @@ msgid "December" msgstr "grudzień" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" -msgstr "Da­ta i czas" +msgstr "Da­ta i czas" #: ../panels/datetime/datetime.ui.h:14 msgid "Hour" @@ -1055,7 +1052,7 @@ #: ../panels/datetime/datetime.ui.h:20 msgid "Automatic _Date & Time" -msgstr "Automatyczna _data i czas" +msgstr "Automatyczna _data i czas" #: ../panels/datetime/datetime.ui.h:21 msgid "Requires internet access" @@ -1067,7 +1064,7 @@ #: ../panels/datetime/datetime.ui.h:23 msgid "Date & _Time" -msgstr "Data i _czas" +msgstr "Data i _czas" #: ../panels/datetime/datetime.ui.h:24 msgid "Time Z_one" @@ -1085,43 +1082,43 @@ msgid "AM / PM" msgstr "12-godzinny" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" -msgstr "Zmiana daty i czasu, w tym strefy czasowej" +msgstr "Zmiana daty i czasu, w tym strefy czasowej" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "" "Zegar;Strefa;Czasowa;Położenie;Miejsce;Lokacja;Miasto;Państwo;Kraj;NTP;" #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:1 msgid "Change system time and date settings" -msgstr "Zmiana ustawień czasu i daty systemu" +msgstr "Zmiana ustawień czasu i daty systemu" #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2 msgid "To change time or date settings, you need to authenticate." msgstr "Wymagane jest uwierzytelnienie, aby zmienić ustawienia czasu lub daty." -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Zamknięto pokrywę" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Ten sam obraz na wszystkich ekranach" -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Podstawowy" -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1131,270 +1128,283 @@ msgid "Off" msgstr "Wyłączone" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Dodatkowy" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Zmiana położenia połączonych ekranów" -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Zastosuj" -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Przeciąganie zmienia położenie" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" -msgstr "Obraca przeciwnie do ruchu wskazówek zegara o 90°" +msgstr "Obraca przeciwnie do ruchu wskazówek zegara o 90°" -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" -msgstr "Obraca o 180°" +msgstr "Obraca o 180°" -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" -msgstr "Obraca zgodnie z ruchem wskazówek zegara o 90°" +msgstr "Obraca zgodnie z ruchem wskazówek zegara o 90°" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Rozmiar" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporcje" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Rozdzielczość" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Dostosowanie do telewizora" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Częstotliwość odświeżania" -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" -msgstr "Wyświetlanie górnego paska i ekranu podglądu na tym ekranie" +msgstr "Wyświetlanie górnego paska i ekranu podglądu na tym ekranie" -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Dodatkowy ekran" -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "" -"Połączenie tego ekranu z innym, aby udostępnić dodatkową przestrzeń do pracy" +"Połączenie tego ekranu z innym, aby udostępnić dodatkową przestrzeń do pracy" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Prezentacje" -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" -msgstr "Wyświetlanie tylko prezentacji i multimediów" +msgstr "Wyświetlanie tylko prezentacji i multimediów" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Ten sam obraz na wszystkich ekranach" -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Wyświetlanie tego samego obrazu na obu ekranach" -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Wyłączenie" -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Bez używania tego ekranu" -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" -msgstr "Nie można uzyskać informacji o rozdzielczości ekranu" +msgstr "Nie można uzyskać informacji o rozdzielczości ekranu" -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Zmi_eń położenie połączonych ekranów" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ekra­ny" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" -msgstr "Wybór sposobu używania podłączonych monitorów i projektorów" +msgstr "Wybór sposobu używania podłączonych monitorów i projektorów" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Projektor;xrandr;Ekran;Rozdzielczość;Odświeżanie;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Nieznany" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bitowy (identyfikator: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bitowy (identyfikator: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bitowy" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bitowy" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Pytanie, co robić" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nierobienie niczego" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Otwarcie katalogu" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Inne nośniki" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Wybór programu dla płyt CD-Audio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Wybór programu dla płyt wideo DVD" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Wybór programu do uruchomienia po podłączeniu odtwarzacza multimediów" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Wybór programu do uruchomienia po podłączeniu aparatu" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" -msgstr "Wybór programu dla płyt CD z oprogramowaniem" +msgstr "Wybór programu dla płyt CD z oprogramowaniem" #. translators: these strings are duplicates of shared-mime-info #. * strings, just here to fix capitalization of the English originals. #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "Płyta DVD-Audio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Pusta płyta Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Pusta płyta CD" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Pusta płyta DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Pusta płyta HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Płyta wideo Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Czytnik e-booków" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Płyta wideo HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Oprogramowanie systemu Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sekcja" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Przegląd" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Domyślne programy" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Nośniki wymienne" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Wersja %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "In­for­ma­cje" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" -msgstr "Wyświetlanie informacji o systemie" +msgstr "Wyświetlanie informacji o systemie" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1506,7 +1516,7 @@ #: ../panels/keyboard/00-multimedia.xml.in.h:1 msgid "Sound and Media" -msgstr "Dźwięk i multimedia" +msgstr "Dźwięk i multimedia" #: ../panels/keyboard/00-multimedia.xml.in.h:2 msgid "Volume mute" @@ -1514,11 +1524,11 @@ #: ../panels/keyboard/00-multimedia.xml.in.h:3 msgid "Volume down" -msgstr "Głośność w dół" +msgstr "Głośność w dół" #: ../panels/keyboard/00-multimedia.xml.in.h:4 msgid "Volume up" -msgstr "Głośność w górę" +msgstr "Głośność w górę" #: ../panels/keyboard/00-multimedia.xml.in.h:5 msgid "Launch media player" @@ -1569,8 +1579,9 @@ msgid "Launch help browser" msgstr "Uruchomienie przeglądarki pomocy" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Ustawienia" @@ -1643,9 +1654,8 @@ msgstr "Blokowanie ekranu" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" -msgstr "Uła­twie­nia do­stę­pu" +msgstr "Ułatwienia dostępu" #: ../panels/keyboard/50-accessibility.xml.in.h:2 msgid "Turn zoom on or off" @@ -1679,14 +1689,24 @@ msgid "High contrast on or off" msgstr "Włączenie lub wyłączenie wysokiego kontrastu" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Niestandardowe skróty" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Wyłączone" @@ -1710,126 +1730,134 @@ msgid "Modifiers-only switch to next source" msgstr "Przełączenie na następne źródło tylko dla modyfikatorów" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Kla­wia­tu­ra" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Przywraca skrót do domyślnej wartości" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s jest już używane dla „%s”. Po zastąpieniu „%s” zostanie wyłączone." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Ustawienie niestandardowego skrótu" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Ustawienie skrótu" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Proszę wprowadzić nowy skrót, aby zmienić „%s”." +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Dodanie niestandardowego skrótu" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Kla­wia­tu­ra" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" -"Wyświetlanie i zmiana skrótów klawiszowych oraz ustawianie preferencji " +"Wyświetlanie i zmiana skrótów klawiszowych oraz ustawianie preferencji " "pisania" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Skrót;Skróty;Powtarzanie;Miganie;Pisanie;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Własny skrót" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nazwa:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "P_olecenie:" +msgid "No keyboard shortcut found" +msgstr "Nie odnaleziono żadnych skrótów klawiszowych" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Dodaj skrót" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Usuń skrót" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Aby zmodyfikować skrót, należy kliknąć na wierszu i wcisnąć nowe klawisze " -"lub nacisnąć klawisz Backspace, aby wyczyścić obecny." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Własne skróty" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Proszę spróbować innych słów" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Klawisz Esc anuluje." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Skrót „%s” nie może być użyty, ponieważ nie będzie możliwe pisanie używając " -"wybranego klawisza.\n" -"Proszę spróbować w połączeniu z klawiszem takim jak Ctrl, Alt lub Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nazwa" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Skrót „%s” jest już wykorzystywany przez\n" -"„%s”" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Polecenie" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Skrót" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Modyfikuj" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Jeśli skrót zostanie zmieniony na „%s”, skrót „%s” zostanie wyłączony." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Brak" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Zmień" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Usuń" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Proszę wprowadzić nowy skrót" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Skrót „%s” posiada powiązany skrót „%s”. Ustawić go automatycznie na „%s”?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Anuluj" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"„%s” jest obecnie powiązane z „%s”, w przypadku kontynuowania ten skrót " -"zostanie wyłączony." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Dodaj" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Przydziel" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Zastąp" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Ustaw" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Test _ustawień" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mysz i pa­nel do­ty­ko­wy" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Mysz i pa­nel do­ty­ko­wy" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" -"Zmiana wrażliwości myszy i panelu dotykowego oraz wybór trybu praworęcznego " +"Zmiana wrażliwości myszy i panelu dotykowego oraz wybór trybu praworęcznego " "lub leworęcznego" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Kursor;Wskaźnik;Wskazywanie;Kliknięcie;Puknięcie;Stuknięcie;" @@ -1845,7 +1873,7 @@ #: ../panels/mouse/gnome-mouse-properties.ui.h:3 msgid "Sets the order of physical buttons on mice and touchpads." -msgstr "Ustawia kolejność fizycznych przycisków myszy i paneli dotykowych." +msgstr "Ustawia kolejność fizycznych przycisków myszy i paneli dotykowych." #: ../panels/mouse/gnome-mouse-properties.ui.h:4 msgid "Left" @@ -1874,7 +1902,7 @@ #: ../panels/mouse/gnome-mouse-properties.ui.h:11 msgid "Scrolling moves the content, not the view." -msgstr "Przewijanie przesuwa treść, a nie widok." +msgstr "Przewijanie przesuwa treść, a nie widok." #: ../panels/mouse/gnome-mouse-properties.ui.h:12 msgid "Touchpad" @@ -1889,13 +1917,17 @@ msgstr "Klikanie przez stuknięcie" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Przewijanie dwoma palcami" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Przewijanie przy krawędziach" #: ../panels/mouse/gnome-mouse-test.c:130 #: ../panels/mouse/gnome-mouse-test.ui.h:1 msgid "Try clicking, double clicking, scrolling" -msgstr "Można testować klikanie, podwójne kliknięcie i przewijanie" +msgstr "Można testować klikanie, podwójne kliknięcie i przewijanie" #: ../panels/mouse/gnome-mouse-test.c:135 msgid "Five clicks, GEGL time!" @@ -1927,11 +1959,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Tryb _samolotowy" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Pośrednik sieciowy" @@ -1939,18 +1971,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" -"Coś się nie powiodło. Proszę skontaktować się z producentem oprogramowania." +"Coś się nie powiodło. Proszę skontaktować się z producentem oprogramowania." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Usługa NetworkManager musi być uruchomiona." @@ -1966,7 +1998,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1983,64 +2015,64 @@ msgid "page 2" msgstr "strona 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Zabezpieczenia" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatycznie" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profil %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Brak" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nigdy" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2049,181 +2081,181 @@ msgstr[2] "%i dni temu" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Brak" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Słaby" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Dostateczny" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Dobry" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Doskonały" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Informacje" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Tożsamość" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adres" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Maska sieci" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Brama" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Usuń adres" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Dodaj" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Serwer" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Usuń serwer DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Parametry" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Usuń trasę" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatycznie (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ręczne" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Tylko Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Przedrostek" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatycznie" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatycznie, tylko DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Przywróć" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Brak" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "40/128-bitowy klucz WEP (szesnastkowy lub ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "128-bitowe hasło WEP" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamiczny WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" -msgstr "WPA i WPA2 Personal" +msgstr "WPA i WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" -msgstr "WPA i WPA2 Enterprise" +msgstr "WPA i WPA2 Enterprise" #: ../panels/network/connection-editor/details-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:4 @@ -2236,30 +2268,30 @@ msgstr "Prędkość połączenia" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Adres IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Adres IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Adres sprzętowy" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2269,7 +2301,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2393,52 +2425,32 @@ #: ../panels/network/connection-editor/ip6-page.ui.h:8 #: ../panels/network/network-wifi.ui.h:34 msgid "Use this connection _only for resources on its network" -msgstr "Używanie tego połączenia tylk_o dla zasobów w jej sieci" +msgstr "Używanie tego połączenia tylk_o dla zasobów w jej sieci" #: ../panels/network/connection-editor/ip6-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:36 msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Nie można otworzyć edytora połączeń" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nowy profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Łączone" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Zespół" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Mostek" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Nie można wczytać wtyczek VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" -msgstr "Zaimportuj z pliku…" +msgstr "Zaimportuj z pliku…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Dodanie połączenia sieciowego" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Dodanie sieci VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2446,7 +2458,7 @@ msgstr "_Przywróć" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1484 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Zapomnij" @@ -2456,7 +2468,7 @@ "Reset the settings for this network, including passwords, but remember it as " "a preferred network" msgstr "" -"Przywraca ustawienia tej sieci, w tym hasła, ale zapamiętuje ją jako " +"Przywraca ustawienia tej sieci, w tym hasła, ale zapamiętuje ją jako " "preferowaną sieć" #: ../panels/network/connection-editor/reset-page.ui.h:4 @@ -2464,7 +2476,7 @@ "Remove all details relating to this network and do not try to automatically " "connect" msgstr "" -"Usuwa wszystkie informacji o tej sieci i nie próbuje się z nią automatycznie " +"Usuwa wszystkie informacji o tej sieci i nie próbuje się z nią automatycznie " "łączyć" #: ../panels/network/connection-editor/security-page.ui.h:1 @@ -2472,11 +2484,11 @@ msgid "S_ecurity" msgstr "Zab_ezpieczenia" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nie można zaimportować połączenia VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2485,40 +2497,40 @@ "Error: %s." msgstr "" "Plik „%s” nie może zostać odczytany lub nie zawiera rozpoznawanych " -"informacji o połączeniu VPN\n" +"informacji o połączeniu VPN\n" "\n" "Błąd: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Wybór pliku do zaimportowania" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Otwórz" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." -msgstr "Plik o nazwie „%s” już istnieje." +msgstr "Plik o nazwie „%s” już istnieje." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "Za_mień" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Zastąpić połączenie %s zapisywanym połączeniem VPN?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Nie można wyeksportować połączenia VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2529,7 +2541,7 @@ "\n" "Błąd: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Eksport połączenia VPN" @@ -2556,61 +2568,46 @@ msgid "Make available to _other users" msgstr "Dostępna dla _innych użytkowników" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Sieć" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" -msgstr "Kontrola sposobu łączenia z Internetem" +msgstr "Kontrola sposobu łączenia z Internetem" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Sieć;Sieci;Bezprzewodowa;Wireless;Wi-Fi;Wifi;IP;LAN;Kabel;Pośrednik;Proxy;" -"WAN;Broadband;Modem;Bluetooth;vpn;vlan;mostek;mostkowanie;bridge;łączone;" -"bond;DNS;" +"WAN;Broadband;Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Łączone podrzędne" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(brak)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Mostkowane podrzędne" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nigdy" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "dzisiaj" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "wczoraj" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Adres IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Ostatnio użyte" @@ -2620,80 +2617,76 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Przewodowe" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1642 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opcje…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Dodaj nowe połączenie" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Zespołowe podrzędne" - -#: ../panels/network/net-device-wifi.c:1190 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." msgstr "" -"Jeśli komputer ma połączenie z Internetem inne niż bezprzewodowe, to można " +"Jeśli komputer ma połączenie z Internetem inne niż bezprzewodowe, to można " "ustawić hotspot bezprzewodowy do udostępniania połączenia innym." -#: ../panels/network/net-device-wifi.c:1194 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" -"Przełączanie na hotspot bezprzewodowy spowoduje rozłączenie z sieci %s%s." -#: ../panels/network/net-device-wifi.c:1198 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" -"Nie można połączyć się z Internetem bezprzewodowo, kiedy hotspot jest " +"Nie można połączyć się z Internetem bezprzewodowo, kiedy hotspot jest " "aktywny." -#: ../panels/network/net-device-wifi.c:1281 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" -msgstr "Zatrzymać hotspot i rozłączyć wszystkich użytkowników?" +msgstr "Zatrzymać hotspot i rozłączyć wszystkich użytkowników?" -#: ../panels/network/net-device-wifi.c:1284 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Zatrzymaj hotspot" -#: ../panels/network/net-device-wifi.c:1348 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Polityka systemu uniemożliwia użycie jako hotspot" -#: ../panels/network/net-device-wifi.c:1351 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Urządzenie bezprzewodowe nie obsługuje trybu hotspot" -#: ../panels/network/net-device-wifi.c:1480 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "" -"Informacje o zaznaczonych sieciach, w tym hasła i konfiguracja, zostaną " +"Informacje o zaznaczonych sieciach, w tym hasła i konfiguracja, zostaną " "utracone." -#: ../panels/network/net-device-wifi.c:1795 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historia" -#: ../panels/network/net-device-wifi.c:1799 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2701,7 +2694,7 @@ msgstr "_Zamknij" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1807 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Zapomnij" @@ -2738,6 +2731,10 @@ msgid "Provider" msgstr "Dostawca" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Sieć" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2844,15 +2841,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Hasło" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Brak" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Wyświetlanie h_asła" @@ -2875,7 +2868,7 @@ #: ../panels/network/network-wifi.ui.h:30 msgid "Shared with other computers" -msgstr "Współdzielone z innymi komputerami" +msgstr "Współdzielone z innymi komputerami" #: ../panels/network/network-wifi.ui.h:33 msgid "_Ignore automatically obtained routes" @@ -2910,7 +2903,7 @@ "Remove all details relating to this network and do not try to automatically " "connect to it." msgstr "" -"Usuwa wszystkie informacji o tej sieci i nie próbuje się z nią automatycznie " +"Usuwa wszystkie informacji o tej sieci i nie próbuje się z nią automatycznie " "łączyć." #: ../panels/network/network-wifi.ui.h:45 @@ -2943,16 +2936,15 @@ #: ../panels/network/network-wifi.ui.h:57 msgid "_Connect to Hidden Network…" -msgstr "_Połącz z ukrytą siecią…" +msgstr "_Połącz z ukrytą siecią…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historia" #: ../panels/network/network-wifi.ui.h:59 msgid "Switch off to connect to a Wi-Fi network" -msgstr "Należy wyłączyć, aby połączyć się z siecią Wi-Fi" +msgstr "Należy wyłączyć, aby połączyć się z siecią Wi-Fi" #: ../panels/network/network-wifi.ui.h:60 msgid "Network Name" @@ -2968,360 +2960,338 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Hasło" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Stan nieznany" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Niezarządzane" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Niedostępne" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Łączenie" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Wymagane jest uwierzytelnienie" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Połączone" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Rozłączanie" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Połączenie się nie powiodło" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Stan nieznany (brak)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Niepołączone" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfiguracja się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Konfiguracja adresu IP się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Konfiguracja adresu IP wygasła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Wymagane są hasła, których nie podano" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Suplikant 802.1x się rozłączył" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Konfiguracja suplikanta 802.1x się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Suplikant 802.1x się nie powiódł" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Suplikant 802.1x za długo się uwierzytelniał" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Uruchomienie usługi PPP się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Usługa PPP została rozłączona" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Usługa PPP się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Uruchomienie klienta DHCP się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Błąd klienta DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Klient DHCP się nie powiódł" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Uruchomienie usługi współdzielonego połączenie się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Usługa współdzielonego połączenia się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "" "Uruchomienie usługi automatycznego wykrywania adresu IP się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Błąd usługi automatycznego wykrywania adresu IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Usługa automatycznego wykrywania adresu IP się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linia jest zajęta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Brak wybierania tonowego" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nie można ustanowić żadnego operatora" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Żądanie wdzwonienia przekroczyło czas oczekiwania" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Próba wdzwonienia się nie powiodła" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Zainicjowanie modemu się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Wybranie podanego APN się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Sieci nie są wyszukiwane" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Odmówiono rejestracji sieci" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Rejestracja sieci przekroczyła czas oczekiwania" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Zarejestrowanie za pomocą żądanej sieci się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Sprawdzenie kodu PIN się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Brak oprogramowania sprzętowego urządzenia" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Połączenie zniknęło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Przyjęto istniejące połączenie" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Nie odnaleziono modemu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Połączenie Bluetooth się nie powiodło" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Nie włożono karty SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Wymagany jest PIN karty SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Wymagany jest kod PUK karty SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Błędna karta SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Urządzenie InfiniBand nie obsługuje trybu połączonego" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Zależność połączenia się nie powiodła" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Brak oprogramowania sprzętowego" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabel jest niepodłączony" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nie wybrano certyfikatu CA" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "nieokreślony błąd w zabezpieczeniach 802.1x security (WPA-EAP)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nie wybrano żadnego pliku" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Nieskorzystanie z certyfikatu CA może spowodować połączenia z " -"niezabezpieczonymi sieciami Wi-Fi. Czy wybrać certyfikat CA?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorowanie" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Wybór certyfikatu CA" +msgid "unspecified error validating eap-method file" +msgstr "nieokreślony błąd podczas sprawdzania poprawności pliku eap-method" -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Certyfikaty DER, PEM lub klucze prywatne PKCS#12 (*.der, *.pem, *.p12)" +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "" +"Certyfikaty DER, PEM lub klucze prywatne PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certyfikaty DER lub PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "brak pliku PAC EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Wybór pliku PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Pliki PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Plik PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Wewnętrzne uw_ierzytelnianie" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Za_bezpieczanie PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3330,42 +3300,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonimowo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Uwierzytelnienie" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Oba" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Plik PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Wewnętrzne uw_ierzytelnianie" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Automatyczne za_bezpieczanie PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "brak nazwy użytkownika EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "brak hasła EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nazwa _użytkownika" # checkbox #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Wyświetlanie hasła" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "nieprawidłowy certyfikat CA EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "nieprawidłowy certyfikat CA EAP-PEAP: nie podano certyfikatu" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Wybór certyfikatu CA" @@ -3383,19 +3385,56 @@ msgid "C_A certificate" msgstr "Certyfikat C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Certyfikat CA nie jest _wymagany" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Wersja PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Pytanie o hasło za każdym razem" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "brak nazwy użytkownika EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "brak hasła EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "brak tożsamości EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "nieprawidłowy certyfikat CA EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "nieprawidłowy certyfikat CA EAP-TLS: nie podano certyfikatu" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "nieprawidłowe hasło EAP-TLS: brak" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "nieprawidłowy klucz prywatny EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "nieprawidłowy certyfikat użytkownika EAP-TLS: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Niezaszyfrowane klucze prywatne są niezabezpieczone" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3409,11 +3448,11 @@ "\n" "(można ochronić klucz prywatny hasłem za pomocą oprogramowania OpenSSL)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Wybór osobistego certyfikatu" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Wybór klucza prywatnego" @@ -3425,51 +3464,56 @@ msgid "_User certificate" msgstr "Certyfikat _użytkownika" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Klucz prywatny" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Hasło klucza prywatnego" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "nieprawidłowy certyfikat CA EAP-TTLS: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "nieprawidłowy certyfikat CA EAP-TTLS: nie podano certyfikatu" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Bez ostrzegania pono_wnie" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nie" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Tak" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Nieznany błąd podczas sprawdzania poprawności zabezpieczeń 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunelowane TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Chronione EAP (PEAP)" @@ -3479,6 +3523,49 @@ msgid "Au_thentication" msgstr "Uwierzy_telnianie" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "brak nazwy użytkownika LEAP" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "brak hasła LEAP" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "brak klucza WEP" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"nieprawidłowy klucz WEP: klucz o długości %zu może zawierać tylko cyfry " +"szesnastkowe" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"nieprawidłowy klucz WEP: klucz o długości %zu może zawierać tylko znaki ASCII" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"nieprawidłowy klucz WEP: błędna długość klucza %zu. Klucz musi być długości " +"5/13 (ASCII) lub 10/26 (szesnastkowy)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "nieprawidłowy klucz WEP: hasło nie może być puste" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "nieprawidłowy klucz WEP: hasło musi być krótsze niż 64 znaki" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (domyślnie)" @@ -3516,14 +3603,29 @@ msgid "WEP inde_x" msgstr "Inde_ks WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"nieprawidłowe WPA-PSK: nieprawidłowa długość klucza %zu. Musi mieć [8,63] " +"bajtów lub 64 cyfry szesnastkowe" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"nieprawidłowe WPA-PSK: nie można zinterpretować klucza o 64 bajtach jako " +"szesnastkowy" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Typ" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3565,16 +3667,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Wyświetlanie t_reści wiadomości na ekranie blokady" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Po­wia­do­mie­nia" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" -msgstr "Kontrola wyświetlania powiadomień i ich treści" +msgstr "Kontrola wyświetlania powiadomień i ich treści" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Powiadomienia;Notyfikacje;Baner;Banner;Wiadomość;Komunikat;Obszar;Tacka;Tray;" @@ -3594,79 +3697,68 @@ msgid "Applications" msgstr "Programy" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Inne" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Dodanie konta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Poczta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendarz" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakty" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Komunikator" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Zasoby" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Błąd podczas logowania do konta" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Dane uwierzytelniające wygasły." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Proszę się zalogować, aby włączyć to konto." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Zaloguj" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Błąd podczas tworzenia konta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Błąd podczas usuwania konta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Na pewno usunąć konto?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Nie spowoduje to usunięcia konta na serwerze." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Usuń" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Kon­ta on­line" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" -msgstr "Łączenie z kontami online i ustalanie, do czego mają być używane" +msgstr "Łączenie z kontami online i ustalanie, do czego mają być używane" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3680,6 +3772,7 @@ msgstr "Nie skonfigurowano żadnych kont online" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Usuń konto" @@ -3693,7 +3786,7 @@ "contacts, calendar, chat and more." msgstr "" "Dodanie konta umożliwia programom dostęp do dokumentów, poczty, kontaktów, " -"kalendarza, komunikatora i wielu innych." +"kalendarza, komunikatora i wielu innych." #: ../panels/power/cc-power-panel.c:253 msgid "Unknown time" @@ -3746,7 +3839,7 @@ #: ../panels/power/cc-power-panel.c:307 #, c-format msgid "Caution: %s remaining" -msgstr "Ostrzeżenie, pozostało: %s" +msgstr "Uwaga, pozostało: %s" #. TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" #: ../panels/power/cc-power-panel.c:312 @@ -3757,7 +3850,7 @@ #. TRANSLATORS: primary battery #: ../panels/power/cc-power-panel.c:317 ../panels/power/cc-power-panel.c:345 msgid "Fully charged" -msgstr "W pełni naładowany" +msgstr "W pełni naładowany" #. TRANSLATORS: primary battery #: ../panels/power/cc-power-panel.c:321 ../panels/power/cc-power-panel.c:349 @@ -3826,7 +3919,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Akumulator" @@ -3840,7 +3933,7 @@ #: ../panels/power/cc-power-panel.c:622 msgctxt "Battery power" msgid "Caution" -msgstr "Ostrzeżenie" +msgstr "Uwaga" #. TRANSLATORS: secondary battery #: ../panels/power/cc-power-panel.c:627 @@ -3858,7 +3951,7 @@ #: ../panels/power/cc-power-panel.c:637 msgctxt "Battery power" msgid "Fully charged" -msgstr "W pełni naładowany" +msgstr "W pełni naładowany" #. TRANSLATORS: primary battery #: ../panels/power/cc-power-panel.c:641 @@ -3874,104 +3967,105 @@ msgid "When _idle" msgstr "Podczas _bezczynności" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Oszczędzanie energii" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "_Jasność ekranu" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Automatyczna jasność" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "J_asność klawiatury" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "_Przygaszanie ekranu podczas bezczynności" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "_Wygaszanie ekranu" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Wyłączenie urządzenia Wi-Fi oszczędza zasilanie." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "_Komórkowe" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Wyłączenie połączeń komórkowych (3G, 4G, LTE itp.) oszczędza zasilanie." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" -msgstr "Na zasilaniu z akumulatora" +msgstr "Na zasilaniu z akumulatora" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "Kiedy jest podłączony" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Uśpienie" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Hibernacja" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Nic" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" -msgstr "Przycisk usypiania i zasilania" +msgstr "Przycisk usypiania i zasilania" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "_Automatyczne usypianie" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Automatyczne usypianie" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "_Po wciśnięciu przycisku zasilania" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Urządzenia" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Za­si­la­nie" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" -"Wyświetlanie stanu naładowania akumulatora i zmiana ustawień oszczędzania " +"Wyświetlanie stanu naładowania akumulatora i zmiana ustawień oszczędzania " "energii" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4046,17 +4140,12 @@ #: ../panels/power/power.ui.h:20 msgid "On _Battery Power" -msgstr "Na zasilaniu z _akumulatora" +msgstr "Na zasilaniu z _akumulatora" #: ../panels/power/power.ui.h:21 ../panels/universal-access/uap.ui.h:33 msgid "Delay" msgstr "Opóźnienie" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Anuluj" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Uwierzytelnij" @@ -4066,138 +4155,138 @@ msgstr "Wymagane jest uwierzytelnienie" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Mało tonera" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Brak tonera" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Mało wywoływacza" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Brak wywoływacza" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Mało atramentu" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Brak atramentu" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Otwarta pokrywa" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Otwarte drzwiczki" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Mało papieru" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Brak papieru" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Offline" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Zatrzymana" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Pojemnik na odpady jest prawie pełny" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Pojemnik na odpady jest pełny" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "Warstwa światłoczuła ledwo działa" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "Warstwa światłoczuła już nie działa" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Konfigurowanie" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Gotowa" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Nie przyjmuje zadań" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "Przetwarzanie" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Poziom tonera" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Poziom atramentu" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Poziom" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Instalowanie" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4206,15 +4295,15 @@ msgstr[2] "%u aktywnych" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Dodanie nowej drukarki się nie powiodło." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Wybór pliku PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4222,50 +4311,47 @@ "Pliki PostScriptowego opisu drukarki (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Nie odnaleziono odpowiedniego sterownika" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Wyszukiwanie preferowanych sterowników…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" -msgstr "Wybierz z bazy danych…" +msgstr "Wybierz z bazy danych…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Dostarcz plik PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Strona testowa" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Brak drukarek" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Nie można wczytać interfejsu użytkownika: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Dru­kar­ki" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" -"Dodawanie drukarek, wyświetlanie zadań drukowania i ustalanie sposobu " +"Dodawanie drukarek, wyświetlanie zadań drukowania i ustalanie sposobu " "drukowania" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Drukarka;Kolejka;Drukowanie;Papier;Atrament;Tusz;Toner;CUPS;IPP;" @@ -4427,6 +4513,11 @@ msgid "Parallel Port" msgstr "Port równoległy" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4578,8 +4669,8 @@ #, c-format msgid "Enter your username and password to view printers available on %s." msgstr "" -"Proszę wprowadzić nazwę użytkownika i hasło, aby wyświetlić drukarki " -"dostępne w %s." +"Proszę wprowadzić nazwę użytkownika i hasło, aby wyświetlić drukarki " +"dostępne w %s." #: ../panels/printers/printers.ui.h:1 msgid "Add Printer" @@ -4639,104 +4730,109 @@ msgid "_Options" msgstr "_Opcje" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Brak drukarek" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Dodaj drukarkę" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." msgstr "Systemowa usługa drukowania jest niedostępna." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Blokada ekranu" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Używane" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Włączone" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Wyłączone" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Usługi położenia" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" -msgstr "Użycie i historia" +msgstr "Użycie i historia" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" -msgstr "Usunąć wszystkie elementy z kosza?" +msgstr "Usunąć wszystkie elementy z kosza?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." -msgstr "Wszystkie elementy w koszu zostaną trwale usunięte." +msgstr "Wszystkie elementy w koszu zostaną trwale usunięte." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Opróżnij kosz" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Usunąć wszystkie pliki tymczasowe?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Wszystkie pliki tymczasowe zostaną trwale usunięte." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Usuń pliki tymczasowe" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" -msgstr "Usuwanie plików w koszu i plików tymczasowych" +msgstr "Usuwanie plików w koszu i plików tymczasowych" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Użycie oprogramowania" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Zgłaszanie problemów" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " "anonymously and are scrubbed of personal data." msgstr "" -"Wysyłanie informacji o problemach technicznych pomaga ulepszyć system %s. " -"Zgłoszenia są anonimowe i pozbawione danych osobistych." +"Wysyłanie informacji o problemach technicznych pomaga ulepszyć system %s. " +"Zgłoszenia są anonimowe i pozbawione danych osobistych." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Polityka prywatności" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Pry­wat­ność" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" -msgstr "Ochrona informacji osobistych i kontrola nad tym, co widzą inni" +msgstr "Ochrona informacji osobistych i kontrola nad tym, co widzą inni" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4800,7 +4896,7 @@ "never shared over the network." msgstr "" "Zapamiętywanie historii ułatwia ponowne odnajdywanie rzeczy. Te elementy " -"nigdy nie są udostępniane w sieci." +"nigdy nie są udostępniane w sieci." #: ../panels/privacy/privacy.ui.h:21 msgid "_Recently Used" @@ -4836,7 +4932,7 @@ "Automatically purge the Trash and temporary files to help keep your computer " "free of unnecessary sensitive information." msgstr "" -"Automatyczne usuwanie plików z kosza i plików tymczasowych uwalnia komputer " +"Automatyczne usuwanie plików z kosza i plików tymczasowych uwalnia komputer " "od niepotrzebnych informacji osobistych." #: ../panels/privacy/privacy.ui.h:31 @@ -4860,11 +4956,11 @@ "All the information we collect is made anonymous, and we will never share " "your data with third parties." msgstr "" -"Wysyłanie informacji o używanym oprogramowaniu pomaga nam dostarczać " -"dokładniejsze zalecane ustawienia. Pomaga to także w ulepszaniu naszych " +"Wysyłanie informacji o używanym oprogramowaniu pomaga nam dostarczać " +"dokładniejsze zalecane ustawienia. Pomaga to także w ulepszaniu naszych " "programów.\n" "\n" -"Wszystkie zbierane informacje są anonimowe i nigdy nie będą udostępniane " +"Wszystkie zbierane informacje są anonimowe i nigdy nie będą udostępniane " "nikomu innemu." #: ../panels/privacy/privacy.ui.h:40 @@ -4877,7 +4973,7 @@ "mobile broadband increases accuracy." msgstr "" "Usługi położenia umożliwiają programom ustalanie położenia geograficznego. " -"Użycie Wi-Fi i połączenia komórkowego zwiększa dokładność." +"Użycie Wi-Fi i połączenia komórkowego zwiększa dokładność." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4910,21 +5006,21 @@ msgid "Other" msgstr "Inne" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Sesja musi zostać ponownie uruchomiona, aby zastosować zmiany" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Uruchom ponownie" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nie wybrano żadnego źródła wprowadzania" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Ekran logowania" @@ -4956,18 +5052,19 @@ msgid "Paper" msgstr "Papier" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Re­gion i ję­zyk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Re­gion i ję­zyk" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" -"Wybór języka wyświetlania, formatów, układów klawiatury i źródeł wprowadzania" +"Wybór języka wyświetlania, formatów, układów klawiatury i źródeł wprowadzania" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Język;Dialekt;Układ;Layout;Klawiatura;Wprowadzanie;Wejście;Pisanie;" @@ -5013,7 +5110,7 @@ #: ../panels/region/input-options.ui.h:9 msgid "You can change these shortcuts in the keyboard settings" -msgstr "Można zmienić te skróty w ustawieniach klawiatury" +msgstr "Można zmienić te skróty w ustawieniach klawiatury" #: ../panels/region/input-options.ui.h:10 msgid "Alternative switch to next source" @@ -5024,7 +5121,7 @@ msgstr "Lewy+prawy Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Język" @@ -5054,11 +5151,11 @@ #: ../panels/region/region.ui.h:9 msgid "Move input source up" -msgstr "Przenosi źródło wprowadzania w górę" +msgstr "Przenosi źródło wprowadzania w górę" #: ../panels/region/region.ui.h:10 msgid "Move input source down" -msgstr "Przenosi źródło wprowadzania w dół" +msgstr "Przenosi źródło wprowadzania w dół" #: ../panels/region/region.ui.h:11 msgid "Configure input source" @@ -5074,26 +5171,11 @@ "Ustawienia logowania są używane przez wszystkich użytkowników podczas " "logowania do systemu" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Miejsca" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Zakładki" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Inne" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Wybór położenia" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5101,18 +5183,19 @@ msgid "No applications found" msgstr "Nie odnaleziono programów" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Wy­szu­ki­wa­nie" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Kontrola programów wyświetlających wyniki wyszukiwania na ekranie podglądu" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Wyszukiwanie;Znajdź;Szukaj;Wyszukaj;Indeksowanie;Index;Ukryj;Ukrywanie;" @@ -5122,18 +5205,35 @@ msgid "Search Locations" msgstr "Położenia wyszukiwania" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Miejsca" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Zakładki" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Inne" + #: ../panels/search/search.ui.h:1 msgid "Move Up" -msgstr "Przenieś w górę" +msgstr "Przenieś w górę" #: ../panels/search/search.ui.h:2 msgid "Move Down" -msgstr "Przenieś w dół" +msgstr "Przenieś w dół" #: ../panels/search/search.ui.h:3 msgid "Preferences" msgstr "Preferencje" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nie wybrano żadnych sieci do udostępniania" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5165,24 +5265,25 @@ "Personal File Sharing allows you to share your Public folder with others on " "your current network using: dav://%s" msgstr "" -"Udostępnianie plików osobistych umożliwia udostępnianie katalogu Publiczne z " -"innymi użytkownikami bieżącej sieci używając: dav://%s" +"Udostępnianie plików osobistych umożliwia udostępnianie katalogu Publiczne " +"z innymi użytkownikami bieżącej sieci za pomocą: dav://" +"%s" #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Umożliwia zdalnym użytkownikom na łączenie się używając polecenia SSH:\n" +"Umożliwia zdalnym użytkownikom na łączenie się za pomocą polecenia SSH:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" "Umożliwia zdalnym użytkownikom na wyświetlanie lub kontrolowanie ekranu " "przez połączenie się z: vnc://%s" @@ -5192,16 +5293,20 @@ msgstr "Skopiuj" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" -msgstr "Udo­stęp­nia­nie" +msgstr "Udostępnianie" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Udo­stęp­nia­nie" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" -msgstr "Kontrola udostępniania z innymi użytkownikami" +msgstr "Kontrola udostępniania z innymi użytkownikami" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5211,6 +5316,10 @@ "multimedia;media;dźwięk;audio;wideo;obraz;video;zdjęcia;filmy;serwer;" "renderer;rygel;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Sieci" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Włączenie lub wyłączenie zdalnego logowania" @@ -5220,25 +5329,13 @@ msgstr "" "Wymagane jest uwierzytelnienie, aby włączyć lub wyłączyć zdalne logowanie" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nie wybrano żadnych sieci do udostępniania" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Sieci" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nazwa _komputera" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Udostępnianie plików _osobistych" +msgid "_File Sharing" +msgstr "Ud_ostępnianie plików" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5254,11 +5351,11 @@ #: ../panels/sharing/sharing.ui.h:6 msgid "Some services are disabled because of no network access." -msgstr "Niektóre usługi są wyłączone z powodu braku dostępu do sieci." +msgstr "Niektóre usługi są wyłączone z powodu braku dostępu do sieci." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Udostępnianie plików osobistych" +msgid "File Sharing" +msgstr "Udostępnianie plików" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5273,8 +5370,8 @@ msgstr "Udostępnianie ekranu" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "Z_dalna kontrola" +msgid "_Allow connections to control the screen" +msgstr "_Połączenia mogą kontrolować ekran" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5290,7 +5387,7 @@ #: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" -msgstr "_Nowe połączenia muszą prosić o dostęp" +msgstr "_Nowe połączenia muszą prosić o dostęp" #: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" @@ -5301,11 +5398,8 @@ msgstr "Udostępnianie multimediów" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Udostępnianie multimediów umożliwia dzielenie się muzyką, zdjęciami i " -"filmami przez sieć." +msgid "Share music, photos and videos over the network." +msgstr "Udostępnianie muzyki, zdjęć i filmów przez sieć." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5318,7 +5412,7 @@ #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2 msgid "Change sound levels, inputs, outputs, and alert sounds" msgstr "" -"Zmiana poziomu głośności, wejść i wyjść dźwięku oraz zdarzeń dźwiękowych" +"Zmiana poziomu głośności, wejść i wyjść dźwięku oraz zdarzeń dźwiękowych" #. Translators: those are keywords for the sound control-center panel #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4 @@ -5441,11 +5535,6 @@ msgid "Peak detect" msgstr "Wykrywanie szczytów sygnału" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nazwa" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Urządzenie" @@ -5521,7 +5610,7 @@ #: ../panels/sound/gvc-sound-theme-chooser.c:555 msgid "From theme" -msgstr "Z motywu" +msgstr "Z motywu" #: ../panels/sound/gvc-sound-theme-chooser.c:740 msgid "C_hoose an alert sound:" @@ -5542,14 +5631,19 @@ #: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" -msgstr "Własny" +msgstr "Niestandardowy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Uła­twie­nia do­stę­pu" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" -msgstr "Ułatwienia widzenia, słyszenia, pisania oraz wskazywania i klikania" +msgstr "Ułatwienia widzenia, słyszenia, pisania oraz wskazywania i klikania" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5615,7 +5709,7 @@ #: ../panels/universal-access/uap.ui.h:16 msgid "Pointing & Clicking" -msgstr "Wskazywanie i klikanie" +msgstr "Wskazywanie i klikanie" #: ../panels/universal-access/uap.ui.h:17 msgid "_Mouse Keys" @@ -5650,8 +5744,9 @@ msgstr "Słyszalne klawisze" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Sygnał dźwiękowy, kiedy klawisz Num Lock lub Caps Lock jest włączony." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Sygnał dźwiękowy, kiedy klawisz Num Lock lub Caps Lock został przełączony." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5699,7 +5794,7 @@ #: ../panels/universal-access/uap.ui.h:38 msgid "Cursor blinks in text fields." -msgstr "Miganie kursora w polach tekstowych." +msgstr "Miganie kursora w polach tekstowych." #: ../panels/universal-access/uap.ui.h:39 msgid "Cursor blinking speed" @@ -5731,7 +5826,7 @@ #: ../panels/universal-access/uap.ui.h:46 msgid "Puts a delay between when a key is pressed and when it is accepted" -msgstr "Umieszcza opóźnienie między naciśnięciem klawisza a jego akceptacją" +msgstr "Umieszcza opóźnienie między naciśnięciem klawisza a jego akceptacją" #: ../panels/universal-access/uap.ui.h:47 msgid "A_cceptance delay:" @@ -6033,95 +6128,67 @@ msgstr "Zmiana kolorów" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Dodanie użytkownika" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Imię i _nazwisko" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standardowe" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrator" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Imię i _nazwisko" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Typ konta" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Użytkownik będzie mógł wybrać hasło podczas następnego _logowania" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Ustawienie hasła _teraz" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_Potwierdzenie" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Logowanie firmowe umożliwia używanie istniejącego, centralnie zarządzanego " -"konta użytkownika na tym urządzeniu." +"konta użytkownika na tym urządzeniu. Można użyć tego konta także do " +"uzyskania dostępu do zasobów firmy w Internecie." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domena" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Należy przejść do trybu online,\n" -"aby dodać firmowe konta logowania." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "L_ogowania firmowe" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Dodanie użytkownika" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Zapisz" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Login administratora domeny" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Aby używać tej logowania firmowego, komputer wymaga zapisania\n" -"do domeny. Należy poprosić administratora sieci, aby wpisał\n" -"hasło domeny w tym miejscu." +msgid "You are Offline" +msgstr "Tryb offline" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nazwa administratora" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Firmowe konta logowania można dodawać tylko w trybie online." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Hasło administratora" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "L_ogowania firmowe" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6156,7 +6223,7 @@ msgstr "Prawy mały palec" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Włączenie logowania za pomocą odcisku palca" @@ -6186,7 +6253,7 @@ #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:2 msgid "Add or remove users and change your password" -msgstr "Dodawanie lub usuwanie użytkowników i zmienianie hasła" +msgstr "Dodawanie lub usuwanie użytkowników i zmienianie hasła" #. Translators: those are keywords for the user accounts control-center panel #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4 @@ -6197,9 +6264,32 @@ "Administrator;Firmowe;Centralne;Uwierzytelnianie;Authentication;Enterprise;" "Kerberos;KRB5;Hesiod;LDAP;NSS;NIS;Winbind;Samba;SSSD;IPA;FreeIPA;Język;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Historia logowania" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Zapisz" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Login administratora domeny" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Aby używać tej logowania firmowego, komputer wymaga zapisania\n" +"do domeny. Należy poprosić administratora sieci, aby wpisał\n" +"hasło domeny w tym miejscu." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nazwa administratora" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Hasło administratora" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6222,38 +6312,30 @@ msgstr "Obecne _hasło" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Użytkownik będzie mógł wybrać hasło podczas następnego logowania" +msgid "Allow user to change their password on next login" +msgstr "Użytkownik będzie mógł zmienić hasło podczas następnego logowania" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Ustawienie hasła teraz" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Dodaj konto użytkownika" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Usuń konto użytkownika" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Dodaj użytkownika…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opcje logowania" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Logowanie a_utomatyczne" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Logowania za pomocą _odcisku palca" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ikona użytkownika" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Ostatnie logowanie" @@ -6288,12 +6370,12 @@ #: ../panels/user-accounts/pw-utils.c:89 msgctxt "Password hint" msgid "Try to avoid using your name in the password." -msgstr "Proszę unikać używania nazwiska w haśle." +msgstr "Proszę unikać używania nazwiska w haśle." #: ../panels/user-accounts/pw-utils.c:91 msgctxt "Password hint" msgid "Try to avoid some of the words included in the password." -msgstr "Proszę unikać niektórych słów zawartych w haśle." +msgstr "Proszę unikać niektórych słów zawartych w haśle." #: ../panels/user-accounts/pw-utils.c:95 msgctxt "Password hint" @@ -6303,7 +6385,7 @@ #: ../panels/user-accounts/pw-utils.c:97 msgctxt "Password hint" msgid "Try to avoid reordering existing words." -msgstr "Proszę unikać zmieniania kolejności liter w istniejących słowach." +msgstr "Proszę unikać zmieniania kolejności liter w istniejących słowach." #: ../panels/user-accounts/pw-utils.c:99 msgctxt "Password hint" @@ -6330,7 +6412,7 @@ #: ../panels/user-accounts/pw-utils.c:107 msgctxt "Password hint" msgid "Try to use a mixture of letters, numbers and punctuation." -msgstr "Proszę spróbować użyć mieszanki liter, liczb i znaków przestankowych." +msgstr "Proszę spróbować użyć mieszanki liter, liczb i znaków przestankowych." #: ../panels/user-accounts/pw-utils.c:109 msgctxt "Password hint" @@ -6344,7 +6426,7 @@ "letters, numbers and punctuation." msgstr "" "Proszę unikać powtarzania tego samego typu znaku: należy mieszać litery, " -"liczby i znaki przestankowe." +"liczby i znaki przestankowe." #: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" @@ -6354,13 +6436,13 @@ #: ../panels/user-accounts/pw-utils.c:115 msgctxt "Password hint" msgid "Try to add more letters, numbers and symbols." -msgstr "Proszę spróbować dodać więcej liter, liczb i symboli." +msgstr "Proszę spróbować dodać więcej liter, liczb i symboli." #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "" -"Proszę spróbować mieszać wielkie i małe litery, a także użyć liczby lub " +"Proszę spróbować mieszać wielkie i małe litery, a także użyć liczby lub " "dwóch." #: ../panels/user-accounts/pw-utils.c:119 @@ -6369,7 +6451,7 @@ "Good password! Adding more letters, numbers and punctuation will make it " "stronger." msgstr "" -"Dobre hasło! Dodawanie więcej liter, liczb i znaków przestankowych uczyni je " +"Dobre hasło! Dodawanie więcej liter, liczb i znaków przestankowych uczyni je " "silniejszym." #: ../panels/user-accounts/pw-utils.c:141 @@ -6452,32 +6534,32 @@ msgstr "Nieznany błąd" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Powinno zgadzać się z adresem WWW dostawcy konta." +msgid "Should match the web address of your login provider." +msgstr "Powinno zgadzać się z adresem WWW dostawcy konta." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Dodanie konta się nie powiodło" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Hasła się nie zgadzają." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Zarejestrowanie konta się nie powiodło" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" -msgstr "Brak obsługiwanego sposobu na uwierzytelnienie w tej domenie" +msgstr "Brak obsługiwanego sposobu na uwierzytelnienie w tej domenie" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Dołączenie do domeny się nie powiodło" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6485,7 +6567,7 @@ "Ten login nie zadziałał.\n" "Proszę spróbować ponownie." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6493,42 +6575,52 @@ "To hasło nie zadziałało.\n" "Proszę spróbować ponownie." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Zalogowanie do domeny się nie powiodło" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Nie można odnaleźć domeny. Może ją niepoprawnie wpisano?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standardowe" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrator" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" -"Brak dostępu do urządzenia. Proszę skontaktować się z administratorem " +"Brak dostępu do urządzenia. Proszę skontaktować się z administratorem " "systemu." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." -msgstr "Urządzenie jest już w użyciu." +msgstr "Urządzenie jest już w użyciu." -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Wystąpił wewnętrzny błąd." -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Włączone" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Usunąć zarejestrowane odciski palców?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Usuń odciski palców" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6536,15 +6628,15 @@ "Usunąć zarejestrowane odciski palców, aby wyłączyć logowanie za pomocą " "czytnika odcisków palców?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Gotowe" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Nie można uzyskać dostępu do urządzenia „%s”" @@ -6552,39 +6644,39 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" -msgstr "Nie można uruchomić przechwytywania odcisków palców w urządzeniu „%s”" +msgstr "Nie można uruchomić przechwytywania odcisków palców w urządzeniu „%s”" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Nie można uzyskać dostępu do żadnych czytników odcisków palców" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "" -"Proszę się skontaktować z administratorem systemu w celu uzyskania pomocy." +"Proszę się skontaktować z administratorem systemu w celu uzyskania pomocy." #. translators: #. * The variable is the name of the device, for example: #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "" -"Aby uruchomić logowanie za pomocą czytnika odcisków palców należy zapisać " -"odcisk palca, używając urządzenia „%s”." +"Aby włączyć logowanie czytnikiem odcisków palców, należy zapisać odcisk " +"palca za pomocą urządzenia „%s”." -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Wybieranie palca" -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Pobieranie odcisków palców" @@ -6646,6 +6738,13 @@ msgid "Session Started" msgstr "Początek sesji" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — aktywność konta" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Proszę wybrać inne hasło." @@ -6696,7 +6795,7 @@ #: ../panels/user-accounts/um-realm-manager.c:829 #, c-format msgid "Cannot log in as %s at the %s domain" -msgstr "Nie można zalogować jako %s w domenie %s" +msgstr "Nie można zalogować jako %s w domenie %s" #: ../panels/user-accounts/um-realm-manager.c:821 msgid "Invalid password, please try again" @@ -6705,9 +6804,9 @@ #: ../panels/user-accounts/um-realm-manager.c:834 #, c-format msgid "Couldn't connect to the %s domain: %s" -msgstr "Nie można połączyć z domeną %s: %s" +msgstr "Nie można połączyć z domeną %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Inne konta" @@ -6735,8 +6834,8 @@ "Deleting a user while they are logged in can leave the system in an " "inconsistent state." msgstr "" -"Usunięcie użytkownika, kiedy jest wciąż zalogowany może pozostawić system w " -"niespójnym stanie." +"Usunięcie wciąż zalogowanego użytkownika może pozostawić system w niespójnym " +"stanie." #: ../panels/user-accounts/um-user-panel.c:696 #, c-format @@ -6748,7 +6847,7 @@ "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." msgstr "" -"Możliwe jest zachowanie katalogu domowego, kolejki poczty i plików " +"Możliwe jest zachowanie katalogu domowego, kolejki poczty i plików " "tymczasowych podczas usuwania konta użytkownika." #: ../panels/user-accounts/um-user-panel.c:703 @@ -6787,16 +6886,16 @@ msgid "Logged in" msgstr "Zalogowany" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" -msgstr "Skontaktowanie się z usługą kont się nie powiodło" +msgstr "Skontaktowanie się z usługą kont się nie powiodło" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" -"Proszę się upewnić, że usługa AccountService jest zainstalowana i włączona." +"Proszę się upewnić, że usługa AccountService jest zainstalowana i włączona." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6804,12 +6903,12 @@ "Aby wprowadzić zmiany,\n" "najpierw należy kliknąć ikonę *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Tworzy konto użytkownika" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6817,12 +6916,12 @@ "Aby utworzyć konto użytkownika,\n" "najpierw należy kliknąć ikonę *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Usuwa wybrane konto użytkownika" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6830,36 +6929,35 @@ "Aby usunąć wybrane konto użytkownika,\n" "najpierw należy kliknąć ikonę *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Moje konto" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Użytkownik o nazwie „%s” już istnieje." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Ta nazwa użytkownika jest niedostępna. Proszę wybrać inną." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Nazwa użytkownika jest za długa." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Nazwa użytkownika nie może zaczynać się od znaku „-”." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Nazwa użytkownika może zawierać tylko małe i wielkie litery z alfabetu " -"łacińskiego, cyfry oraz dowolne ze znaków: „.”, „-” i „_”." +"Nazwa użytkownika może zawierać tylko małe i wielkie litery z alfabetu " +"łacińskiego, cyfry oraz te znaki: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" -"Nazwa zostanie użyta do nazwania katalogu domowego i nie może być zmieniana." +"Nazwa zostanie użyta do nazwania katalogu domowego i nie może być zmieniana." #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" @@ -6875,7 +6973,7 @@ "shortcut button and hold down the new keys or press Backspace to clear." msgstr "" "Aby zmodyfikować skrót, należy wybrać działanie „Wyślij klawisze”, wcisnąć " -"przycisk skrótu klawiszowego i przytrzymać nowe klawisze lub nacisnąć " +"przycisk skrótu klawiszowego i przytrzymać nowe klawisze lub nacisnąć " "klawisz Backspace, aby wyczyścić obecne." #: ../panels/wacom/calibrator/calibrator-gui.c:83 @@ -6893,12 +6991,12 @@ #: ../panels/wacom/cc-wacom-button-row.c:442 msgctxt "Wacom tablet button" msgid "Up" -msgstr "W górę" +msgstr "W górę" #: ../panels/wacom/cc-wacom-button-row.c:443 msgctxt "Wacom tablet button" msgid "Down" -msgstr "W dół" +msgstr "W dół" #: ../panels/wacom/cc-wacom-button-row.h:54 msgctxt "Wacom action-type" @@ -6937,7 +7035,7 @@ #: ../panels/wacom/cc-wacom-nav-button.c:88 #, c-format msgid "%d of %d" -msgstr "%d z %d" +msgstr "%d z %d" #: ../panels/wacom/cc-wacom-page.c:522 msgid "Display Mapping" @@ -6947,19 +7045,19 @@ msgid "Button" msgstr "Przycisk" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Ta­blet fir­my Wa­com" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" -"Ustawienie mapowania przycisków i dostosowanie wrażliwości rysika dla " +"Ustawienie mapowania przycisków i dostosowanie wrażliwości rysika dla " "tabletów graficznych" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Rysik;Stylus;Gumka;Mysz;Myszka;" @@ -6991,6 +7089,10 @@ msgid "Bluetooth Settings" msgstr "Ustawienia Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet firmy Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapuj do monitora…" @@ -7126,19 +7228,19 @@ #: ../panels/wacom/wacom-stylus-page.ui.h:5 msgid "Scroll Up" -msgstr "Przewijanie w górę" +msgstr "Przewijanie w górę" #: ../panels/wacom/wacom-stylus-page.ui.h:6 msgid "Scroll Down" -msgstr "Przewijanie w dół" +msgstr "Przewijanie w dół" #: ../panels/wacom/wacom-stylus-page.ui.h:7 msgid "Scroll Left" -msgstr "Przewijanie w lewo" +msgstr "Przewijanie w lewo" #: ../panels/wacom/wacom-stylus-page.ui.h:8 msgid "Scroll Right" -msgstr "Przewijanie w prawo" +msgstr "Przewijanie w prawo" #: ../panels/wacom/wacom-stylus-page.ui.h:9 msgid "Back" @@ -7176,6 +7278,11 @@ msgid "Tip Pressure Feel" msgstr "Siła nacisku czubka" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Wszystkie ustawienia" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centrum sterowania GNOME" @@ -7210,7 +7317,7 @@ #: ../shell/cc-application.c:49 msgid "List possible panel names and exit" -msgstr "Wyświetla listę dostępnych paneli i kończy działanie" +msgstr "Wyświetla listę dostępnych paneli i kończy działanie" #: ../shell/cc-application.c:50 msgid "Panel to display" @@ -7232,22 +7339,18 @@ msgid "Quit" msgstr "Zakończ" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Wszystkie ustawienia" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Osobiste" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Sprzęt" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "System" @@ -7286,5 +7389,11 @@ msgid "Cancel search" msgstr "Anulowanie wyszukiwania" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + msgid "OS Type" msgstr "Typ systemu" diff -Nru gnome-control-center-3.20.2/po/POTFILES.in gnome-control-center-3.22.1/po/POTFILES.in --- gnome-control-center-3.20.2/po/POTFILES.in 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/POTFILES.in 2016-08-12 12:43:57.000000000 +0000 @@ -1,4 +1,4 @@ -# Add files with translateable strings here. +# List of source files containing translatable strings. # Please keep this file sorted alphabetically. [encoding: UTF-8] [type: gettext/glade]panels/background/background.ui @@ -41,10 +41,14 @@ panels/keyboard/01-screenshot.xml.in panels/keyboard/01-system.xml.in panels/keyboard/50-accessibility.xml.in +panels/keyboard/cc-keyboard-manager.c panels/keyboard/cc-keyboard-option.c +panels/keyboard/cc-keyboard-panel.c +panels/keyboard/cc-keyboard-shortcut-editor.c panels/keyboard/gnome-keyboard-panel.desktop.in.in [type: gettext/glade]panels/keyboard/gnome-keyboard-panel.ui panels/keyboard/keyboard-shortcuts.c +[type: gettext/glade]panels/keyboard/shortcut-editor.ui panels/mouse/cc-mouse-panel.c panels/mouse/gnome-mouse-panel.desktop.in.in panels/mouse/gnome-mouse-properties.c @@ -76,14 +80,10 @@ [type: gettext/glade]panels/network/connection-editor/vpn-page.ui [type: gettext/glade]panels/network/connection-editor/wifi-page.ui panels/network/gnome-network-panel.desktop.in.in -panels/network/net-device-bond.c -panels/network/net-device-bridge.c panels/network/net-device-ethernet.c panels/network/net-device-mobile.c -panels/network/net-device-team.c panels/network/net-device-wifi.c panels/network/net-proxy.c -panels/network/net-virtual-device.c panels/network/net-vpn.c [type: gettext/glade]panels/network/network-ethernet.ui [type: gettext/glade]panels/network/network-mobile.ui @@ -96,20 +96,24 @@ panels/network/wireless-security/eap-method.c panels/network/wireless-security/eap-method-fast.c [type: gettext/glade]panels/network/wireless-security/eap-method-fast.ui +panels/network/wireless-security/eap-method-leap.c [type: gettext/glade]panels/network/wireless-security/eap-method-leap.ui panels/network/wireless-security/eap-method-peap.c [type: gettext/glade]panels/network/wireless-security/eap-method-peap.ui +panels/network/wireless-security/eap-method-simple.c [type: gettext/glade]panels/network/wireless-security/eap-method-simple.ui panels/network/wireless-security/eap-method-tls.c [type: gettext/glade]panels/network/wireless-security/eap-method-tls.ui panels/network/wireless-security/eap-method-ttls.c [type: gettext/glade]panels/network/wireless-security/eap-method-ttls.ui -[type: gettext/glade]panels/network/wireless-security/nag-user-dialog.ui panels/network/wireless-security/wireless-security.c [type: gettext/glade]panels/network/wireless-security/ws-dynamic-wep.ui +panels/network/wireless-security/ws-leap.c [type: gettext/glade]panels/network/wireless-security/ws-leap.ui +panels/network/wireless-security/ws-wep-key.c [type: gettext/glade]panels/network/wireless-security/ws-wep-key.ui [type: gettext/glade]panels/network/wireless-security/ws-wpa-eap.ui +panels/network/wireless-security/ws-wpa-psk.c [type: gettext/glade]panels/network/wireless-security/ws-wpa-psk.ui panels/notifications/cc-edit-dialog.c panels/notifications/cc-notifications-panel.c @@ -155,11 +159,11 @@ panels/search/gnome-search-panel.desktop.in.in [type: gettext/glade]panels/search/search-locations-dialog.ui [type: gettext/glade]panels/search/search.ui +panels/sharing/cc-sharing-networks.c panels/sharing/cc-sharing-panel.c panels/sharing/gnome-sharing-panel.desktop.in.in -panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in -panels/sharing/cc-sharing-networks.c [type: gettext/glade]panels/sharing/networks.ui +panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in [type: gettext/glade]panels/sharing/sharing.ui panels/sound/cc-sound-panel.c panels/sound/data/gnome-sound-panel.desktop.in.in @@ -182,6 +186,7 @@ [type: gettext/glade]panels/user-accounts/data/account-fingerprint.ui panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in [type: gettext/glade]panels/user-accounts/data/history-dialog.ui +[type: gettext/glade]panels/user-accounts/data/join-dialog.ui [type: gettext/glade]panels/user-accounts/data/password-dialog.ui [type: gettext/glade]panels/user-accounts/data/user-accounts-dialog.ui panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in @@ -209,8 +214,12 @@ panels/wacom/gsd-wacom-device.c panels/wacom/gsd-wacom-key-shortcut-button.c [type: gettext/glade]panels/wacom/wacom-stylus-page.ui +shell/alt/cc-window.c shell/appdata/gnome-control-center.appdata.xml.in shell/cc-application.c shell/cc-window.c shell/gnome-control-center.desktop.in.in [type: gettext/glade]shell/help-overlay.ui +shell/hostname-helper.c +shell/panel-list.ui +[type: gettext/glade]shell/window.ui diff -Nru gnome-control-center-3.20.2/po/POTFILES.skip gnome-control-center-3.22.1/po/POTFILES.skip --- gnome-control-center-3.20.2/po/POTFILES.skip 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/POTFILES.skip 2016-08-12 12:43:57.000000000 +0000 @@ -1,3 +1,6 @@ +# List of source files that should *not* be translated. +# Please keep this file sorted alphabetically. +egg-list-box/egg-flow-box.c libgd/libgd/gd-header-bar.c panels/background/gnome-background-panel.desktop.in panels/bluetooth/gnome-bluetooth-panel.desktop.in diff -Nru gnome-control-center-3.20.2/po/pt_BR.po gnome-control-center-3.22.1/po/pt_BR.po --- gnome-control-center-3.20.2/po/pt_BR.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/pt_BR.po 2016-10-10 16:16:22.000000000 +0000 @@ -23,25 +23,25 @@ # Hugo Vaz Sampaio , 2010. # Djavan Fagundes , 2012. # Georges Basile Stavracas Neto , 2013. -# Rafael Ferreira , 2012, 2013, 2014. # Gustavo Marques , 2015. # Artur de Aquino Morais , 2016. # Enrico Nicoletto , 2012, 2013, 2014, 2015, 2016. -# +# Rafael Fontenelle , 2012, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-17 12:08-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-24 10:17+0000\n" +"PO-Revision-Date: 2016-10-01 09:48-0200\n" +"Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" #: ../panels/background/background.ui.h:1 @@ -113,7 +113,8 @@ #. translators: "Home" is used in place of the Pictures #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined -#: ../panels/background/cc-background-chooser-dialog.c:561 ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/background/cc-background-chooser-dialog.c:561 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Pasta pessoal" @@ -122,17 +123,34 @@ #: ../panels/background/cc-background-chooser-dialog.c:573 #, c-format msgid "You can add images to your %s folder and they will show up here" -msgstr "Você pode adicionar imagens para a pasta %s e elas aparecerão aqui." +msgstr "Você pode adicionar imagens para a pasta %s e elas aparecerão aqui" -#: ../panels/background/cc-background-chooser-dialog.c:580 ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 ../panels/color/color-calibrate.ui.h:2 -#: ../panels/color/color.ui.h:30 ../panels/common/language-chooser.ui.h:3 ../panels/display/cc-display-panel.c:1563 ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 ../panels/network/connection-editor/connection-editor.ui.h:1 ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 ../panels/network/net-device-wifi.c:1269 ../panels/network/net-device-wifi.c:1462 -#: ../panels/network/network-wifi.ui.h:1 ../panels/printers/cc-printers-panel.c:2052 ../panels/printers/new-printer-dialog.ui.h:2 ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 ../panels/search/cc-search-locations-dialog.c:681 ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 ../panels/user-accounts/data/password-dialog.ui.h:2 ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 ../panels/user-accounts/um-photo-dialog.c:94 ../panels/user-accounts/um-photo-dialog.c:217 -#: ../panels/user-accounts/um-user-panel.c:705 ../panels/user-accounts/um-user-panel.c:723 +#: ../panels/background/cc-background-chooser-dialog.c:580 +#: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 +#: ../panels/common/language-chooser.ui.h:3 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 +#: ../panels/network/connection-editor/connection-editor.ui.h:1 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 +#: ../panels/network/network-wifi.ui.h:1 +#: ../panels/printers/cc-printers-panel.c:2077 +#: ../panels/printers/new-printer-dialog.ui.h:2 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 +#: ../panels/sharing/cc-sharing-panel.c:372 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 +#: ../panels/user-accounts/data/password-dialog.ui.h:2 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-photo-dialog.c:94 +#: ../panels/user-accounts/um-photo-dialog.c:217 +#: ../panels/user-accounts/um-user-panel.c:705 +#: ../panels/user-accounts/um-user-panel.c:723 msgid "_Cancel" msgstr "_Cancelar" @@ -159,16 +177,17 @@ msgid "Current background" msgstr "Plano de fundo atual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Plano de fundo" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Altere sua imagem de fundo para um papel de parede ou uma foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Papel de parede;Tela;Área de trabalho;" @@ -183,7 +202,7 @@ #: ../panels/bluetooth/cc-bluetooth-panel.c:330 msgid "Plug in a dongle to use Bluetooth." -msgstr "Plugue em um dongle para usar Bluetooth." +msgstr "Plugue um dongle para usar Bluetooth." #: ../panels/bluetooth/cc-bluetooth-panel.c:331 msgid "Bluetooth Turned Off" @@ -211,38 +230,46 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Desligue o alternador do modo avião para habilitar o Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Ligue e desligue o Bluetooth e conecte seus dispositivos" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "compartilhar;compartilhamento;bluetooth;obex;" #. TRANSLATORS: The user has to attach the sensor to the screen #: ../panels/color/cc-color-calibrate.c:361 msgid "Place your calibration device over the square and press 'Start'" -msgstr "Posicione o dispositivo de calibração sobre o quadrado e pressione \"Começar\"" +msgstr "" +"Posicione o dispositivo de calibração sobre o quadrado e pressione \"Começar" +"\"" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... #: ../panels/color/cc-color-calibrate.c:367 -msgid "Move your calibration device to the calibrate position and press 'Continue'" -msgstr "Mova seu dispositivo de calibração para a posição de calibração e pressione \"Continuar\"" +msgid "" +"Move your calibration device to the calibrate position and press 'Continue'" +msgstr "" +"Mova seu dispositivo de calibração para a posição de calibração e pressione " +"\"Continuar\"" #. TRANSLATORS: Some calibration devices need the user to move a #. * dial or switch manually. We also show a picture showing them #. * what to do... #: ../panels/color/cc-color-calibrate.c:373 -msgid "Move your calibration device to the surface position and press 'Continue'" -msgstr "Mova seu dispositivo de calibração para a posição da superfície e pressione \"Continuar\"" +msgid "" +"Move your calibration device to the surface position and press 'Continue'" +msgstr "" +"Mova seu dispositivo de calibração para a posição da superfície e pressione " +"\"Continuar\"" #. TRANSLATORS: on some hardware e.g. Lenovo W700 the sensor #. * is built into the palmrest and we need to fullscreen the @@ -387,7 +414,8 @@ msgstr "Perfis ICC suportados" #. TRANSLATORS: filter name on the file->open dialog -#: ../panels/color/cc-color-panel.c:244 ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/color/cc-color-panel.c:244 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Todos arquivos" @@ -425,7 +453,8 @@ msgid "Save Profile" msgstr "Salvar perfil" -#: ../panels/color/cc-color-panel.c:964 ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/color/cc-color-panel.c:964 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Salvar" @@ -436,13 +465,18 @@ #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1339 ../panels/color/cc-color-panel.c:1363 -msgid "The measuring instrument is not detected. Please check it is turned on and correctly connected." -msgstr "O instrumento de medição não foi detectado. Por favor, verifique se está ligado e conectado corretamente." +msgid "" +"The measuring instrument is not detected. Please check it is turned on and " +"correctly connected." +msgstr "" +"O instrumento de medição não foi detectado. Por favor, verifique se está " +"ligado e conectado corretamente." #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1373 msgid "The measuring instrument does not support printer profiling." -msgstr "O instrumento de medição não tem suporte a criação de perfis de impressora." +msgstr "" +"O instrumento de medição não tem suporte a criação de perfis de impressora." #. TRANSLATORS: this is when the button is insensitive #: ../panels/color/cc-color-panel.c:1384 @@ -540,7 +574,9 @@ msgstr "_Resumir" #. This button returns the user back to the color control panel -#: ../panels/color/color-calibrate.ui.h:8 ../panels/common/language-chooser.ui.h:2 ../panels/region/format-chooser.ui.h:2 +#: ../panels/color/color-calibrate.ui.h:8 +#: ../panels/common/language-chooser.ui.h:2 +#: ../panels/region/format-chooser.ui.h:2 msgid "_Done" msgstr "Concluí_do" @@ -553,14 +589,20 @@ msgstr "Calibração de tela" #: ../panels/color/color.ui.h:2 -msgid "Calibration will produce a profile that you can use to color manage your screen. The longer you spend on calibration, the better the quality of the color profile." +msgid "" +"Calibration will produce a profile that you can use to color manage your " +"screen. The longer you spend on calibration, the better the quality of the " +"color profile." msgstr "" -"A calibração vai produzir um perfil que você pode usar para gerenciar cores de sua tela. Quanto mais tempo você gastar calibrando, melhor será a qualidade do perfil de " -"cores." +"A calibração vai produzir um perfil que você pode usar para gerenciar cores " +"de sua tela. Quanto mais tempo você gastar calibrando, melhor será a " +"qualidade do perfil de cores." #: ../panels/color/color.ui.h:3 -msgid "You will not be able to use your computer while calibration takes place." -msgstr "Você não será capaz de usar seu computador enquanto a calibração ocorre." +msgid "" +"You will not be able to use your computer while calibration takes place." +msgstr "" +"Você não será capaz de usar seu computador enquanto a calibração ocorre." #. This is the approximate time it takes to calibrate the display. #: ../panels/color/color.ui.h:5 @@ -593,28 +635,44 @@ msgstr "Tipo de tela" #: ../panels/color/color.ui.h:13 -msgid "Select a display target white point. Most displays should be calibrated to a D65 illuminant." -msgstr "Selecione o ponto branco alvo da tela. A maioria das telas deveria ser calibrada para um iluminante D65." +msgid "" +"Select a display target white point. Most displays should be calibrated to a " +"D65 illuminant." +msgstr "" +"Selecione o ponto branco alvo da tela. A maioria das telas deveria ser " +"calibrada para um iluminante D65." #: ../panels/color/color.ui.h:14 msgid "Profile Whitepoint" msgstr "Ponto branco do perfil" #: ../panels/color/color.ui.h:15 -msgid "Please set the display to a brightness that is typical for you. Color management will be most accurate at this brightness level." -msgstr "Por favor, defina a tela com um brilho que seja comum para você. O gerenciamento de cores será mais preciso neste nível de brilho." +msgid "" +"Please set the display to a brightness that is typical for you. Color " +"management will be most accurate at this brightness level." +msgstr "" +"Por favor, defina a tela com um brilho que seja comum para você. O " +"gerenciamento de cores será mais preciso neste nível de brilho." #: ../panels/color/color.ui.h:16 -msgid "Alternatively, you can use the brightness level used with one of the other profiles for this device." -msgstr "Alternativamente, você pode usar o nível de brilho usado por um dos outros perfis deste dispositivo." +msgid "" +"Alternatively, you can use the brightness level used with one of the other " +"profiles for this device." +msgstr "" +"Alternativamente, você pode usar o nível de brilho usado por um dos outros " +"perfis deste dispositivo." #: ../panels/color/color.ui.h:17 msgid "Display Brightness" msgstr "Brilho da tela" #: ../panels/color/color.ui.h:18 -msgid "You can use a color profile on different computers, or even create profiles for different lighting conditions." -msgstr "Você usar um perfil de cor em computadores diferentes ou. até mesmo, criar perfis para condições de iluminação diferente." +msgid "" +"You can use a color profile on different computers, or even create profiles " +"for different lighting conditions." +msgstr "" +"Você usar um perfil de cor em computadores diferentes ou. até mesmo, criar " +"perfis para condições de iluminação diferente." #: ../panels/color/color.ui.h:19 msgid "Profile Name:" @@ -646,13 +704,16 @@ #: ../panels/color/color.ui.h:26 msgid "" -"You may find these instructions on how to use the profile on GNU/Linux, Apple OS X and Microsoft Windows " -"systems useful." +"You may find these instructions on how to use the profile on GNU/Linux, Apple OS X and Microsoft Windows systems useful." msgstr "" -"Você pode considerar úteis, essas instruções sobre como usar o perfil em sistemas GNU/Linux, Apple OS X e Microsoft Windows." +"Você pode considerar úteis, essas instruções sobre como usar o perfil em " +"sistemas GNU/Linux, Apple OS X e " +"Microsoft Windows." -#: ../panels/color/color.ui.h:27 ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/color/color.ui.h:27 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Resumo" @@ -664,18 +725,27 @@ msgid "_Import File…" msgstr "_Importar arquivo…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 ../panels/network/connection-editor/net-connection-editor.c:518 -#: ../panels/printers/new-printer-dialog.ui.h:3 ../panels/region/input-chooser.ui.h:3 ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 +#: ../panels/printers/new-printer-dialog.ui.h:3 +#: ../panels/region/input-chooser.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Adicionar" #: ../panels/color/color.ui.h:32 -msgid "Problems detected. The profile may not work correctly. Show details." -msgstr "Problemas detectados. O perfil pode não funcionar corretamente. Mostrar detalhes." +msgid "" +"Problems detected. The profile may not work correctly. Show " +"details." +msgstr "" +"Problemas detectados. O perfil pode não funcionar corretamente. Mostrar detalhes." #: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." -msgstr "Cada dispositivo precisa de uma atualização do perfil de cor para ter gerenciamento de cor." +msgstr "" +"Cada dispositivo precisa de uma atualização do perfil de cor para ter " +"gerenciamento de cor." #: ../panels/color/color.ui.h:34 msgid "Learn more" @@ -719,7 +789,9 @@ #: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" -msgstr "Não foi possível detectar quaisquer dispositivos que podem ter gerenciamento de cor" +msgstr "" +"Não foi possível detectar quaisquer dispositivos que podem ter gerenciamento " +"de cor" #: ../panels/color/color.ui.h:45 msgid "LCD" @@ -776,7 +848,8 @@ msgid "Medium" msgstr "Média" -#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 ../panels/privacy/privacy.ui.h:7 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 +#: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "30 minutos" @@ -809,16 +882,20 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Cor" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 -msgid "Calibrate the color of your devices, such as displays, cameras or printers" -msgstr "Calibre a cor dos seus dispositivos, tais como monitores, câmeras ou impressoras" +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 +msgid "" +"Calibrate the color of your devices, such as displays, cameras or printers" +msgstr "" +"Calibre a cor dos seus dispositivos, tais como monitores, câmeras ou " +"impressoras" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Cor;ICC;Perfil;Calibração;Impressão;Tela;" @@ -826,7 +903,9 @@ msgid "Other…" msgstr "Outro…" -#: ../panels/common/cc-language-chooser.c:124 ../panels/region/cc-format-chooser.c:271 ../panels/region/cc-input-chooser.c:169 +#: ../panels/common/cc-language-chooser.c:124 +#: ../panels/region/cc-format-chooser.c:271 +#: ../panels/region/cc-input-chooser.c:169 msgid "More…" msgstr "Mais…" @@ -834,21 +913,23 @@ msgid "No languages found" msgstr "Nenhum idioma encontrado" -#: ../panels/common/cc-util.c:125 ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hoje" -#: ../panels/common/cc-util.c:129 ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Ontem" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e de %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e de %b de %Y" @@ -856,15 +937,18 @@ msgid "Language" msgstr "Idioma" -#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1 ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1 +#: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1 +#: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1 msgid "Day" msgstr "Dia" -#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2 ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2 +#: ../panels/datetime/big.ui.h:2 ../panels/datetime/little.ui.h:2 +#: ../panels/datetime/middle.ui.h:2 ../panels/datetime/ydm.ui.h:2 msgid "Month" msgstr "Mês" -#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3 ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3 +#: ../panels/datetime/big.ui.h:3 ../panels/datetime/little.ui.h:3 +#: ../panels/datetime/middle.ui.h:3 ../panels/datetime/ydm.ui.h:3 msgid "Year" msgstr "Ano" @@ -967,7 +1051,9 @@ msgid "December" msgstr "Dezembro" -#: ../panels/datetime/datetime.ui.h:13 ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/datetime/datetime.ui.h:13 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data & hora" @@ -1025,12 +1111,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Altere a data e hora, incluindo fuso horário" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Relógio;Fuso horário;Localização;" @@ -1040,199 +1126,230 @@ #: ../panels/datetime/org.gnome.controlcenter.datetime.policy.in.h:2 msgid "To change time or date settings, you need to authenticate." -msgstr "Para modificar configurações de data ou hora você precisa se autenticar." +msgstr "" +"Para modificar configurações de data ou hora você precisa se autenticar." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tampa fechada" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Espelhadas" -#: ../panels/display/cc-display-panel.c:580 ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primária" -#: ../panels/display/cc-display-panel.c:582 ../panels/notifications/cc-notifications-panel.c:257 ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 ../panels/privacy/cc-privacy-panel.c:239 ../panels/universal-access/cc-ua-panel.c:269 ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 ../panels/universal-access/cc-ua-panel.c:607 ../panels/universal-access/cc-ua-panel.c:778 +# Painel "Telas", quando a tela está conectada, mas Desativada. Evitei +# desligada, pois ela pode estar ligada sem estar sendo usada. -- Rafael +#: ../panels/display/cc-display-panel.c:580 +#: ../panels/notifications/cc-notifications-panel.c:257 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 +#: ../panels/universal-access/cc-ua-panel.c:269 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" -msgstr "Off" +msgstr "Desativada" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundária" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Organizar telas combinadas" -#: ../panels/display/cc-display-panel.c:1564 ../panels/display/cc-display-panel.c:2197 ../panels/network/connection-editor/connection-editor.ui.h:2 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 +#: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplicar" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arraste as telas para organizá-las" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Girar em 90° no sentido anti-horário" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Girar em 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Girar em 90° no sentido horário" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Tamanho" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Taxa de proporção" -#: ../panels/display/cc-display-panel.c:2338 ../panels/printers/pp-options-dialog.c:85 +#: ../panels/display/cc-display-panel.c:2354 +#: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolução" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Ajustar para TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Taxa de atualização" # Geralmente o "panorama de atividades" é mencionado em maiúsculo. Seria o caso aqui? -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostrar a barra superior e o panorama de atividades nesta tela" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Tela secundária" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Une esta tela a outra para criar um espaço de trabalho extra" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Apresentação" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostra apenas apresentações de slides e mídia" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Espelhar" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostra sua visão existente em ambas as telas" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Desligar" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Não usar esta tela" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Não foi possível obter informação sobre a tela" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Organiz_ar telas combinadas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Telas" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Escolha como usar os monitores e projetores conectados" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Painel;Projetor;xrandr;Tela;Resolução;Atualizar;Atualização;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Desconhecido" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d bits (ID de compilação: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d bits (ID de compilação: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Pergunte o que fazer" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Não fazer nada" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Abrir pasta" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Outra mídia" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Selecione um aplicativo para CDs de áudio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Selecione um aplicativo para DVDs de vídeo" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" -msgstr "Selecione um aplicativo para executar quando um reprodutor de música é conectado" +msgstr "" +"Selecione um aplicativo para executar quando um reprodutor de música é " +"conectado" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Selecione um aplicativo para executar quando uma câmera é conectada" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Selecione um aplicativo para CDs de software" @@ -1241,87 +1358,92 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD de áudio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Disco Blu-ray vazio" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Disco CD vazio" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Disco DVD vazio" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Disco HD DVD vazio" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Disco Blu-ray de vídeo" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Leitor de e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Disco HD DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD de imagem" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD de vídeo" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Software do Windows" -#: ../panels/info/cc-info-panel.c:1435 ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Seção" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Visão geral" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicativos padrão" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Mídia removível" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versão %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 ../panels/network/connection-editor/ce-page-details.c:240 ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalhes" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Veja informações sobre seu sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 -msgid "device;system;information;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" -msgstr "dispositivo;sistema;informação;memória;processador;versão;padrão;aplicativo;reserva;preferido;cd;dvd;usb;áudio;vídeo;unidade;removível;mídia;autorun;" +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 +msgid "" +"device;system;information;memory;processor;version;default;application;" +"preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" +msgstr "" +"dispositivo;sistema;informação;memória;processador;versão;padrão;aplicativo;" +"reserva;preferido;cd;dvd;usb;áudio;vídeo;unidade;removível;mídia;autorun;" #: ../panels/info/info.ui.h:1 msgid "Select how other media should be handled" @@ -1468,7 +1590,8 @@ msgid "Eject" msgstr "Ejetar" -#: ../panels/keyboard/01-input-sources.xml.in.h:1 ../panels/universal-access/uap.ui.h:11 +#: ../panels/keyboard/01-input-sources.xml.in.h:1 +#: ../panels/universal-access/uap.ui.h:11 msgid "Typing" msgstr "Digitação" @@ -1488,7 +1611,9 @@ msgid "Launch help browser" msgstr "Lançar o navegador de ajuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Configurações" @@ -1560,7 +1685,7 @@ msgid "Lock screen" msgstr "Bloquear tela" -#: ../panels/keyboard/50-accessibility.xml.in.h:1 ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 +#: ../panels/keyboard/50-accessibility.xml.in.h:1 msgid "Universal Access" msgstr "Acessibilidade" @@ -1596,10 +1721,24 @@ msgid "High contrast on or off" msgstr "Ativar ou desativar alto contraste" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Atalhos personalizados" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled -#: ../panels/keyboard/cc-keyboard-option.c:276 ../panels/keyboard/cc-keyboard-option.c:395 ../panels/keyboard/keyboard-shortcuts.c:1220 ../panels/network/network-wifi.ui.h:31 -#: ../panels/sound/gvc/gvc-mixer-control.c:1830 ../panels/user-accounts/um-fingerprint-dialog.c:213 +#: ../panels/keyboard/cc-keyboard-option.c:276 +#: ../panels/keyboard/cc-keyboard-option.c:395 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 +#: ../panels/network/network-wifi.ui.h:31 +#: ../panels/sound/gvc/gvc-mixer-control.c:1830 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Desabilitado" @@ -1623,108 +1762,137 @@ msgid "Modifiers-only switch to next source" msgstr "Modificadores alternam para próxima fonte" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Teclado" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Redefine o atalho para seu valor padrão" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s está sendo usado por %s. Se você substituí-lo, %s será desabilitada" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Definir atalhos personalizados" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Definir atalho" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Insira um novo atalho para alterar %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Adicionar atalho personalizado" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Teclado" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" -msgstr "Veja e altere os atalhos de teclado e defina suas preferências de digitação" +msgstr "" +"Veja e altere os atalhos de teclado e defina suas preferências de digitação" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Atalho;Repetir;Piscar;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Atalho personalizado" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Nome:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "C_omando:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Adicionar atalho" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Excluir atalho" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "To edit a shortcut, click the row and hold down the new keys or press Backspace to clear." -msgstr "Para editar um atalho, clique na linha e mantenha pressionada as novas teclas ou pressione a tecla Backspace para limpar." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Atalhos personalizados" - -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" - -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"O atalho \"%s\" não pode ser usado porque se tornaria impossível digitar usando esta tecla.\n" -"Por favor, tente usar uma tecla como Control, Alt ou Shift simultaneamente." +msgid "No keyboard shortcut found" +msgstr "Nenhum atalho de teclado localizado" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"O atalho \"%s\" já está sendo usado por\n" -"\"%s\"" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Tente uma pesquisa diferente" + +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Pressione Esc para cancelar." + +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Nome" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Se você reatribuir o atalho para \"%s\", o atalho \"%s\" será desativado." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Comando" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Atalho" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Editar" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Reatribuir" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Nenhum" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to automatically set it to \"%s\"?" -msgstr "O atalho \"%s\" possui um atalho \"%s\" associado. Você deseja defini-lo automaticamente para \"%s\"?" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Remover" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Insira um novo atalho" + +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Cancelar" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "\"%s\" is currently associated with \"%s\", this shortcut will be disabled if you move forward." -msgstr "\"%s\" está atualmente associado a \"%s\", este atalho será desativado caso você prossiga." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Adicionar" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "A_tribuir" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Substituir" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Definir" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Testar suas configurações" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Mouse & touchpad" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 -msgid "Change your mouse or touchpad sensitivity and select right or left-handed" -msgstr "Altere a sensibilidade do seu mouse ou touchpad e selecione modo canhoto ou destro" +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 +msgid "" +"Change your mouse or touchpad sensitivity and select right or left-handed" +msgstr "" +"Altere a sensibilidade do seu mouse ou touchpad e selecione modo canhoto ou " +"destro" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" -msgstr "Trackpad;Ponteiro;Clicar;Tap;Toque;Batida;Duplo;Botão;Trackball;Rolagem;Scroll;" +msgstr "" +"Trackpad;Ponteiro;Clicar;Tap;Toque;Batida;Duplo;Botão;Trackball;Rolagem;" +"Scroll;" #: ../panels/mouse/gnome-mouse-properties.ui.h:1 msgid "General" @@ -1784,10 +1952,15 @@ msgstr "Toque para clicar" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Rolagem com dois dedos" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Rolagem na borda" -#: ../panels/mouse/gnome-mouse-test.c:130 ../panels/mouse/gnome-mouse-test.ui.h:1 +#: ../panels/mouse/gnome-mouse-test.c:130 +#: ../panels/mouse/gnome-mouse-test.ui.h:1 msgid "Try clicking, double clicking, scrolling" msgstr "Tente realizar um clique, clique duplo, rolagem" @@ -1822,11 +1995,11 @@ # Traduções viáveis são "Modo avião", "Modo voo" ou até "Modo de avião". Achei por melhor manter a primeira opção #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modo a_vião" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy da rede" @@ -1834,16 +2007,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Oops, algo deu errado. Por favor contate o seu fornecedor de software." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "O NetworkManager precisa estar em execução." @@ -1851,64 +2025,89 @@ msgid "802.1x _Security" msgstr "_Segurança 802.1x" -#: ../panels/network/connection-editor/8021x-security-page.ui.h:2 ../panels/network/connection-editor/security-page.ui.h:3 ../panels/printers/printers.ui.h:14 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:2 +#: ../panels/network/connection-editor/security-page.ui.h:3 +#: ../panels/printers/printers.ui.h:14 msgid "page 1" msgstr "página 1" -#: ../panels/network/connection-editor/8021x-security-page.ui.h:3 ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 ../panels/network/wireless-security/eap-method-peap.ui.h:5 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:3 +#: ../panels/network/connection-editor/security-page.ui.h:4 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" msgstr "I_dentidade anônima" -#: ../panels/network/connection-editor/8021x-security-page.ui.h:4 ../panels/network/connection-editor/security-page.ui.h:5 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:4 +#: ../panels/network/connection-editor/security-page.ui.h:5 msgid "Inner _authentication" msgstr "_Autenticação interna" -#: ../panels/network/connection-editor/8021x-security-page.ui.h:5 ../panels/network/connection-editor/security-page.ui.h:6 ../panels/printers/printers.ui.h:16 +#: ../panels/network/connection-editor/8021x-security-page.ui.h:5 +#: ../panels/network/connection-editor/security-page.ui.h:6 +#: ../panels/printers/printers.ui.h:16 msgid "page 2" msgstr "página 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 ../panels/network/connection-editor/ce-page-security.c:469 -#: ../panels/network/connection-editor/details-page.ui.h:3 ../panels/network/network-wifi.ui.h:6 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 +#: ../panels/network/connection-editor/details-page.ui.h:3 +#: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Segurança" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automático" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Perfil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 ../panels/network/net-device-wifi.c:219 ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 ../panels/network/net-device-wifi.c:223 ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Empresarial" -#: ../panels/network/connection-editor/ce-page-details.c:70 ../panels/network/net-device-wifi.c:237 ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nenhuma" -#: ../panels/network/connection-editor/ce-page-details.c:91 ../panels/power/power.ui.h:17 +#: ../panels/network/connection-editor/ce-page-details.c:89 +#: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nunca" -#: ../panels/network/connection-editor/ce-page-details.c:106 ../panels/network/net-device-ethernet.c:124 ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -1916,178 +2115,230 @@ msgstr[1] "%i dias atrás" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 ../panels/network/net-device-ethernet.c:54 ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nenhum" -#: ../panels/network/connection-editor/ce-page-details.c:183 ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Fraca" -#: ../panels/network/connection-editor/ce-page-details.c:185 ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Boa" -#: ../panels/network/connection-editor/ce-page-details.c:189 ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excelente" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 ../panels/network/connection-editor/ce-page-vpn.c:220 ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detalhes" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identidade" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 ../panels/network/connection-editor/ce-page-ip4.c:439 ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Endereço" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Máscara de rede" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 ../panels/network/connection-editor/ce-page-ip4.c:465 ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 ../panels/network/network-vpn.ui.h:2 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 +#: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Excluir endereço" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Adicionar" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Servidor" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Excluir servidor DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Métrica" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Excluir rota" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 ../panels/network/network-wifi.ui.h:27 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 +#: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automático (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 ../panels/network/connection-editor/ce-page-ip6.c:621 ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 +#: ../panels/network/network-wifi.ui.h:26 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Apenas conexão local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 ../panels/network/network-wifi.ui.h:48 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 +#: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefixo" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 ../panels/network/connection-editor/ethernet-page.ui.h:1 ../panels/network/connection-editor/ip4-page.ui.h:4 -#: ../panels/network/connection-editor/ip6-page.ui.h:4 ../panels/network/wireless-security/eap-method-peap.ui.h:2 ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 +#: ../panels/network/connection-editor/ethernet-page.ui.h:1 +#: ../panels/network/connection-editor/ip4-page.ui.h:4 +#: ../panels/network/connection-editor/ip6-page.ui.h:4 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:2 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automático" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automático, somente DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 ../panels/network/network-wifi.ui.h:49 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 +#: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 ../panels/network/network-wifi.ui.h:51 +#: ../panels/network/connection-editor/ce-page-reset.c:78 +#: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Restaurar" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nenhum" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP chave de 40/128-bit (Hex ou ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP senha de 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP dinâmico (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 pessoal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 empresarial" -#: ../panels/network/connection-editor/details-page.ui.h:1 ../panels/network/network-wifi.ui.h:4 +#: ../panels/network/connection-editor/details-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:4 msgid "Signal Strength" msgstr "Força do sinal" -#: ../panels/network/connection-editor/details-page.ui.h:2 ../panels/network/network-wifi.ui.h:5 +#: ../panels/network/connection-editor/details-page.ui.h:2 +#: ../panels/network/network-wifi.ui.h:5 msgid "Link speed" msgstr "Velocidade do link" -#: ../panels/network/connection-editor/details-page.ui.h:4 ../panels/network/net-device-ethernet.c:157 ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/connection-editor/details-page.ui.h:4 +#: ../panels/network/net-device-ethernet.c:153 +#: ../panels/network/network-simple.ui.h:3 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Endereço IPv4" -#: ../panels/network/connection-editor/details-page.ui.h:5 ../panels/network/net-device-ethernet.c:158 ../panels/network/net-device-ethernet.c:162 -#: ../panels/network/network-mobile.ui.h:4 ../panels/network/network-simple.ui.h:4 ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 +#: ../panels/network/net-device-ethernet.c:158 +#: ../panels/network/network-mobile.ui.h:4 +#: ../panels/network/network-simple.ui.h:4 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Endereço IPv6" -#: ../panels/network/connection-editor/details-page.ui.h:6 ../panels/network/net-device-ethernet.c:165 ../panels/network/network-simple.ui.h:2 +#: ../panels/network/connection-editor/details-page.ui.h:6 +#: ../panels/network/net-device-ethernet.c:161 +#: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Endereço físico" -#: ../panels/network/connection-editor/details-page.ui.h:7 ../panels/network/net-device-ethernet.c:169 ../panels/network/network-mobile.ui.h:5 -#: ../panels/network/network-simple.ui.h:5 ../panels/network/network-wifi.ui.h:10 +#: ../panels/network/connection-editor/details-page.ui.h:7 +#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/network-mobile.ui.h:5 +#: ../panels/network/network-simple.ui.h:5 +#: ../panels/network/network-wifi.ui.h:10 msgid "Default Route" msgstr "Rota padrão" -#: ../panels/network/connection-editor/details-page.ui.h:8 ../panels/network/connection-editor/ip4-page.ui.h:3 ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 ../panels/network/network-mobile.ui.h:6 ../panels/network/network-simple.ui.h:6 ../panels/network/network-wifi.ui.h:11 +#: ../panels/network/connection-editor/details-page.ui.h:8 +#: ../panels/network/connection-editor/ip4-page.ui.h:3 +#: ../panels/network/connection-editor/ip6-page.ui.h:3 +#: ../panels/network/net-device-ethernet.c:167 +#: ../panels/network/network-mobile.ui.h:6 +#: ../panels/network/network-simple.ui.h:6 +#: ../panels/network/network-wifi.ui.h:11 msgid "DNS" msgstr "DNS" @@ -2127,11 +2378,14 @@ msgid "10 Gb/s" msgstr "10 Gb/s" -#: ../panels/network/connection-editor/ethernet-page.ui.h:10 ../panels/network/connection-editor/vpn-page.ui.h:1 +#: ../panels/network/connection-editor/ethernet-page.ui.h:10 +#: ../panels/network/connection-editor/vpn-page.ui.h:1 msgid "_Name" msgstr "_Nome" -#: ../panels/network/connection-editor/ethernet-page.ui.h:11 ../panels/network/connection-editor/wifi-page.ui.h:4 ../panels/network/network-wifi.ui.h:38 +#: ../panels/network/connection-editor/ethernet-page.ui.h:11 +#: ../panels/network/connection-editor/wifi-page.ui.h:4 +#: ../panels/network/network-wifi.ui.h:38 msgid "_MAC Address" msgstr "Endereço _MAC" @@ -2139,7 +2393,8 @@ msgid "M_TU" msgstr "M_TU" -#: ../panels/network/connection-editor/ethernet-page.ui.h:13 ../panels/network/connection-editor/wifi-page.ui.h:5 +#: ../panels/network/connection-editor/ethernet-page.ui.h:13 +#: ../panels/network/connection-editor/wifi-page.ui.h:5 msgid "_Cloned Address" msgstr "Endereço _clonado" @@ -2147,159 +2402,169 @@ msgid "bytes" msgstr "bytes" -#: ../panels/network/connection-editor/ethernet-page.ui.h:15 ../panels/network/connection-editor/vpn-page.ui.h:3 +#: ../panels/network/connection-editor/ethernet-page.ui.h:15 +#: ../panels/network/connection-editor/vpn-page.ui.h:3 msgid "Make available to other _users" msgstr "Disponibilizar para outros _usuários" -#: ../panels/network/connection-editor/ethernet-page.ui.h:16 ../panels/network/connection-editor/wifi-page.ui.h:7 +#: ../panels/network/connection-editor/ethernet-page.ui.h:16 +#: ../panels/network/connection-editor/wifi-page.ui.h:7 msgid "Connect _automatically" msgstr "Conectar _automaticamente" -#: ../panels/network/connection-editor/ethernet-page.ui.h:17 ../panels/network/connection-editor/security-page.ui.h:2 ../panels/network/connection-editor/vpn-page.ui.h:2 +#: ../panels/network/connection-editor/ethernet-page.ui.h:17 +#: ../panels/network/connection-editor/security-page.ui.h:2 +#: ../panels/network/connection-editor/vpn-page.ui.h:2 msgid "Firewall _Zone" msgstr "_Zona de firewall" -#: ../panels/network/connection-editor/firewall-helpers.c:48 ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Padrão" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "A zona define o nível de confiança da conexão" -#: ../panels/network/connection-editor/ip4-page.ui.h:1 ../panels/network/network-wifi.ui.h:24 +#: ../panels/network/connection-editor/ip4-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:24 msgid "IPv_4" msgstr "IPv_4" -#: ../panels/network/connection-editor/ip4-page.ui.h:2 ../panels/network/connection-editor/ip6-page.ui.h:2 ../panels/network/network-wifi.ui.h:25 +#: ../panels/network/connection-editor/ip4-page.ui.h:2 +#: ../panels/network/connection-editor/ip6-page.ui.h:2 +#: ../panels/network/network-wifi.ui.h:25 msgid "_Addresses" msgstr "_Endereços" -#: ../panels/network/connection-editor/ip4-page.ui.h:5 ../panels/network/connection-editor/ip6-page.ui.h:5 +#: ../panels/network/connection-editor/ip4-page.ui.h:5 +#: ../panels/network/connection-editor/ip6-page.ui.h:5 msgid "Automatic DNS" msgstr "DNS automático" -#: ../panels/network/connection-editor/ip4-page.ui.h:6 ../panels/network/connection-editor/ip6-page.ui.h:6 ../panels/network/network-wifi.ui.h:32 +#: ../panels/network/connection-editor/ip4-page.ui.h:6 +#: ../panels/network/connection-editor/ip6-page.ui.h:6 +#: ../panels/network/network-wifi.ui.h:32 msgid "Routes" msgstr "Rotas" -#: ../panels/network/connection-editor/ip4-page.ui.h:7 ../panels/network/connection-editor/ip6-page.ui.h:7 +#: ../panels/network/connection-editor/ip4-page.ui.h:7 +#: ../panels/network/connection-editor/ip6-page.ui.h:7 msgid "Automatic Routes" msgstr "Rotas automáticas" -#: ../panels/network/connection-editor/ip4-page.ui.h:8 ../panels/network/connection-editor/ip6-page.ui.h:8 ../panels/network/network-wifi.ui.h:34 +#: ../panels/network/connection-editor/ip4-page.ui.h:8 +#: ../panels/network/connection-editor/ip6-page.ui.h:8 +#: ../panels/network/network-wifi.ui.h:34 msgid "Use this connection _only for resources on its network" msgstr "Usar esta c_onexão apenas para recursos nesta rede" -#: ../panels/network/connection-editor/ip6-page.ui.h:1 ../panels/network/network-wifi.ui.h:36 +#: ../panels/network/connection-editor/ip6-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:36 msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Não foi possível abrir o editor de conexão" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Novo perfil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Vínculo" - -# Refere-se a tipo de conexão -- Enrico -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "União" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Ponte" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Não foi possível carregar os plug-ins de VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importar de arquivo…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Adicionar conexão de rede" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Adicionar VPN" -#: ../panels/network/connection-editor/reset-page.ui.h:1 ../panels/network/network-wifi.ui.h:41 +#: ../panels/network/connection-editor/reset-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:41 msgid "_Reset" msgstr "_Restaurar" -#: ../panels/network/connection-editor/reset-page.ui.h:2 ../panels/network/net-device-wifi.c:1463 ../panels/network/network-wifi.ui.h:42 +#: ../panels/network/connection-editor/reset-page.ui.h:2 +#: ../panels/network/net-device-wifi.c:1536 +#: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "E_squecer" #: ../panels/network/connection-editor/reset-page.ui.h:3 -msgid "Reset the settings for this network, including passwords, but remember it as a preferred network" -msgstr "Restaura as configurações desta rede, incluindo senhas, mas lembrando dela como uma rede preferida" +msgid "" +"Reset the settings for this network, including passwords, but remember it as " +"a preferred network" +msgstr "" +"Restaura as configurações desta rede, incluindo senhas, mas lembrando dela " +"como uma rede preferida" #: ../panels/network/connection-editor/reset-page.ui.h:4 -msgid "Remove all details relating to this network and do not try to automatically connect" -msgstr "Remove todos os detalhes relacionados a esta rede e não tenta conectar automaticamente" +msgid "" +"Remove all details relating to this network and do not try to automatically " +"connect" +msgstr "" +"Remove todos os detalhes relacionados a esta rede e não tenta conectar " +"automaticamente" -#: ../panels/network/connection-editor/security-page.ui.h:1 ../panels/network/network-wifi.ui.h:16 +#: ../panels/network/connection-editor/security-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:16 msgid "S_ecurity" msgstr "S_egurança" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Não foi possível importar conexão VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" -"The file '%s' could not be read or does not contain recognized VPN connection information\n" +"The file '%s' could not be read or does not contain recognized VPN " +"connection information\n" "\n" "Error: %s." msgstr "" -"O arquivo \"%s\" não pode ser lido ou não possui informações de conexão VPN reconhecíveis\n" +"O arquivo \"%s\" não pode ser lido ou não possui informações de conexão VPN " +"reconhecíveis\n" "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Selecione um arquivo para importar" -#: ../panels/network/connection-editor/vpn-helpers.c:246 ../panels/printers/cc-printers-panel.c:2053 ../panels/sharing/cc-sharing-panel.c:373 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 +#: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Abrir" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Um arquivo de nome \"%s\" já existe." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Substituir" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Deseja substituir %s com a conexão VPN que você está salvando?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Não foi possível exportar conexão VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2310,7 +2575,7 @@ "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportar conexão VPN" @@ -2318,15 +2583,18 @@ msgid "(Error: unable to load VPN connection editor)" msgstr "(Erro: não foi possível carregar o editor de conexão VPN)" -#: ../panels/network/connection-editor/wifi-page.ui.h:1 ../panels/network/network-wifi.ui.h:14 +#: ../panels/network/connection-editor/wifi-page.ui.h:1 +#: ../panels/network/network-wifi.ui.h:14 msgid "_SSID" msgstr "_SSID" -#: ../panels/network/connection-editor/wifi-page.ui.h:2 ../panels/network/network-wifi.ui.h:15 +#: ../panels/network/connection-editor/wifi-page.ui.h:2 +#: ../panels/network/network-wifi.ui.h:15 msgid "_BSSID" msgstr "_BSSID" -#: ../panels/network/connection-editor/wifi-page.ui.h:3 ../panels/network/network-wifi.ui.h:18 +#: ../panels/network/connection-editor/wifi-page.ui.h:3 +#: ../panels/network/network-wifi.ui.h:18 msgid "My Home Network" msgstr "Minha rede pessoal" @@ -2334,49 +2602,47 @@ msgid "Make available to _other users" msgstr "Disponibilizar para _outros usuários" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Rede" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controle como você conecta à Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 -msgid "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;" -msgstr "Rede;Network;Sem fio;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Banda larga;Modem;Bluetooth;vpn;vlan;ponte;bridge;bond;vinculo;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Vínculos escravos" - -#: ../panels/network/net-device-bond.c:102 ../panels/network/net-device-bridge.c:102 ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nenhum)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Pontes escravas" +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +msgid "" +"Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" +"DNS;" +msgstr "" +"Rede;Network;Sem fio;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Banda larga;Modem;" +"Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nunca" -#: ../panels/network/net-device-ethernet.c:120 ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hoje" -#: ../panels/network/net-device-ethernet.c:122 ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ontem" -#: ../panels/network/net-device-ethernet.c:160 ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Endereço IP" -#: ../panels/network/net-device-ethernet.c:176 ../panels/network/network-wifi.ui.h:12 +#: ../panels/network/net-device-ethernet.c:172 +#: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Último uso" @@ -2385,82 +2651,97 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 ../panels/network/network-ethernet.ui.h:1 ../panels/network/network-simple.ui.h:1 +#: ../panels/network/net-device-ethernet.c:280 +#: ../panels/network/network-ethernet.ui.h:1 +#: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Com fio" -#: ../panels/network/net-device-ethernet.c:354 ../panels/network/net-device-wifi.c:1621 ../panels/network/network-ethernet.ui.h:3 ../panels/network/network-mobile.ui.h:8 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 +#: ../panels/network/network-ethernet.ui.h:3 +#: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opções…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Perfil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Adicionar nova conexão" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Uniões escravas" - -#: ../panels/network/net-device-wifi.c:1176 -msgid "If you have a connection to the Internet other than wireless, you can set up a wireless hotspot to share the connection with others." +#: ../panels/network/net-device-wifi.c:1205 +msgid "" +"If you have a connection to the Internet other than wireless, you can set up " +"a wireless hotspot to share the connection with others." msgstr "" -"Se você tiver uma conexão com a Internet que não seja a sem fio, você pode configurar um ponto de acesso sem fio para compartilhar sua conexão de Internet com outras " -"pessoas." +"Se você tiver uma conexão com a Internet que não seja a sem fio, você pode " +"configurar um ponto de acesso sem fio para compartilhar sua conexão de " +"Internet com outras pessoas." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." -msgstr "Trocar de ponto de acesso de conexão sem fio irá desconectar você de %s." +msgstr "" +"Trocar de ponto de acesso de conexão sem fio irá desconectar você de %s." -#: ../panels/network/net-device-wifi.c:1184 -msgid "It is not possible to access the Internet through your wireless while the hotspot is active." -msgstr "Não é possível acessar a Internet através da sua conexão sem fio enquanto o ponto de acesso estiver ativo." +#: ../panels/network/net-device-wifi.c:1213 +msgid "" +"It is not possible to access the Internet through your wireless while the " +"hotspot is active." +msgstr "" +"Não é possível acessar a Internet através da sua conexão sem fio enquanto o " +"ponto de acesso estiver ativo." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Parar ponto de acesso e desconectar todos os usuários?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Parar ponto de acesso" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "A política do sistema proíbe o uso de um ponto de acesso" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" -msgstr "O dispositivo de rede sem fio não possui suporte a modo de ponto de acesso" +msgstr "" +"O dispositivo de rede sem fio não possui suporte a modo de ponto de acesso" -#: ../panels/network/net-device-wifi.c:1459 -msgid "Network details for the selected networks, including passwords and any custom configuration will be lost." -msgstr "Detalhes de rede selecionadas, incluindo senhas e qualquer configuração personalizada serão perdidos." +#: ../panels/network/net-device-wifi.c:1532 +msgid "" +"Network details for the selected networks, including passwords and any " +"custom configuration will be lost." +msgstr "" +"Detalhes de rede selecionadas, incluindo senhas e qualquer configuração " +"personalizada serão perdidos." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Histórico" -#: ../panels/network/net-device-wifi.c:1778 ../panels/printers/options-dialog.ui.h:2 ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 +#: ../panels/network/net-device-wifi.c:1846 +#: ../panels/printers/options-dialog.ui.h:2 +#: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 msgid "_Close" msgstr "Fe_char" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Esquecer" #. TRANSLATORS: this is when the use leaves the PAC textbox blank #: ../panels/network/net-proxy.c:67 -msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided." -msgstr "Auto-descoberta de um Proxy Web é usada quando a URL de configuração não é fornecida." +msgid "" +"Web Proxy Autodiscovery is used when a Configuration URL is not provided." +msgstr "" +"Autodescoberta de um Proxy Web é usada quando a URL de configuração não é " +"fornecida." #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted #. * network, then anyone else on that network can tell your @@ -2486,6 +2767,10 @@ msgid "Provider" msgstr "Provedor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Rede" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2569,7 +2854,8 @@ msgid "Group Password" msgstr "Senha do grupo" -#: ../panels/network/network-vpn.ui.h:5 ../panels/printers/authentication-dialog.ui.h:4 +#: ../panels/network/network-vpn.ui.h:5 +#: ../panels/printers/authentication-dialog.ui.h:4 msgid "Username" msgstr "Nome de usuário" @@ -2585,16 +2871,17 @@ msgid "details" msgstr "detalhes" -#: ../panels/network/network-wifi.ui.h:17 ../panels/network/wireless-security/eap-method-leap.ui.h:2 ../panels/network/wireless-security/eap-method-simple.ui.h:2 -#: ../panels/network/wireless-security/ws-leap.ui.h:2 ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/network/network-wifi.ui.h:17 +#: ../panels/network/wireless-security/eap-method-leap.ui.h:2 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:2 +#: ../panels/network/wireless-security/ws-leap.ui.h:2 +#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Senha" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Nenhum" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "_Mostrar senha" @@ -2640,12 +2927,20 @@ msgstr "hardware" #: ../panels/network/network-wifi.ui.h:43 -msgid "Reset the settings for this connection to their defaults, but remember as a preferred connection." -msgstr "Restaurar as configurações desta conexão para os padrões, mas lembrá-la como uma conexão preferida." +msgid "" +"Reset the settings for this connection to their defaults, but remember as a " +"preferred connection." +msgstr "" +"Restaurar as configurações desta conexão para os padrões, mas lembrá-la como " +"uma conexão preferida." #: ../panels/network/network-wifi.ui.h:44 -msgid "Remove all details relating to this network and do not try to automatically connect to it." -msgstr "Remover todos os detalhes relacionados a esta rede e não tentar conectar automaticamente a ela." +msgid "" +"Remove all details relating to this network and do not try to automatically " +"connect to it." +msgstr "" +"Remover todos os detalhes relacionados a esta rede e não tentar conectar " +"automaticamente a ela." #: ../panels/network/network-wifi.ui.h:45 msgid "reset" @@ -2679,7 +2974,7 @@ msgid "_Connect to Hidden Network…" msgstr "_Conectar a uma rede oculta…" -#: ../panels/network/network-wifi.ui.h:58 ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 +#: ../panels/network/network-wifi.ui.h:58 msgid "_History" msgstr "_Histórico" @@ -2699,390 +2994,415 @@ msgid "Security type" msgstr "Tipo de segurança" -#: ../panels/network/network-wifi.ui.h:63 ../panels/printers/authentication-dialog.ui.h:5 ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/network/network-wifi.ui.h:63 +#: ../panels/printers/authentication-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Senha" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraestrutura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Estado desconhecido" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Não gerenciável" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Indisponível" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Conectando" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Autenticação necessária" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Conectado" # http://en.wikipedia.org/wiki/Font_hinting # (não entendi a relação link-frase, mas vou deixar - Rafael) #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Desconectando" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Conexão falhou" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Estado desconhecido (perdido)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Não conectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Configuração falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Configuração de IP falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Configuração de IP expirou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Senhas foram exigidas, mas não foram fornecidas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Suplicante 802.1x desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Configuração do suplicante 802.1x falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Suplicante 802.1x falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Suplicante 802.1x levou tempo demais para autenticar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Serviço PPP falhou em iniciar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Serviço PPP desconectado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Serviço PPP falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Cliente DHCP falhou em iniciar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Erro no cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Cliente DHCP falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "O serviço de conexão compartilhada falhou ao iniciar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "O serviço de conexão compartilhada falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Serviço de AutoIP falhou em iniciar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Erro no serviço AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Serviço de AutoIP falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linha ocupada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Não há tom de discagem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nenhuma transportadora pode ser estabelecida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Requisição de discagem alcançou limite de tempo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Tentativa de discagem falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Inicialização do modem falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Falha ao selecionar o APN especificado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Não está procurando por redes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" -msgstr "Resgistro à rede negado" +msgstr "Registro à rede negado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Registro de rede alcançou limite de tempo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Falhou ao registrar com a rede requisitada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Verificação de PIN falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmware do dispositivo pode estar faltando" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Conexão desapareceu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "A conexão existente foi presumida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem não encontrado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Conexão Bluetooth falhou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Cartão SIM não inserido" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Pin do SIM obrigatório" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Puk do SIM obrigatório" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM errado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Dispositivo de InfiniBand não tem suporte ao modo conectado" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Falha na dependência da conexão" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Faltando firmware" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cabo desconectado" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nenhuma certificado de autoridade certificadora escolhido" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "erro indefinido na segurança 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nenhum arquivo selecionado" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate Authority " -"certificate?" -msgstr "" -"Não usar um certificado de uma autoridade certificadora (AC) pode resultar em conexões a redes sem fio inseguras e arriscadas. Deseja escolher um certificado de autoridade " -"certificadora?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorar" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Escolher certificado de AC" +msgid "unspecified error validating eap-method file" +msgstr "erro não especificado ao validar arquivo de método eap" -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12)" +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Chaves privadas DER, PEM ou PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "faltando arquivo PAC EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Escolha um arquivo PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Arquivos PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "A_rquivo PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticação _interna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Pro_visionamento PAC automático" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 ../panels/network/wireless-security/eap-method-peap.ui.h:1 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 ../panels/network/wireless-security/ws-wpa-eap.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:1 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 +#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 +#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:1 #: ../panels/printers/authentication-dialog.ui.h:1 msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anônimo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticado" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ambos" -#: ../panels/network/wireless-security/eap-method-leap.ui.h:1 ../panels/network/wireless-security/eap-method-simple.ui.h:1 ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "A_rquivo PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticação _interna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Permitir pro_visionamento PAC automático" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "faltando nome de usuário EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "faltando senha EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.ui.h:1 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:1 +#: ../panels/network/wireless-security/ws-leap.ui.h:1 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "Nome de _usuário" -#: ../panels/network/wireless-security/eap-method-leap.ui.h:3 ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 ../panels/network/wireless-security/ws-leap.ui.h:3 ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 +#: ../panels/network/wireless-security/eap-method-leap.ui.h:3 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 +#: ../panels/network/wireless-security/ws-leap.ui.h:3 +#: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Mostrar senha" -#: ../panels/network/wireless-security/eap-method-peap.c:263 ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "certificado de AC EAP-PEAP inválido: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "certificado de AC EAP-PEAP inválido: nenhum certificado especificado" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Escolha um certificado da autoridade certificadora" @@ -3094,40 +3414,80 @@ msgid "Version 1" msgstr "Versão 1" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:6 ../panels/network/wireless-security/eap-method-tls.ui.h:3 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:6 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:3 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:3 msgid "C_A certificate" msgstr "Certificado de A_C" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nenhum certificado de AC é necessá_rio" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versão PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Pedir esta senha todas as vezes" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "faltando nome de usuário EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "faltando senha EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "faltando identidade EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificado de AC EAP-TLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificado de AC EAP-TLS inválido: nenhum certificado especificado" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "senha EAP-TLS inválida: faltando" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "chave privada EAP-TLS inválida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificado EAP-TLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Chaves privadas sem criptografia são inseguras" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" -"The selected private key does not appear to be protected by a password. This could allow your security credentials to be compromised. Please select a password-protected " -"private key.\n" +"The selected private key does not appear to be protected by a password. " +"This could allow your security credentials to be compromised. Please select " +"a password-protected private key.\n" "\n" "(You can password-protect your private key with openssl)" msgstr "" -"A chave privada selecionada não aparenta estar protegida por uma senha. Isso pode permitir que suas credenciais de segurança estejam comprometidas. Por favor, selecione uma " -"chave privada protegida por senha.\n" +"A chave privada selecionada não aparenta estar protegida por uma senha. Isso " +"pode permitir que suas credenciais de segurança estejam comprometidas. Por " +"favor, selecione uma chave privada protegida por senha.\n" "\n" "(Você pode proteger com senha sua chave privada usando openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Escolha seu certificado pessoal" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Escolha sua chave privada" @@ -3139,59 +3499,110 @@ msgid "_User certificate" msgstr "Certificado do _usuário" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Chave pri_vada" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Senha de chave _privada" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificado de AC EAP-TTLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificado de AC EAP-TTLS inválido: nenhum certificado especificado" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Não me a_vise novamente" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Não" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sim" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Erro desconhecido ao validade segurança 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" # "Tunelado" não existe, então não enventemos. -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS encapsulado" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP protegido (PEAP)" -#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2 ../panels/network/wireless-security/ws-wep-key.ui.h:9 ../panels/network/wireless-security/ws-wpa-eap.ui.h:2 +#: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:2 +#: ../panels/network/wireless-security/ws-wep-key.ui.h:9 +#: ../panels/network/wireless-security/ws-wpa-eap.ui.h:2 msgid "Au_thentication" msgstr "Au_tenticação" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "faltando nome de usuário leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "faltando senha leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "faltando chave wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"chave wep inválida: chave com um tamanho de %zu deve conter apenas dígitos " +"hexadecimais" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"chave wep inválida: chave com um tamanho de %zu deve conter apenas dígitos " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"chave wep inválida: tamanho de chave %zu inválido. Um chave deve estar entre " +"o tamanho 5/13 (ascii) ou 10/26 (hexadecimal)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "chave wep inválida: frase secreta não pode estar vazia" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "chave wep inválida: frase secreta deve ser menor que 64 caracteres" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (padrão)" @@ -3228,13 +3639,34 @@ msgid "WEP inde_x" msgstr "Índice _WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk inválido: tamanho de chave %zu inválido. Deve ser de [8,63] bytes ou " +"64 dígitos hexadecimais" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk inválido: não é possível interpretar chave com 64 bytes como " +"hexadecimal" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipo" -#: ../panels/notifications/cc-notifications-panel.c:257 ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 ../panels/universal-access/cc-ua-panel.c:269 ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 ../panels/universal-access/cc-ua-panel.c:607 ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/notifications/cc-notifications-panel.c:257 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 +#: ../panels/universal-access/cc-ua-panel.c:269 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "On" @@ -3271,16 +3703,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Mostrar c_onteúdo da mensagem na tela de bloqueio" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificações" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controle quais notificações são exibidas e o que elas mostram" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notificações;Banner;Mensagem;Bandeja;Janelas instantâneas;" @@ -3293,91 +3726,88 @@ msgstr "Notificações da tela de b_loqueio" #. List of applications. -#: ../panels/notifications/notifications.ui.h:4 ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 +#: ../panels/notifications/notifications.ui.h:4 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 msgid "Applications" msgstr "Aplicativos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Outro" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 ../panels/online-accounts/online-accounts.ui.h:2 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 +#: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Adicionar conta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Correio" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Agenda" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contatos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Bate-papo" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Recursos" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Erro ao iniciar sessão com a conta" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "As credenciais expiraram." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Autentique para habilitar esta conta." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Autenticar" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Erro ao criar conta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Erro ao remover conta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Tem certeza de que deseja remover a conta?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Isso não irá remover a conta no servidor." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Remover" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Contas on-line" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Conecte-se às suas contas on-line e decida para que usá-las" # Não podemos esquecer de deixar o sinal de ponto-e-vírgula após a última palavra chave!! --Enrico #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 -msgid "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" -msgstr "Google;Facebook;Twitter;Yahoo;Web;Conectado;Online;Bate-papo;Chat;Calendário;Agenda;E-mail;Correio;Contato;Contatos;ownCloud;Kerberos;IMAP;SMTP;Pocket;ReadItLater;" +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 +msgid "" +"Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" +"Kerberos;IMAP;SMTP;Pocket;ReadItLater;" +msgstr "" +"Google;Facebook;Twitter;Yahoo;Web;Conectado;Online;Bate-papo;Chat;Calendário;" +"Agenda;E-mail;Correio;Contato;Contatos;ownCloud;Kerberos;IMAP;SMTP;Pocket;" +"ReadItLater;" #: ../panels/online-accounts/online-accounts.ui.h:1 msgid "No online accounts configured" msgstr "Nenhuma conta on-line configurada" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Remover conta" @@ -3386,8 +3816,12 @@ msgstr "Adicionar uma conta on-line" #: ../panels/online-accounts/online-accounts.ui.h:5 -msgid "Adding an account allows your applications to access it for documents, mail, contacts, calendar, chat and more." -msgstr "Ao adicionar uma conta é permitido ao seus aplicativos acessá-la para documentos, e-mails, contatos, calendários, bate-papo e muito mais." +msgid "" +"Adding an account allows your applications to access it for documents, mail, " +"contacts, calendar, chat and more." +msgstr "" +"Ao adicionar uma conta é permitido ao seus aplicativos acessá-la para " +"documentos, e-mails, contatos, calendários, bate-papo e muito mais." #: ../panels/power/cc-power-panel.c:253 msgid "Unknown time" @@ -3516,7 +3950,8 @@ msgstr "Computador" #. TRANSLATORS: secondary battery, misc -#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Bateria" @@ -3564,103 +3999,108 @@ msgid "When _idle" msgstr "_Quando ocioso" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Economia de energia" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "_Brilho da tela" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Brilho automático" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "_Brilho do teclado" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "_Escurecer a tela quando inativo" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "A_pagar a tela" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Desligue o Wi-Fi para poupar energia." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "Banda larga _móvel" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Desliga a banda larga móvel (3G, 4G, LTE, etc.) para poupar energia." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "Quando estiver usando a energia da bateria" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "Ligado na tomada" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Suspender" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Hibernar" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Nada" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "Botão de suspender & desligar" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "Suspensão _automática" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Suspensão automática" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "_Quando o botão de energia for pressionado" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositivos" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energia" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" -msgstr "Veja o status da sua bateria e altere as configurações de economia de energia" +msgstr "" +"Veja o status da sua bateria e altere as configurações de economia de energia" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 -msgid "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" -msgstr "Energia;Dormir;Suspender;Hibernar;Bateria;Brilho;Escurecer;Vazio;Branca;Monitor;DPMS;Inativo;" +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 +msgid "" +"Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" +msgstr "" +"Energia;Dormir;Suspender;Hibernar;Bateria;Brilho;Escurecer;Vazio;Branca;" +"Monitor;DPMS;Inativo;" #: ../panels/power/power.ui.h:3 msgid "45 minutes" @@ -3734,10 +4174,6 @@ msgid "Delay" msgstr "Atrasar" -#: ../panels/printers/authentication-dialog.ui.h:2 ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Cancelar" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autenticar" @@ -3747,137 +4183,138 @@ msgstr "Autenticação necessária" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Com pouco toner" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Sem toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Com pouco revelador" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Sem revelador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Pouco suprimento de marcador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Sem suprimento de marcador" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Abrir capa" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Abrir porta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Com pouco papel" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Sem papel" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Desconectado" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Parado" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Recipiente de descarte quase cheio" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Recipiente de descarte cheio" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "O condutor de foto ótica está quase no fim da vida" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "O condutor de foto ótica não está funcionando" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Configurando" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Pronto" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Não aceitar trabalhos" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "Processando" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Nível do toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Nível de tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Nível de suprimento" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Instalando" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -3885,59 +4322,63 @@ msgstr[1] "%u ativos" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Falha ao adicionar nova impressora." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Selecionar um arquivo PPD" -#: ../panels/printers/cc-printers-panel.c:2058 -msgid "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -msgstr "Arquivos de descrição de impressora PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" +#: ../panels/printers/cc-printers-panel.c:2083 +msgid "" +"PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." +"PPD.GZ)" +msgstr "" +"Arquivos de descrição de impressora PostScript (*.ppd, *.PPD, *.ppd.gz, *." +"PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Não foi encontrado um driver adequado" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Pesquisando por drivers preferidos…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "Selecionar do banco de dados…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Forneça um arquivo PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Página de teste" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Sem impressora" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Não foi possível carregar a interface: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Impressoras" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" -msgstr "Adicione impressoras, veja trabalhos de impressão e decida como você gostaria de imprimir" +msgstr "" +"Adicione impressoras, veja trabalhos de impressão e decida como você " +"gostaria de imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Impressora;Fila;Imprimir;Papel;Tinta;Toner;" @@ -3978,7 +4419,8 @@ msgid "Select Printer Driver" msgstr "Selecionar driver de impressora" -#: ../panels/printers/ppd-selection-dialog.ui.h:3 ../panels/user-accounts/um-photo-dialog.c:96 +#: ../panels/printers/ppd-selection-dialog.ui.h:3 +#: ../panels/user-accounts/um-photo-dialog.c:96 msgid "Select" msgstr "Selecionar" @@ -3997,17 +4439,20 @@ msgstr "Impressora LPD" #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:66 ../panels/printers/pp-ppd-option-widget.c:70 +#: ../panels/printers/pp-ipp-option-widget.c:66 +#: ../panels/printers/pp-ppd-option-widget.c:70 msgid "One Sided" msgstr "Um lado" #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:68 ../panels/printers/pp-ppd-option-widget.c:72 +#: ../panels/printers/pp-ipp-option-widget.c:68 +#: ../panels/printers/pp-ppd-option-widget.c:72 msgid "Long Edge (Standard)" msgstr "Lado maior (padrão)" #. Translators: this is an option of "Two Sided" -#: ../panels/printers/pp-ipp-option-widget.c:70 ../panels/printers/pp-ppd-option-widget.c:74 +#: ../panels/printers/pp-ipp-option-widget.c:70 +#: ../panels/printers/pp-ppd-option-widget.c:74 msgid "Short Edge (Flip)" msgstr "Lado menor (virar)" @@ -4095,6 +4540,11 @@ msgid "Parallel Port" msgstr "Porta paralela" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4140,7 +4590,7 @@ #. Translators: This option sets whether to print on both sides of paper #: ../panels/printers/pp-options-dialog.c:545 msgid "Two-sided" -msgstr "Dois-lados" +msgstr "Dois lados" #. Translators: This option sets orientation of print (portrait, landscape...) #: ../panels/printers/pp-options-dialog.c:557 @@ -4196,13 +4646,17 @@ msgstr "Avançado" #. Translators: this is an option of "Paper Source" -#: ../panels/printers/pp-ppd-option-widget.c:76 ../panels/printers/pp-ppd-option-widget.c:78 ../panels/printers/pp-ppd-option-widget.c:86 +#: ../panels/printers/pp-ppd-option-widget.c:76 +#: ../panels/printers/pp-ppd-option-widget.c:78 +#: ../panels/printers/pp-ppd-option-widget.c:86 msgid "Auto Select" -msgstr "Auto-selecionar" +msgstr "Autosselecionar" #. Translators: this is an option of "Paper Source" #. Translators: this is an option of "Resolution" -#: ../panels/printers/pp-ppd-option-widget.c:80 ../panels/printers/pp-ppd-option-widget.c:82 ../panels/printers/pp-ppd-option-widget.c:84 +#: ../panels/printers/pp-ppd-option-widget.c:80 +#: ../panels/printers/pp-ppd-option-widget.c:82 +#: ../panels/printers/pp-ppd-option-widget.c:84 #: ../panels/printers/pp-ppd-option-widget.c:88 msgid "Printer Default" msgstr "Padrão da impressora" @@ -4241,7 +4695,8 @@ #: ../panels/printers/pp-samba.c:248 #, c-format msgid "Enter your username and password to view printers available on %s." -msgstr "Digite seu nome de usuário e senha para ver as impressoras disponíveis em %s." +msgstr "" +"Digite seu nome de usuário e senha para ver as impressoras disponíveis em %s." #: ../panels/printers/printers.ui.h:1 msgid "Add Printer" @@ -4301,13 +4756,17 @@ msgid "_Options" msgstr "_Opções" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Sem impressora" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Adicionar uma impressora" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4315,90 +4774,99 @@ "Sinto muito! O serviço de impressão do sistema\n" "parece não estar disponível." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Tela de bloqueio" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Em uso" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Ligado" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Desligado" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Serviços de localização" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Uso & histórico" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Esvaziar todos os itens da lixeira?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Todos os itens na lixeira serão permanentemente excluídos." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Es_vaziar lixeira" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Excluir todos os arquivos temporários?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Todos os arquivos temporários serão permanentemente excluídos." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Excluir _permanentemente arquivos temporários" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Excluir permanentemente arquivos da lixeira e temporários" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Utilização do software" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Relatório de Problema" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format -msgid "Sending reports of technical problems helps us improve %s. Reports are sent anonymously and are scrubbed of personal data." -msgstr "Enviar relatórios de problemas técnicos nos ajuda a melhorar o %s. Os relatórios são enviados anonimamente e não contém dados pessoais." +msgid "" +"Sending reports of technical problems helps us improve %s. Reports are sent " +"anonymously and are scrubbed of personal data." +msgstr "" +"Enviar relatórios de problemas técnicos nos ajuda a melhorar o %s. Os " +"relatórios são enviados anonimamente e não contém dados pessoais." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Política de privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Proteja suas informações pessoais e controle o que os outros podem ver" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 -msgid "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;" -msgstr "tela;bloqueio;diagnostico;travamento;privado;recente;temporário;índice;nome;rede;identidade;" +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 +msgid "" +"screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" +"network;identity;" +msgstr "" +"tela;bloqueio;diagnostico;travamento;privado;recente;temporário;índice;nome;" +"rede;identidade;" #: ../panels/privacy/privacy.ui.h:1 msgid "Screen Turns Off" @@ -4449,8 +4917,12 @@ msgstr "Para sempre" #: ../panels/privacy/privacy.ui.h:20 -msgid "Remembering your history makes things easier to find again. These items are never shared over the network." -msgstr "Lembrar do seu histórico faz com que as coisas fiquem mais fáceis de encontrar. Esses itens nunca são compartilhados com a rede." +msgid "" +"Remembering your history makes things easier to find again. These items are " +"never shared over the network." +msgstr "" +"Lembrar do seu histórico faz com que as coisas fiquem mais fáceis de " +"encontrar. Esses itens nunca são compartilhados com a rede." #: ../panels/privacy/privacy.ui.h:21 msgid "_Recently Used" @@ -4481,8 +4953,13 @@ msgstr "Mostrar _notificações" #: ../panels/privacy/privacy.ui.h:30 -msgid "Automatically purge the Trash and temporary files to help keep your computer free of unnecessary sensitive information." -msgstr "Exclui permanentemente, de forma automática, os arquivos da lixeira e temporários para ajudar a manter seu computador livre de informações sensíveis e desnecessárias." +msgid "" +"Automatically purge the Trash and temporary files to help keep your computer " +"free of unnecessary sensitive information." +msgstr "" +"Exclui permanentemente, de forma automática, os arquivos da lixeira e " +"temporários para ajudar a manter seu computador livre de informações " +"sensíveis e desnecessárias." #: ../panels/privacy/privacy.ui.h:31 msgid "Automatically empty _Trash" @@ -4498,22 +4975,31 @@ #: ../panels/privacy/privacy.ui.h:37 msgid "" -"Sending us information about which software you use helps us provide you with more accurate recommendations. It also helps us to improve our software.\n" +"Sending us information about which software you use helps us provide you " +"with more accurate recommendations. It also helps us to improve our " +"software.\n" "\n" -"All the information we collect is made anonymous, and we will never share your data with third parties." +"All the information we collect is made anonymous, and we will never share " +"your data with third parties." msgstr "" -"Ao nos enviar informações sobre qual software você utiliza, você irá nos ajudar a oferecer-lhe recomendações mais precisas. Isto também nos auxilia a melhorar nosso " -"software.\n" +"Ao nos enviar informações sobre qual software você utiliza, você irá nos " +"ajudar a oferecer-lhe recomendações mais precisas. Isto também nos auxilia a " +"melhorar nosso software.\n" "\n" -"Todas as informações que coletamos é tornada anônima e jamais iremos compartilhar seus dados com terceiros." +"Todas as informações que coletamos é tornada anônima e jamais iremos " +"compartilhar seus dados com terceiros." #: ../panels/privacy/privacy.ui.h:40 msgid "_Send software usage statistics" msgstr "En_viar estatísticas de utilização do software" #: ../panels/privacy/privacy.ui.h:43 -msgid "Location services allow applications to know your location. Using Wi-Fi and mobile broadband increases accuracy." -msgstr "Os serviços de localização permitem aos aplicativos saberem sua posição geográfica. A precisão é aumentada habilitando Wi-Fi e GPS." +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" +"Os serviços de localização permitem aos aplicativos saberem sua posição " +"geográfica. A precisão é aumentada habilitando Wi-Fi e GPS." #: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" @@ -4546,19 +5032,22 @@ msgid "Other" msgstr "Outro" -#: ../panels/region/cc-region-panel.c:248 ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" -msgstr "Sua sessão precisa ser reiniciada para que as alterações sejam efetivadas" +msgstr "" +"Sua sessão precisa ser reiniciada para que as alterações sejam efetivadas" -#: ../panels/region/cc-region-panel.c:252 ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Reiniciar agora" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nenhuma fonte de entrada selecionada" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Tela de início de _sessão" @@ -4590,16 +5079,20 @@ msgid "Paper" msgstr "Papel" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Região & idioma" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 -msgid "Select your display language, formats, keyboard layouts and input sources" -msgstr "Selecione o seus idioma de exibição, formatos, fontes de entradas e disposições de teclado" +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 +msgid "" +"Select your display language, formats, keyboard layouts and input sources" +msgstr "" +"Selecione o seus idioma de exibição, formatos, fontes de entradas e " +"disposições de teclado" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Idioma;Disposição;Teclado;Entrada;" @@ -4655,7 +5148,8 @@ msgid "Left+Right Alt" msgstr "Alt da esquerda+direita" -#: ../panels/region/region.ui.h:1 ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/region/region.ui.h:1 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Idioma" @@ -4701,28 +5195,15 @@ #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" -msgstr "Configurações de inicialização são usadas por todos os usuários ao iniciar sessão no sistema" - -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Locais" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Outro" +msgstr "" +"Configurações de inicialização são usadas por todos os usuários ao iniciar " +"sessão no sistema" -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Selecione localização" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -4730,16 +5211,20 @@ msgid "No applications found" msgstr "Nenhum aplicativo encontrado" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Pesquisa" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 -msgid "Control which applications show search results in the Activities Overview" -msgstr "Controle quais aplicativos mostram resultados de pesquisa no Panorama de atividades" +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 +msgid "" +"Control which applications show search results in the Activities Overview" +msgstr "" +"Controle quais aplicativos mostram resultados de pesquisa no Panorama de " +"atividades" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Pesquisa;Localizar;Índice;Ocultar;Privacidade;Resultados;" @@ -4747,6 +5232,18 @@ msgid "Search Locations" msgstr "Pesquisar localizações" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Locais" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Outro" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Mover para cima" @@ -4759,19 +5256,21 @@ msgid "Preferences" msgstr "Preferências" -# Trata-se daquele "switch" de on e off? Não sei. -# Caso sim, tem que manter o original, "on". Senão, traduzir. +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Sem redes selecionadas para compartilhamento" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" -msgstr "On" +msgstr "Ligada" -# Trata-se daquele "switch" de on e off? Não sei. -# Caso sim, tem que manter o original, "off". Senão, traduzir. -#: ../panels/sharing/cc-sharing-panel.c:265 ../panels/sharing/cc-sharing-panel.c:292 +#: ../panels/sharing/cc-sharing-panel.c:265 +#: ../panels/sharing/cc-sharing-panel.c:292 msgctxt "service is disabled" msgid "Off" -msgstr "Off" +msgstr "Desligada" #: ../panels/sharing/cc-sharing-panel.c:295 msgctxt "service is enabled" @@ -4787,22 +5286,65 @@ msgid "Choose a Folder" msgstr "Escolha uma pasta" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"O compartilhamento de arquivos pessoais permite que você compartilhe sua " +"pasta pública com outros na sua rede atual usando: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Quando a sessão remota está habilitada, usuários remotos podem se conectar " +"usando o comando de Shell Seguro:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Compartilhamento de tela permite que usuários remotos vejam e controlem sua " +"tela conectando a vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copiar" -#: ../panels/sharing/cc-sharing-panel.c:1124 ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Compartilhar" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Compartilhar" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controle o que você quer compartilhar com outros" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 -msgid "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;movies;server;renderer;" -msgstr "compartilhar;compartilhamento;ssh;máquina;host;nome;remoto;desktop;área de trabalho;mídia;áudio;vídeo;imagens;fotos;filmes;servidor;renderizador;" +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 +msgid "" +"share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" +"movies;server;renderer;" +msgstr "" +"compartilhar;compartilhamento;ssh;máquina;host;nome;remoto;desktop;área de " +"trabalho;mídia;áudio;vídeo;imagens;fotos;filmes;servidor;renderizador;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Redes" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -4812,25 +5354,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "É necessário autenticação para habilitar ou desabilitar sessão remota" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Sem redes selecionadas para compartilhamento" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Redes" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Nome do _computador" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Compartilhamento de arquivos _pessoais" +msgid "_File Sharing" +msgstr "Compartilhamento de _arquivos" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -4849,73 +5379,54 @@ msgstr "Alguns serviços estão desabilitados devido a falta de acesso à rede." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Compartilhamento de arquivos pessoais" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "Personal File Sharing allows you to share your Public folder with others on your current network using: dav://%s" -msgstr "O compartilhamento de arquivos pessoais permite que você compartilhe sua pasta pública com outros na sua rede atual usando: dav://%s" +msgid "File Sharing" +msgstr "Compartilhamento de arquivos" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Exigi_r senha" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Sessão remota" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Permita que usuários remotos conectem-se usando o comando SSH:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Compartilhamento de tela" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "Permita que usuários remotos vejam e controlem sua tela conectando a: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Permitir _acesso remoto" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Permitir que as conexões controlem a tela" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Senha:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Mostrar senha" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Opções de acesso" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Novas conexões devem solicitar acesso" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Exigi_r uma senha" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Compartilhamento de multimídia" -#: ../panels/sharing/sharing.ui.h:26 -msgid "Media sharing allows you to share music, photos and videos over the network." -msgstr "O compartilhamento de mídia permite que você compartilhe músicas, fotos e vídeos através da rede." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Compartilhe músicas, fotos e vídeos através da rede." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Pastas" @@ -4925,12 +5436,16 @@ #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:2 msgid "Change sound levels, inputs, outputs, and alert sounds" -msgstr "Alterar níveis, entradas saídas e alertas de som volume de som e eventos de som" +msgstr "" +"Alterar níveis, entradas saídas e alertas de som volume de som e eventos de " +"som" #. Translators: those are keywords for the sound control-center panel #: ../panels/sound/data/gnome-sound-panel.desktop.in.in.h:4 msgid "Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset;Audio;" -msgstr "Cartão;Microfone;Volume;Desaparecer;Balanço;Bluetooth;Fone de ouvido com microfone;Áudio;" +msgstr "" +"Cartão;Microfone;Volume;Desaparecer;Balanço;Bluetooth;Fone de ouvido com " +"microfone;Áudio;" #. Translators: This is the name of an audio file that sounds like the bark of a dog. #. You might want to translate it into the equivalent words of your language. @@ -5008,7 +5523,8 @@ msgid "Unamplified" msgstr "Não amplificado" -#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249 ../panels/sound/gvc-mixer-dialog.c:515 +#: ../panels/sound/gvc-combo-box.c:166 ../panels/sound/gvc-mixer-dialog.c:249 +#: ../panels/sound/gvc-mixer-dialog.c:515 msgid "_Profile:" msgstr "_Perfil:" @@ -5042,10 +5558,6 @@ msgid "Peak detect" msgstr "Detectar pico" -#: ../panels/sound/gvc-mixer-dialog.c:1493 ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Nome" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Dispositivo" @@ -5103,11 +5615,15 @@ msgid "Built-in" msgstr "Embutido" -#: ../panels/sound/gvc-sound-theme-chooser.c:454 ../panels/sound/gvc-sound-theme-chooser.c:466 ../panels/sound/gvc-sound-theme-chooser.c:478 +#: ../panels/sound/gvc-sound-theme-chooser.c:454 +#: ../panels/sound/gvc-sound-theme-chooser.c:466 +#: ../panels/sound/gvc-sound-theme-chooser.c:478 msgid "Sound Preferences" msgstr "Preferências de som" -#: ../panels/sound/gvc-sound-theme-chooser.c:457 ../panels/sound/gvc-sound-theme-chooser.c:468 ../panels/sound/gvc-sound-theme-chooser.c:480 +#: ../panels/sound/gvc-sound-theme-chooser.c:457 +#: ../panels/sound/gvc-sound-theme-chooser.c:468 +#: ../panels/sound/gvc-sound-theme-chooser.c:480 msgid "Testing event sound" msgstr "Testando eventos de som" @@ -5127,7 +5643,8 @@ msgid "Stop" msgstr "Parar" -#: ../panels/sound/gvc-speaker-test.c:231 ../panels/sound/gvc-speaker-test.c:343 +#: ../panels/sound/gvc-speaker-test.c:231 +#: ../panels/sound/gvc-speaker-test.c:343 msgid "Test" msgstr "Teste" @@ -5135,18 +5652,27 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Personalizado" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Acessibilidade" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Torna mais fácil ver, ouvir, digitar, apontar e clicar" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 -msgid "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;AccessX;Sticky;Keys;Slow;Bounce;Mouse;" -msgstr "Teclado;Mouse;a11y;Acessibilidade;Contraste;Zoom;Ampliação;Leitor de tela;texto;fonte;tamanho;AccessX;Teclas;Lentas;Repercussão;Mouse;" +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 +msgid "" +"Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" +"AccessX;Sticky;Keys;Slow;Bounce;Mouse;" +msgstr "" +"Teclado;Mouse;a11y;Acessibilidade;Contraste;Zoom;Ampliação;Leitor de tela;" +"texto;fonte;tamanho;AccessX;Teclas;Lentas;Repercussão;Mouse;" #: ../panels/universal-access/uap.ui.h:1 msgid "_Always Show Universal Access Menu" @@ -5164,7 +5690,8 @@ msgid "_Large Text" msgstr "Texto _grande" -#: ../panels/universal-access/uap.ui.h:5 ../panels/universal-access/zoom-options.ui.h:7 +#: ../panels/universal-access/uap.ui.h:5 +#: ../panels/universal-access/zoom-options.ui.h:7 msgid "_Zoom" msgstr "_Ampliação" @@ -5237,8 +5764,8 @@ msgstr "Teclas sonorizadas" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Soa um bip quando Num Lock ou Caps Lock forem ativados." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Soa um bipe quando Num Lock ou Caps Lock forem ativados." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5266,7 +5793,7 @@ #: ../panels/universal-access/uap.ui.h:32 msgid "Key presses repeat when key is held down." -msgstr "A tecla é repetida quando mantida pressionada" +msgstr "A tecla é repetida quando mantida pressionada." # Compreendo que seja atraso na repetição, pois isto permite que as teclas sejam repetidas em uma velocidade menor, desde que o usuário mantenha a tecla pressionada. --Enrico #: ../panels/universal-access/uap.ui.h:34 @@ -5275,7 +5802,7 @@ #: ../panels/universal-access/uap.ui.h:35 msgid "Speed" -msgstr "Velocidade:" +msgstr "Velocidade" #: ../panels/universal-access/uap.ui.h:36 msgid "Repeat keys speed" @@ -5287,7 +5814,7 @@ #: ../panels/universal-access/uap.ui.h:38 msgid "Cursor blinks in text fields." -msgstr "Cursor intermitente nos campos de texto" +msgstr "Cursor intermitente nos campos de texto." #: ../panels/universal-access/uap.ui.h:39 msgid "Cursor blinking speed" @@ -5303,7 +5830,8 @@ #: ../panels/universal-access/uap.ui.h:42 msgid "Treats a sequence of modifier keys as a key combination" -msgstr "Dispõe de uma sequancia de teclas modificadoras como uma combinação de teclas" +msgstr "" +"Dispõe de uma sequência de teclas modificadoras como uma combinação de teclas" #: ../panels/universal-access/uap.ui.h:43 msgid "_Disable if two keys are pressed together" @@ -5319,7 +5847,8 @@ #: ../panels/universal-access/uap.ui.h:46 msgid "Puts a delay between when a key is pressed and when it is accepted" -msgstr "Colocar um atraso entre quando a tecla é pressionada e quando ela é aceita" +msgstr "" +"Colocar um atraso entre quando a tecla é pressionada e quando ela é aceita" #: ../panels/universal-access/uap.ui.h:47 msgid "A_cceptance delay:" @@ -5366,7 +5895,7 @@ #: ../panels/universal-access/uap.ui.h:57 msgid "Bounce keys typing delay" -msgstr "Atraso das teclas de repercursão ao digitar" +msgstr "Atraso das teclas de repercussão ao digitar" #: ../panels/universal-access/uap.ui.h:58 msgctxt "bounce keys delay" @@ -5383,7 +5912,7 @@ #: ../panels/universal-access/uap.ui.h:61 msgid "Click Assist" -msgstr "Assitência de clique" +msgstr "Assistência de clique" #: ../panels/universal-access/uap.ui.h:62 msgid "_Simulated Secondary Click" @@ -5619,87 +6148,69 @@ msgid "Color Effects" msgstr "Efeitos de cor" -#: ../panels/user-accounts/data/account-dialog.ui.h:1 ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:1 +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Adicionar usuário" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "Nome _completo" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Padrão" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrador" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "Nome _completo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Tipo de conta" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Permitir aos usuários definirem uma senha no próximo _início de sessão" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Definir uma senha _agora" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verificar" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirmar" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 -msgid "Enterprise login allows an existing centrally managed user account to be used on this device." -msgstr "A sessão corporativa permite que uma conta existente de usuário gerenciada centralmente seja usada neste dispositivo." +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +msgid "" +"Enterprise login allows an existing centrally managed user account to be " +"used on this device. You can also use this account to access company " +"resources on the internet." +msgstr "" +"A sessão corporativa permite que uma conta existente de usuário gerenciada " +"centralmente seja usada neste dispositivo. Você também pode usar essa conta " +"para acessar recursos corporativos na Internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domínio" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Conecte-se para adicionar\n" -"contas de sessão corporativa." +#: ../panels/user-accounts/data/account-dialog.ui.h:16 +msgid "You are Offline" +msgstr "Você está desconectado" + +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Conecte-se para adicionar contas de sessão corporativa." -#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/account-dialog.ui.h:18 msgid "_Enterprise Login" msgstr "Sessão cor_porativa" -#: ../panels/user-accounts/data/account-dialog.ui.h:16 ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Adicionar usuário" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Registrar" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Sessão do administrador de domínio" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"A fim de usar logins corporativos, este computador deve estar\n" -"registrado no domínio. Por gentileza, peça ao administrador\n" -"de rede para digitar a senha de domínio aqui." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nome do administrador" - -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Senha do administrador" - #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" msgstr "Polegar esquerdo" @@ -5732,7 +6243,8 @@ msgid "Right little finger" msgstr "Dedo pequeno direito" -#: ../panels/user-accounts/data/account-fingerprint.ui.h:9 ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/data/account-fingerprint.ui.h:9 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Habilita o início de sessão por impressão digital" @@ -5749,8 +6261,12 @@ msgstr "_Outro dedo:" #: ../panels/user-accounts/data/account-fingerprint.ui.h:13 -msgid "Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader." -msgstr "Sua impressão digital foi salva com sucesso. Você deve estar pronto para iniciar a sessão usando seu leitor de impressão digital." +msgid "" +"Your fingerprint was successfully saved. You should now be able to log in " +"using your fingerprint reader." +msgstr "" +"Sua impressão digital foi salva com sucesso. Você deve estar pronto para " +"iniciar a sessão usando seu leitor de impressão digital." #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:1 msgid "Users" @@ -5763,11 +6279,35 @@ #. Translators: those are keywords for the user accounts control-center panel #: ../panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in.h:4 msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" -msgstr "Iniciar sessão;Sessão;Nome;Impressão digital;Avatar;Logotipo;Face;Senha;" +msgstr "" +"Iniciar sessão;Sessão;Nome;Impressão digital;Avatar;Logotipo;Face;Senha;" + +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Registrar" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Sessão do administrador de domínio" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"A fim de usar logins corporativos, este computador deve estar\n" +"registrado no domínio. Por gentileza, peça ao administrador\n" +"de rede para digitar a senha de domínio aqui." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nome do administrador" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Histórico de início de sessão" +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Senha do administrador" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -5790,38 +6330,30 @@ msgstr "Senha _atual" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Permitir aos usuários definirem uma senha no próximo início de sessão" +msgid "Allow user to change their password on next login" +msgstr "Permitir aos usuários alterarem sua senha no próximo início de sessão" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Definir uma senha agora" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Adicionar conta de usuário" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Excluir conta de usuário" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Adicionar usuário…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opções de início de sessão" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Início a_utomático de sessão" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Início de sessão por _impressão digital" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ícone do usuário" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Última sessão" @@ -5905,8 +6437,12 @@ #: ../panels/user-accounts/pw-utils.c:111 msgctxt "Password hint" -msgid "Try to avoid repeating the same type of character: you need to mix up letters, numbers and punctuation." -msgstr "Evite repetir o mesmo tipo de caractere: você precisa misturar letras, números e pontuação." +msgid "" +"Try to avoid repeating the same type of character: you need to mix up " +"letters, numbers and punctuation." +msgstr "" +"Evite repetir o mesmo tipo de caractere: você precisa misturar letras, " +"números e pontuação." #: ../panels/user-accounts/pw-utils.c:113 msgctxt "Password hint" @@ -5920,35 +6456,43 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Misture maiúsculas e minúsculas e use um ou dois números." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Misture maiúsculas e minúsculas e tente usar um ou dois números." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" -msgid "Good password! Adding more letters, numbers and punctuation will make it stronger." -msgstr "Boa senha! Adicionar mais letras, números e pontuação a tornará mais forte." +msgid "" +"Good password! Adding more letters, numbers and punctuation will make it " +"stronger." +msgstr "" +"Boa senha! Adicionar mais letras, números e pontuação a tornará mais forte." -#: ../panels/user-accounts/pw-utils.c:141 ../panels/user-accounts/pw-utils.c:171 +#: ../panels/user-accounts/pw-utils.c:141 +#: ../panels/user-accounts/pw-utils.c:171 msgctxt "Password strength" msgid "Strength: Weak" msgstr "Força: Fraca" -#: ../panels/user-accounts/pw-utils.c:145 ../panels/user-accounts/pw-utils.c:172 +#: ../panels/user-accounts/pw-utils.c:145 +#: ../panels/user-accounts/pw-utils.c:172 msgctxt "Password strength" msgid "Strength: Low" msgstr "Força: Baixa" -#: ../panels/user-accounts/pw-utils.c:148 ../panels/user-accounts/pw-utils.c:173 +#: ../panels/user-accounts/pw-utils.c:148 +#: ../panels/user-accounts/pw-utils.c:173 msgctxt "Password strength" msgid "Strength: Medium" msgstr "Força: Média" -#: ../panels/user-accounts/pw-utils.c:151 ../panels/user-accounts/pw-utils.c:174 +#: ../panels/user-accounts/pw-utils.c:151 +#: ../panels/user-accounts/pw-utils.c:174 msgctxt "Password strength" msgid "Strength: Good" msgstr "Força: Boa" -#: ../panels/user-accounts/pw-utils.c:154 ../panels/user-accounts/pw-utils.c:175 +#: ../panels/user-accounts/pw-utils.c:154 +#: ../panels/user-accounts/pw-utils.c:175 msgctxt "Password strength" msgid "Strength: High" msgstr "Força: Alta" @@ -6003,30 +6547,32 @@ msgstr "Erro desconhecido" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Deveria corresponder ao endereço web do seu provedor de conta." +msgid "Should match the web address of your login provider." +msgstr "Deveria corresponder ao endereço web do seu provedor de sessão." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Falha ao adicionar conta" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "As senhas não conferem." -#: ../panels/user-accounts/um-account-dialog.c:733 ../panels/user-accounts/um-account-dialog.c:779 ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Falha ao registrar conta" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nenhuma forma suportada para autenticar neste domínio" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Falha em entrar no domínio" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6034,7 +6580,7 @@ "Aquele nome de sessão não funcionou.\n" "Por favor, tente novamente." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6042,17 +6588,30 @@ "Aquela senha de sessão não funcionou.\n" "Por favor, tente novamente." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Falha em fazer login no domínio" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Não foi possível localizar o domínio. Teria você errado a ortografia?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Padrão" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrador" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 -msgid "You are not allowed to access the device. Contact your system administrator." -msgstr "Você não tem permissão para acessar o dispositivo. Contate seu administrador de sistemas." +msgid "" +"You are not allowed to access the device. Contact your system administrator." +msgstr "" +"Você não tem permissão para acessar o dispositivo. Contate seu administrador " +"de sistemas." #: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." @@ -6066,26 +6625,31 @@ msgid "Enabled" msgstr "Habilitado" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Excluir impressões digitais registradas?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "E_xcluir impressões digitais" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 -msgid "Do you want to delete your registered fingerprints so fingerprint login is disabled?" -msgstr "Você tem certeza de que quer excluir suas impressões digitais registradas porque o início de sessão por impressão digital está desabilitado?" +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 +msgid "" +"Do you want to delete your registered fingerprints so fingerprint login is " +"disabled?" +msgstr "" +"Você tem certeza de que quer excluir suas impressões digitais registradas " +"porque o início de sessão por impressão digital está desabilitado?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Feito!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Não foi possível acessar o dispositivo \"%s\"" @@ -6093,16 +6657,18 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" -msgstr "Não foi possível iniciar o dispositivo de captura de impressões digitais \"%s\"" +msgstr "" +"Não foi possível iniciar o dispositivo de captura de impressões digitais \"%s" +"\"" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Não foi possível acessar qualquer leitor de impressões digitais" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Por favor, contate seu administrador de sistemas para ajuda." @@ -6111,16 +6677,20 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format -msgid "To enable fingerprint login, you need to save one of your fingerprints, using the '%s' device." -msgstr "Para habilitar o início de sessão por impressão digital, você precisa salvar uma de suas impressões digitais, usando o dispositivo \"%s\"." +msgid "" +"To enable fingerprint login, you need to save one of your fingerprints, " +"using the '%s' device." +msgstr "" +"Para habilitar o início de sessão por impressão digital, você precisa salvar " +"uma de suas impressões digitais, usando o dispositivo \"%s\"." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Selecionando dedo" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Inscrição de impressões digitais" @@ -6136,7 +6706,8 @@ #. shown as the first day of a week on login history dialog. #. Translators: This is a date format string in the style of "Feb 24", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:79 ../panels/user-accounts/um-history-dialog.c:83 +#: ../panels/user-accounts/um-history-dialog.c:79 +#: ../panels/user-accounts/um-history-dialog.c:83 msgctxt "login history week label" msgid "%b %e" msgstr "%e de %b" @@ -6158,27 +6729,36 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. -#: ../panels/user-accounts/um-history-dialog.c:177 ../panels/user-accounts/um-user-panel.c:841 +#: ../panels/user-accounts/um-history-dialog.c:177 +#: ../panels/user-accounts/um-user-panel.c:841 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. -#: ../panels/user-accounts/um-history-dialog.c:180 ../panels/user-accounts/um-user-panel.c:845 +#: ../panels/user-accounts/um-history-dialog.c:180 +#: ../panels/user-accounts/um-user-panel.c:845 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sessão finalizada" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sessão iniciada" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Atividade da conta" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Por favor, escolha outra senha." @@ -6225,7 +6805,8 @@ msgid "No such domain or realm found" msgstr "O domínio não existe" -#: ../panels/user-accounts/um-realm-manager.c:815 ../panels/user-accounts/um-realm-manager.c:829 +#: ../panels/user-accounts/um-realm-manager.c:815 +#: ../panels/user-accounts/um-realm-manager.c:829 #, c-format msgid "Cannot log in as %s at the %s domain" msgstr "Não foi possível fazer login como %s no domínio %s" @@ -6239,7 +6820,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Não foi possível conectar ao domínio %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Outras contas" @@ -6247,7 +6828,9 @@ msgid "Failed to delete user" msgstr "Falha ao excluir usuário" -#: ../panels/user-accounts/um-user-panel.c:507 ../panels/user-accounts/um-user-panel.c:566 ../panels/user-accounts/um-user-panel.c:618 +#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:566 +#: ../panels/user-accounts/um-user-panel.c:618 msgid "Failed to revoke remotely managed user" msgstr "Falha ao revogar usuário gerenciado remotamente" @@ -6261,8 +6844,12 @@ msgstr "%s ainda está conectado" #: ../panels/user-accounts/um-user-panel.c:687 -msgid "Deleting a user while they are logged in can leave the system in an inconsistent state." -msgstr "Excluindo um usuário enquanto ele está conectado pode deixar o sistema em um estado inconsistente." +msgid "" +"Deleting a user while they are logged in can leave the system in an " +"inconsistent state." +msgstr "" +"Excluindo um usuário enquanto ele está conectado pode deixar o sistema em um " +"estado inconsistente." #: ../panels/user-accounts/um-user-panel.c:696 #, c-format @@ -6270,8 +6857,12 @@ msgstr "Você deseja manter os arquivos de %s?" #: ../panels/user-accounts/um-user-panel.c:700 -msgid "It is possible to keep the home directory, mail spool and temporary files around when deleting a user account." -msgstr "É possível manter o diretório home, fila de e-mail e arquivos temporários ao excluir uma conta de usuário." +msgid "" +"It is possible to keep the home directory, mail spool and temporary files " +"around when deleting a user account." +msgstr "" +"É possível manter o diretório home, fila de e-mail e arquivos temporários ao " +"excluir uma conta de usuário." #: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" @@ -6284,7 +6875,8 @@ #: ../panels/user-accounts/um-user-panel.c:718 #, c-format msgid "Are you sure you want to revoke remotely managed %s's account?" -msgstr "Tem certeza de que deseja revogar a conta gerenciada remotamente do %s?" +msgstr "" +"Tem certeza de que deseja revogar a conta gerenciada remotamente do %s?" #: ../panels/user-accounts/um-user-panel.c:722 msgid "_Delete" @@ -6309,15 +6901,17 @@ msgid "Logged in" msgstr "Acesso autorizado" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Falhou ao contactar o serviço de contas" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." -msgstr "Por favor, certifique-se de que o Serviço de Contas esteja instalado corretamente." +msgstr "" +"Por favor, certifique-se de que o Serviço de Contas esteja instalado " +"corretamente." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6325,11 +6919,12 @@ "Para fazer alterações,\n" "clique no ícone * primeiro" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Cria uma conta de usuário" -#: ../panels/user-accounts/um-user-panel.c:1364 ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6337,11 +6932,12 @@ "Para criar uma conta de usuário,\n" "clique primeiro no ícone *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Exclui a conta de usuário selecionada" -#: ../panels/user-accounts/um-user-panel.c:1386 ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6349,32 +6945,36 @@ "Para excluir a conta de usuário selecionada,\n" "clique primeiro no ícone *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Minha conta" -# Substituído usuário por conta a fim de evitar redundância --Enrico #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Já existe uma conta com o nome de usuário \"%s\"." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Desculpe, o nome de usuário informado não é válido. Por favor, tente outro." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "O nome de usuário é muito longo." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "O nome de usuário não pode começar com um '-'." -#: ../panels/user-accounts/um-utils.c:573 -msgid "The username should only consist of lower and upper case letters from a-z, digits and any of characters '.', '-' and '_'." -msgstr "O nome de usuário deve consistir apenas de letras maiúsculas e minúsculas de a à z, dígitos e qualquer um dos caracteres '.', '-' e '_'." +#: ../panels/user-accounts/um-utils.c:572 +msgid "" +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" +msgstr "" +"O nome de usuário deve consistir apenas de letras maiúsculas e minúsculas de " +"a-z, dígitos e dos seguintes caracteres: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." -msgstr "Isto será usado para nomear sua pasta pessoal e não pode ser modificado." +msgstr "" +"Isto será usado para nomear sua pasta pessoal e não pode ser modificado." #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" @@ -6385,14 +6985,21 @@ msgstr "Associar botões a funções" #: ../panels/wacom/button-mapping.ui.h:4 -msgid "To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard shortcut button and hold down the new keys or press Backspace to clear." +msgid "" +"To edit a shortcut, choose the \"Send Keystroke\" action, press the keyboard " +"shortcut button and hold down the new keys or press Backspace to clear." msgstr "" -"Para editar um atalho, escolha a ação \"Enviar sequência de teclas\", pressione o botão de atalho no teclado e mantenha pressionada as novas teclas ou pressione a tecla " -"Backspace para limpar." +"Para editar um atalho, escolha a ação \"Enviar sequência de teclas\", " +"pressione o botão de atalho no teclado e mantenha pressionada as novas " +"teclas ou pressione a tecla Backspace para limpar." #: ../panels/wacom/calibrator/calibrator-gui.c:83 -msgid "Please tap the target markers as they appear on screen to calibrate the tablet." -msgstr "Por gentileza, \"bata\" nos marcadores-alvo a medida que eles aparecem na tela para calibrar o tablet." +msgid "" +"Please tap the target markers as they appear on screen to calibrate the " +"tablet." +msgstr "" +"Por gentileza, \"bata\" nos marcadores-alvo a medida que eles aparecem na " +"tela para calibrar o tablet." #: ../panels/wacom/calibrator/calibrator-gui.c:87 msgid "Mis-click detected, restarting..." @@ -6457,16 +7064,18 @@ msgid "Button" msgstr "Botão" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablet Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" -msgstr "Defina mapeamentos de botão e ajuste a sensibilidade de estilo para tablets" +msgstr "" +"Defina mapeamentos de botão e ajuste a sensibilidade de estilo para tablets" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Caneta;Borracha;Mouse;" @@ -6496,7 +7105,11 @@ #: ../panels/wacom/gnome-wacom-properties.ui.h:8 msgid "Bluetooth Settings" -msgstr "Configurações de bluetooth" +msgstr "Configurações de Bluetooth" + +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet Wacom" #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" @@ -6591,22 +7204,22 @@ msgid "Mode Switch #%d" msgstr "Modo alternador #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Botão esquerdo #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Botão direito #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Botão superior #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Botão inferior #%d" @@ -6637,7 +7250,7 @@ #: ../panels/wacom/wacom-stylus-page.ui.h:6 msgid "Scroll Down" -msgstr "Rolagem para bauxi" +msgstr "Rolagem para baixo" #: ../panels/wacom/wacom-stylus-page.ui.h:7 msgid "Scroll Left" @@ -6683,6 +7296,11 @@ msgid "Tip Pressure Feel" msgstr "Sensação de pressão da ponta" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Todas configurações" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centro de controle GNOME" @@ -6692,8 +7310,12 @@ msgstr "Utilitários para configura o ambiente GNOME" #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:3 -msgid "The control center is GNOME's main interface for configuration of various aspects of your desktop." -msgstr "O centro de controle é a interface principal do GNOME para configuração de vários aspectos de seu ambiente." +msgid "" +"The control center is GNOME's main interface for configuration of various " +"aspects of your desktop." +msgstr "" +"O centro de controle é a interface principal do GNOME para configuração de " +"vários aspectos de seu ambiente." #: ../shell/cc-application.c:45 msgid "Display version number" @@ -6735,22 +7357,18 @@ msgid "Quit" msgstr "Sair" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Todas configurações" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Pessoal" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardware" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -6789,6 +7407,200 @@ msgid "Cancel search" msgstr "Cancelar pesquisa" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Ponto de acesso" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "" +#~ "O atalho de teclado para %s. Digite um novo atalho para alterá-lo." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Para editar um atalho, clique na linha e mantenha pressionada as novas " +#~ "teclas ou pressione a tecla Backspace para limpar." + +#~ msgid "_Name:" +#~ msgstr "_Nome:" + +#~ msgid "Add Shortcut" +#~ msgstr "Adicionar atalho" + +#~ msgid "Remove Shortcut" +#~ msgstr "Excluir atalho" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "O atalho \"%s\" não pode ser usado porque se tornaria impossível digitar " +#~ "usando esta tecla.\n" +#~ "Por favor, tente usar uma tecla como Control, Alt ou Shift " +#~ "simultaneamente." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "O atalho \"%s\" já está sendo usado por\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Se você reatribuir o atalho para \"%s\", o atalho \"%s\" será desativado." + +#~ msgid "_Reassign" +#~ msgstr "_Reatribuir" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "O atalho \"%s\" possui um atalho \"%s\" associado. Você deseja defini-lo " +#~ "automaticamente para \"%s\"?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" está atualmente associado a \"%s\", este atalho será desativado " +#~ "caso você prossiga." + +#~ msgid "_Assign" +#~ msgstr "A_tribuir" + +#~ msgid "Error logging into the account" +#~ msgstr "Erro ao iniciar sessão com a conta" + +#~ msgid "Credentials have expired." +#~ msgstr "As credenciais expiraram." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Autentique para habilitar esta conta." + +#~ msgid "_Sign In" +#~ msgstr "_Autenticar" + +#~ msgid "Add User Account" +#~ msgstr "Adicionar conta de usuário" + +#~ msgid "Remove User Account" +#~ msgstr "Excluir conta de usuário" + +#~ msgid "_Account Activity" +#~ msgstr "_Atividade da conta" + +#~ msgid "Login History" +#~ msgstr "Histórico de início de sessão" + +#~ msgid "Add Network Connection" +#~ msgstr "Adicionar conexão de rede" + +#~ msgid "Personal File Sharing" +#~ msgstr "Compartilhamento de arquivos pessoais" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Permitir _acesso remoto" + +#, fuzzy +#~| msgid "GNOME Control Center" +#~ msgid "Welcome to the Control Center" +#~ msgstr "Centro de controle GNOME" + +#~ msgid "Bond" +#~ msgstr "Vínculo" + +# Refere-se a tipo de conexão -- Enrico +#~ msgid "Team" +#~ msgstr "União" + +#~ msgid "Bridge" +#~ msgstr "Ponte" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Não foi possível carregar os plug-ins de VPN" + +#~ msgid "Bond slaves" +#~ msgstr "Vínculos escravos" + +#~ msgid "(none)" +#~ msgstr "(nenhum)" + +#~ msgid "Bridge slaves" +#~ msgstr "Pontes escravas" + +#~ msgid "Team slaves" +#~ msgstr "Uniões escravas" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Dispositivo de InfiniBand não tem suporte ao modo conectado" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nenhuma certificado de autoridade certificadora escolhido" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Não usar um certificado de uma autoridade certificadora (AC) pode " +#~ "resultar em conexões a redes sem fio inseguras e arriscadas. Deseja " +#~ "escolher um certificado de autoridade certificadora?" + +#~ msgid "Ignore" +#~ msgstr "Ignorar" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Escolher certificado de AC" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Pedir esta senha todas as vezes" + +#~ msgid "Don't _warn me again" +#~ msgstr "Não me a_vise novamente" + +#~ msgid "No" +#~ msgstr "Não" + +#~ msgid "Yes" +#~ msgstr "Sim" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Outro" + +#~ msgid "_Verify" +#~ msgstr "_Verificar" + +#~ msgid "Login Options" +#~ msgstr "Opções de início de sessão" + +# Substituído usuário por conta a fim de evitar redundância --Enrico +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Já existe uma conta com o nome de usuário \"%s\"." + +#~ msgid "Color" +#~ msgstr "Cor" + +#~ msgid "Power" +#~ msgstr "Energia" + +#~ msgid "Privacy" +#~ msgstr "Privacidade" + #~ msgid "Used to determine your geographical location" #~ msgstr "É usado para determinar sua localização geográfica" @@ -6845,9 +7657,6 @@ #~ msgid "Color" #~ msgstr "Colorido" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Rolagem com dois dedos" - #~ msgid "_Delay:" #~ msgstr "Interv_alo:" @@ -6870,9 +7679,6 @@ #~ msgid "S_peed:" #~ msgstr "V_elocidade:" -#~ msgid "Shortcuts" -#~ msgstr "Atalhos" - #~ msgid "Test Your Settings" #~ msgstr "Testar suas configurações" @@ -6935,8 +7741,12 @@ #~ msgid "Power off" #~ msgstr "Desligar" -#~ msgid "Bluetooth Sharing allows you to share files with other Bluetooth enabled devices" -#~ msgstr "O compartilhamento Bluetooth permite que você compartilhe arquivos com outros dispositivos Bluetooth habilitados" +#~ msgid "" +#~ "Bluetooth Sharing allows you to share files with other Bluetooth enabled " +#~ "devices" +#~ msgstr "" +#~ "O compartilhamento Bluetooth permite que você compartilhe arquivos com " +#~ "outros dispositivos Bluetooth habilitados" #~ msgid "Only Receive From Trusted Devices" #~ msgstr "Apenas receber de dispositivos confiáveis" @@ -6955,7 +7765,8 @@ #~ "Run '%s --help' to see a full list of available command line options.\n" #~ msgstr "" #~ "%s\n" -#~ "Execute '%s --help' para ver uma lista completa de opções de linha de comando disponíveis.\n" +#~ "Execute '%s --help' para ver uma lista completa de opções de linha de " +#~ "comando disponíveis.\n" #~ msgid "Turns off wireless devices" #~ msgstr "Desliga dispositivos de rede sem fio" @@ -6981,7 +7792,8 @@ #~ msgstr "Mostrar na tela de bloqueio" #~ msgid "Enter address of a printer or a text to filter results" -#~ msgstr "Digite o endereço de uma impressora ou um texto para filtrar resultados" +#~ msgstr "" +#~ "Digite o endereço de uma impressora ou um texto para filtrar resultados" #~ msgid "United States" #~ msgstr "Estados Unidos" @@ -7073,8 +7885,12 @@ #~ msgid "Remove '%s' from the list of devices?" #~ msgstr "Remover \"%s\" da lista de dispositivos?" -#~ msgid "If you remove the device, you will have to set it up again before next use." -#~ msgstr "Se você excluir este dispositivo, você terá de configurá-lo novamente antes do próximo uso." +#~ msgid "" +#~ "If you remove the device, you will have to set it up again before next " +#~ "use." +#~ msgstr "" +#~ "Se você excluir este dispositivo, você terá de configurá-lo novamente " +#~ "antes do próximo uso." #~ msgctxt "Language" #~ msgid "None" @@ -7095,8 +7911,12 @@ #~ msgid "Model:" #~ msgstr "Modelo:" -#~ msgid "Image files can be dragged on this window to auto-complete the above fields." -#~ msgstr "Arquivos de imagem podem ser arrastados sobre esta janela para completar automaticamente os campos acima." +#~ msgid "" +#~ "Image files can be dragged on this window to auto-complete the above " +#~ "fields." +#~ msgstr "" +#~ "Arquivos de imagem podem ser arrastados sobre esta janela para completar " +#~ "automaticamente os campos acima." #~ msgid "Show your primary display on this screen also" #~ msgstr "Mostra sua tela primária também nesta tela" @@ -7125,8 +7945,11 @@ #~ msgid "Changing photo for:" #~ msgstr "Alterando foto para:" -#~ msgid "Choose a picture that will be shown at the login screen for this account." -#~ msgstr "Escolha a imagem que será mostrada na tela de início de sessão para esta conta." +#~ msgid "" +#~ "Choose a picture that will be shown at the login screen for this account." +#~ msgstr "" +#~ "Escolha a imagem que será mostrada na tela de início de sessão para esta " +#~ "conta." #~ msgid "Gallery" #~ msgstr "Galeria" diff -Nru gnome-control-center-3.20.2/po/pt.po gnome-control-center-3.22.1/po/pt.po --- gnome-control-center-3.20.2/po/pt.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/pt.po 2016-08-12 12:43:57.000000000 +0000 @@ -4,7 +4,7 @@ # Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Nuno Ferreira , 1999. # António Lima , 2013. -# Tiago Santos , 2014, 2016. +# Tiago Santos , 2014 - 2016. # Pedro Albuquerque , 2015. # Sérgio Cardeira , 2016. # @@ -13,16 +13,16 @@ "Project-Id-Version: 3.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-29 07:56+0000\n" -"PO-Revision-Date: 2016-04-29 15:00+0100\n" +"POT-Creation-Date: 2016-07-27 06:58+0000\n" +"PO-Revision-Date: 2016-07-27 08:36+0100\n" "Last-Translator: Tiago Santos \n" -"Language-Team: Português \n" +"Language-Team: Português\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Language: pt_PT\n" "X-Source-Language: C\n" "X-Project-Style: gnome\n" @@ -97,7 +97,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Pasta pessoal" @@ -112,30 +112,29 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1281 -#: ../panels/network/net-device-wifi.c:1481 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1295 +#: ../panels/network/net-device-wifi.c:1532 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1032 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 #: ../panels/user-accounts/um-fingerprint-dialog.c:266 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 -#: ../panels/user-accounts/um-user-panel.c:705 -#: ../panels/user-accounts/um-user-panel.c:723 +#: ../panels/user-accounts/um-user-panel.c:704 +#: ../panels/user-accounts/um-user-panel.c:722 msgid "_Cancel" msgstr "_Cancelar" @@ -162,17 +161,17 @@ msgid "Current background" msgstr "Fundo atual" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -#| msgid "_Background" -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Fundo" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Alterar a sua imagem de fundo para um papel de parede ou fotografia" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Papel de parede;Ecrã;Área de trabalho;" @@ -212,18 +211,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Desligue o interruptor de modo Avião para ativar o Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Ligar e desligar o Bluetooth e ligar os seus dispositivos" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "partilhar;partilha;bluetooth;obex;" @@ -398,7 +396,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Todos os ficheiros" @@ -437,7 +435,7 @@ msgstr "Gravar o perfil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Gravar" @@ -708,12 +706,11 @@ msgid "_Import File…" msgstr "_Importar ficheiro…" -#: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Adicionar" @@ -863,18 +860,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Cor" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Calibre a cor dos seus dispositivos, tais como ecrãs, câmaras ou impressoras" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Cor;ICC;Perfil;Calibrar;Impressora;Ecrã;" @@ -893,12 +891,12 @@ msgstr "Nenhum idioma encontrado" #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hoje" #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Ontem" @@ -1028,8 +1026,9 @@ msgid "December" msgstr "dezembro" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Data & Hora" @@ -1086,12 +1085,12 @@ msgid "AM / PM" msgstr "AM/PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Alterar a data e hora, incluindo o fuso horário" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Relógio;Fuso horário;Fuso;Localização;" @@ -1103,25 +1102,25 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Para alterar as definições de data ou hora, tem de se autenticar." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Tampa fechada" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Ecrãs em espelho" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primário" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:174 +#: ../panels/privacy/cc-privacy-panel.c:241 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1131,180 +1130,194 @@ msgid "Off" msgstr "Desligado" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Secundário" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Organizar ecrãs combinados" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Aplicar" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Arraste os ecrãs para os reorganizar" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Rodar 90° à esquerda" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Rodar 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Rodar 90° à direita" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Tamanho" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Proporção" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Resolução" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Ajustar para TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Taxa de atualização" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Mostrar a barra superior e a vista geral de atividades neste ecrã" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Ecrã secundário" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Unir este ecrã a outro para criar uma área de trabalho extra" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Apresentação" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Mostrar só diaporamas e média" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Ecrãs em espelho" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Mostrar a sua vista existente em ambos os ecrãs" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Desligar" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Não utilizar este ecrã" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Impossível obter informação do ecrã" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Organizar ecrãs combinados" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -#| msgid "Dis­plays" -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ecrãs" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Alterar como utilizar os monitores e projetores ligados" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Painel;Projetor;xrandr;Ecrã;Resolução;Atualizar;Monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Desconhecido" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (ID da versão: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (ID da versão: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Perguntar o que fazer" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Não fazer nada" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Abrir pasta" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Outro suporte" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Selecione uma aplicação para CDs de áudio" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Selecione uma aplicação para DVDs de vídeo" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Selecione uma aplicação a executar ao ligar um reprodutor de música" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Selecione uma aplicação a executar ao ligar uma câmara" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Selecione uma aplicação para CDs de dados" @@ -1313,88 +1326,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD áudio" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "disco Blu-ray virgem" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "disco CD virgem" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "disco DVD virgem" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "disco HD DVD virgem" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "disco Blu-ray vídeo" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "leitor de e-books" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "disco HD DVD de vídeo" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD de imagens" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "CD super vídeo (SVCD)" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD vídeo (VCD)" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Aplicação Windows" -#: ../panels/info/cc-info-panel.c:1435 +#: ../panels/info/cc-info-panel.c:1454 #: ../panels/keyboard/keyboard-shortcuts.c:1949 msgid "Section" msgstr "Secção" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Resumo" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Aplicações predefinidas" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Suportes removíveis" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Versão %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Detalhes" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Ver informação sobre o seu sistema" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1568,8 +1580,9 @@ msgid "Launch help browser" msgstr "Iniciar o navegador de ajuda" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Definições" @@ -1642,7 +1655,6 @@ msgstr "Bloquear ecrã" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Acesso universal" @@ -1709,18 +1721,18 @@ msgid "Modifiers-only switch to next source" msgstr "Alternar para fonte seguinte só com modificadoras" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -#| msgid "Key­board" -msgid "Keyboard" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" msgstr "Teclado" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Ver e alterar atalhos de teclado e definir as suas preferências de escrita" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Atalho;Repetição;Piscar;" @@ -1818,19 +1830,19 @@ msgid "Test Your _Settings" msgstr "Teste as _suas definições" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -#| msgid "Mouse & Touch­pad" -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Rato e Touchpad" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Altere a sensibilidade do seu rato ou touchpad e selecione destro ou canhoto" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Trackpad;Ponteiro;Clique;Toque;Duplo;Botão;Trackball;Deslocar;" @@ -1926,11 +1938,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Modo A_vião" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Proxy de rede" @@ -1938,17 +1950,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Algo correu mal. Por favor, contacte o seu fornecedor do programa." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "O gestor de redes tem de estar em execução." @@ -1964,7 +1976,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1981,64 +1993,64 @@ msgid "page 2" msgstr "página 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:458 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Segurança" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automático" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Perfil %d" #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Empresarial" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Nenhuma" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nunca" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2046,179 +2058,184 @@ msgstr[1] "%i dias atrás" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nenhum" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Fraca" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Normal" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Boa" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Excelente" -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:236 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detalhes" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identidade" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Endereço" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Máscara de rede" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Eliminar endereço" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 msgid "Add" msgstr "Adicionar" -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Servidor" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Eliminar o servidor DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Métrica" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Eliminar rota" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automático (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:201 msgid "Manual" msgstr "Manual" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Só Ligação local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefixo" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:201 msgid "Automatic" msgstr "Automático" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automático, só DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:893 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:89 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Reiniciar" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Nenhuma" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Chave WEP 40/128-bit (Hex ou ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Frase-passe WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP (802.1x) dinâmico" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 pessoal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 empresarial" @@ -2233,30 +2250,30 @@ msgstr "Velocidade da ligação" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Endereço IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Endereço IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Endereço físico (MAC)" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2266,7 +2283,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2397,45 +2414,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Impossível abrir o editor de ligação" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Novo perfil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Combinar" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Equipa" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Ponte" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Impossível ler as extensões VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importar de ficheiro…" -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Adicionar ligação de rede" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Adicionar VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2443,7 +2440,7 @@ msgstr "_Repor" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1482 +#: ../panels/network/net-device-wifi.c:1533 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Esquecer" @@ -2469,11 +2466,11 @@ msgid "S_ecurity" msgstr "S_egurança" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Impossível importar a ligação VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2486,36 +2483,36 @@ "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Selecionar o ficheiro a importar" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Abrir" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Já existe um ficheiro com o nome \"%s\"." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Substituir" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Deseja substituir %s com a ligação VPN que está a gravar?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Impossível exportar a ligação VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2526,7 +2523,7 @@ "\n" "Erro: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportar a ligação VPN" @@ -2553,61 +2550,46 @@ msgid "Make available to _other users" msgstr "Disponibilizar a _outros utilizadores" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Rede" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Controlar como se liga à Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Rede;Wireless;Sem-fios;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Banda larga;" +"Rede;Wireless;Sem-fios;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Banda;larga;" "Modem;Bluetooth;vpn;vlan;bridge;bond;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Combinar dedicadas" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(nenhum)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Ponte entre dedicadas" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nunca" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hoje" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "ontem" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Endereço IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Última utilização" @@ -2617,30 +2599,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Com fios" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1640 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1691 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Opções…" -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Adicionar nova ligação" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Juntar dedicadas" - -#: ../panels/network/net-device-wifi.c:1188 +#: ../panels/network/net-device-wifi.c:1202 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2648,12 +2625,12 @@ "Se possuir uma ligação à Internet sem ser wireless, pode configurar um " "hotspot wireless para a partilhar com outros." -#: ../panels/network/net-device-wifi.c:1192 +#: ../panels/network/net-device-wifi.c:1206 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Ligar o hotspot wireless vai desligá-lo de %s." -#: ../panels/network/net-device-wifi.c:1196 +#: ../panels/network/net-device-wifi.c:1210 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2661,23 +2638,23 @@ "Não é possível aceder à Internet através do seu wireless enquanto o hotspot " "estiver ativo." -#: ../panels/network/net-device-wifi.c:1279 +#: ../panels/network/net-device-wifi.c:1293 msgid "Stop hotspot and disconnect any users?" msgstr "Parar o hotspot e desligar quaisquer utilizadores?" -#: ../panels/network/net-device-wifi.c:1282 +#: ../panels/network/net-device-wifi.c:1296 msgid "_Stop Hotspot" msgstr "_Parar Hotspot" -#: ../panels/network/net-device-wifi.c:1346 +#: ../panels/network/net-device-wifi.c:1394 msgid "System policy prohibits use as a Hotspot" msgstr "Política de sistema proíbe a utilização como Hotspot" -#: ../panels/network/net-device-wifi.c:1349 +#: ../panels/network/net-device-wifi.c:1397 msgid "Wireless device does not support Hotspot mode" msgstr "Dispositivo wireless não suporta modo Hotspot" -#: ../panels/network/net-device-wifi.c:1478 +#: ../panels/network/net-device-wifi.c:1529 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2685,11 +2662,11 @@ "Os detalhes de rede das redes selecionadas, incluindo senhas e quaisquer " "configurações personalizadas, serão perdidos." -#: ../panels/network/net-device-wifi.c:1793 +#: ../panels/network/net-device-wifi.c:1839 msgid "History" msgstr "Histórico" -#: ../panels/network/net-device-wifi.c:1797 +#: ../panels/network/net-device-wifi.c:1843 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2697,7 +2674,7 @@ msgstr "Fe_char" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1805 +#: ../panels/network/net-device-wifi.c:1851 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Esquecer" @@ -2735,6 +2712,10 @@ msgid "Provider" msgstr "Fornecedor" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Rede" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2841,8 +2822,8 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 msgid "_Password" msgstr "_Senha" @@ -2943,7 +2924,6 @@ msgstr "_Ligar-se a uma rede oculta…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Histórico" @@ -2965,360 +2945,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Senha" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraestrutura" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Estado desconhecido" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Sem gestão" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Indisponível" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "A ligar" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Autenticação necessária" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Ligado" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "A desligar" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Falha na ligação" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Estado desconhecido (em falta)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Desligado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Falha na configuração" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Falha na configuração de IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Configuração de IP expirou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Eram requeridos segredos mas não foram fornecidos" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Suplicante 802.1x desligado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Falha ao configurar suplicante 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Falha no suplicante 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Suplicante 802.1x demorou demasiado tempo a autenticar-se" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Falha ao iniciar serviço PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Serviço PPP desligado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Falha no PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Falha ao iniciar o cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Erro no cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Falha no cliente DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Falha ao iniciar o serviço de partilha de ligação" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Falha no serviço de partilha de ligação" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Falha ao iniciar serviço AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Erro no serviço AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Falha no serviço AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linha ocupada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Sem som de ligação" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Impossível estabelecer uma ligação" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Pedido de ligação expirou" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Falha ao tentar ligar" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Falha ao inicializar o modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Falha ao selecionar a APN especificada" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Não procurar redes" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Registo de rede negado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Expirou o registo de rede" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Falha ao registar na rede pedida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Falha ao verificar o PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Poderá faltar firmware no dispositivo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Ligação desapareceu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "A ligação existente foi assumida" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem não encontrado" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Falha na ligação Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Cartão SIM não está inserido" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Necessário o pin do SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Necessário o PUK do SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM incorreto" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Dispositivo InfiniBand não suporta modo de ligação" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Falha na dependência da ligação" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Falta firmware" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Cabo desligado" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nenhum certificado de autoridade certificadora selecionado" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "erro não definido na segurança 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "nenhum ficheiro selecionado" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Não utilizar um certificado de Autoridade Certificadora (AC) pode resultar " -"em ligações a redes Wi-Fi inseguras ou comprometidas. Deseja selecionar um " -"certificado de Autoridade Certificadora?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorar" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Selecionar um certificado de AC" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "erro não especificado a validar o ficheiro eap-method" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Chaves privadas DER, PEM, ou PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "ficheiro EAP-FAST PAC em falta" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Escolha um ficheiro PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Ficheiros PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Ficheiro PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Autenticação _interna" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Apro_visionamento PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3327,41 +3283,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anónimo" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autenticado" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Ambos" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Ficheiro PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Autenticação _interna" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Permitir apro_visionamento PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "nome de utilizador EAP-LEAP em falta" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "senha EAP-LEAP em falta" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Utilizador" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Mostrar _senha" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "certificado EAP-PEAP inválido: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "certificado EAP-PEAP inválido: nenhum certificado especificado" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Escolha um certificado de Autoridade Certificadora" @@ -3379,19 +3367,56 @@ msgid "C_A certificate" msgstr "Certificado _AC" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nenhum certificado CA é necessário" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Versão PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "P_erguntar sempre por esta senha" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "nome de utilizador EAP em falta" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "senha EAP em falta" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "identidade EAP-TLS em falta" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "certificado EAP-TLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "certificado EAP-TLS CA inválido: nenhum certificado especificado" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "senha EAP-TLS inválido: em falta" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "chave privada EAP-TLS inválida: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "certificado do utilizador EAP-TLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Chaves privadas não encriptadas são inseguras" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3405,11 +3430,11 @@ "\n" "(Pode proteger com senha a sua chave privada utilizando o openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Escolha o seu certificado pessoal" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Escolha a sua chave privada" @@ -3421,51 +3446,56 @@ msgid "_User certificate" msgstr "Certificado do _utilizador" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "C_have privada" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Senha da chave _privada" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "certificado EAP-TTLS inválido: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "certificado EAP-TTLS CA inválido: nenhum certificado especificado" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Não me avisar _novamente" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Não" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Sim" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Erro desconhecido a validar segurança 802.11x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "SENHA" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS por túnel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP protegido (PEAP)" @@ -3475,6 +3505,50 @@ msgid "Au_thentication" msgstr "Au_tenticação" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "utilizador-leap em falta" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "senha-leap em falta" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "chave-wep em falta" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"chave-wep inválida: a chave com um comprimento de %zu tem de ter apenas " +"dígitos hexadecimais" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"chave-wep inválida: a chave com um comprimento de %zu tem de ter apenas " +"caratéres ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"chave-wep inválida: comprimento errado de %zu. A chave tem de ter " +"comprimento 5/13 (ascii) ou 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "chave-wep inválida: frase passe não pode estar vazia" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "chave-wep inválida: frase passe não pode ter menos de 64 caratéres" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (predefinição)" @@ -3511,14 +3585,29 @@ msgid "WEP inde_x" msgstr "Índice _WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk inválido: comprimento-chave inválido %zu. Tem de ser [8,63] bytes ou " +"64 dígitos hexadecimais" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk inválido: não foi possível interpretar chave com 64 bytes " +"hexadecimais" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tipo" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:174 +#: ../panels/privacy/cc-privacy-panel.c:241 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -3560,18 +3649,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Mostrar _conteúdo da mensagem no ecrã bloqueado" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -#| msgctxt "notifications" -#| msgid "_Notifications" -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Notificações" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Controlar que notificações são apresentadas e o que mostram" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notificações;Faixas;Mensagem;Área de Notificação;Popup;" @@ -3589,30 +3677,34 @@ msgid "Applications" msgstr "Aplicações" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Outro" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Adicionar conta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Correio" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Calendário" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Contactos" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chat" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Recursos" @@ -3652,17 +3744,17 @@ msgid "_Remove" msgstr "_Remover" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -#| msgid "On­line Accounts" -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Contas online" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Ligue-se às suas contas online e decida como as utilizar" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3817,7 +3909,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Bateria" @@ -3865,102 +3957,103 @@ msgid "When _idle" msgstr "Quando _inativo" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Poupança de energia" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Brilho do ecrã" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Brilho automático" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Brilho do teclado" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Escurecer o ecrã quando inativo" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Ecrã _desligado" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Desligue o Wi-Fi para poupar energia." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Banda larga _móvel" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Desligue a banda larga móvel (3G, 4G, LTE, etc.) para poupar energia." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Quando funciona da bateria" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Quando ligado à corrente" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Suspender" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernar" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nada" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Suspender & Desligar" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Suspender _automaticamente" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Suspender automaticamente" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Quando o botão ligar é premido" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Dispositivos" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Energia" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Ver o estado da sua bateria e alterar definições de poupança de energia" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4053,138 +4146,138 @@ msgstr "Autenticação necessária" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Com pouco toner" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Sem toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Com pouco revelador" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Sem revelador" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Com pouco de uma das cores" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Sem uma das cores" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Tampa aberta" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Porta aberta" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Com pouco papel" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Sem papel" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Desligada" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Parada" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Depósito de lixo quase cheio" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Depósito de lixo cheio" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Está a aproximar-se o final da vida útil do condutor ótico de imagem" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "O condutor ótico de imagem deixou de funcionar" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "A configurar" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Preparada" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Não aceita trabalhos" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "A processar" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nível do toner" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nível da tinta" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nível dos consumíveis" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "A instalar" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4192,15 +4285,15 @@ msgstr[1] "%u ativos" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Falha ao adicionar uma nova impressora." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Selecionar ficheiro PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4208,51 +4301,47 @@ "Ficheiros PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, " "*.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Não foi encontrado controlador adequado" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "A procurar por controladores preferidos…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Selecionar da base de dados…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Indique Ficheiro PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Página de teste" -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Sem impressoras" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Impossível carregar o UI: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -#| msgid "Prin­ters" -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Impressoras" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Adicionar impressoras, ver trabalhos de impressão e decidir como os deseja " "imprimir" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Impressora;Pilha;Imprimir;Papel;Tinta;Toner;" @@ -4414,6 +4503,11 @@ msgid "Parallel Port" msgstr "Porta paralela" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4625,13 +4719,17 @@ msgid "_Options" msgstr "_Opções" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Sem impressoras" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Adicionar uma impressora" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4639,70 +4737,70 @@ "Desculpe! O serviço de impressão do sistema\n" "aparenta estar indisponível." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:371 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Ecrã bloqueado" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:422 msgid "In use" msgstr "A ser utilizado" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:427 msgctxt "Location services status" msgid "On" msgstr "Ligado" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:428 msgctxt "Location services status" msgid "Off" msgstr "Desligado" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:807 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Serviços de Localização" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:926 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Utilização & Histórico" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1051 msgid "Empty all items from Trash?" msgstr "Esvaziar todos os itens do lixo?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1052 msgid "All items in the Trash will be permanently deleted." msgstr "Todos os itens no lixo serão apagados permanentemente." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1053 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Esvaziar o lixo" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1076 msgid "Delete all the temporary files?" msgstr "Eliminar todos os ficheiros temporários?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1077 msgid "All the temporary files will be permanently deleted." msgstr "Todos os ficheiros temporários serão apagados permanentemente." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1078 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "E_xpurgar ficheiros temporários" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1100 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Expurgar lixo & ficheiros temporários" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1140 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Utilização da aplicação" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1181 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Reportar problemas" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1195 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4711,20 +4809,21 @@ "Enviar relatórios de problemas técnicos ajuda-nos a melhorar o %s. Os " "relatórios são enviados anonimamente e são removidos todos os dados pessoais." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1207 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Política de privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privacidade" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Proteja a sua informação pessoal e controle o que os outros podem ver" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4895,22 +4994,22 @@ msgid "Other" msgstr "Outro" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1079 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "A sua sessão tem de ser reiniciada para que as alterações tenham efeito" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1083 msgid "Restart Now" msgstr "Reiniciar agora" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nenhuma fonte de introdução selecionada" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Ecrã de início de _sessão" @@ -4942,12 +5041,12 @@ msgid "Paper" msgstr "Papel" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -#| msgid "Re­gion & Lan­guage" -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Região e Idioma" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4955,7 +5054,7 @@ "fontes de entrada" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Idioma;Disposição;Teclado;Entrada;" @@ -5013,7 +5112,7 @@ msgstr "Alt Esquerdo+Direito" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "_Language" msgstr "_Idioma" @@ -5063,26 +5162,11 @@ "Definições de início de sessão são utilizadas por todos os utilizadores ao " "entrarem no sistema" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Locais" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Marcadores" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Outro" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Selecionar localização" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Aceitar" @@ -5090,11 +5174,12 @@ msgid "No applications found" msgstr "Nenhuma aplicação encontrada" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Procurar" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5102,7 +5187,7 @@ "atividades" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Procurar;Pesquisar;Localizar;Índice;Ocultar;Esconder;Privacidade;Resultados;" @@ -5111,6 +5196,18 @@ msgid "Search Locations" msgstr "Localizações de procura" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Locais" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Marcadores" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Outros" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Mover acima" @@ -5160,37 +5257,42 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Permitir que utilizadores remotos se liguem utilizando o comando seguro de " -"terminal:\n" +"Se as autenticações remotas estão ativadas, utilizadores remotos podem " +"conetar-se utilizando o comando de terminal seguro:\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Permitir que utilizadores remotos vejam ou controlem o seu ecrã ligando-se " -"a: vnc://%s" +"Partilha de ecrã permite que os utilizadores remotos vejam ou controlem o " +"seu ecrã ligando-se a: vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Copiar" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Partilhar" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Partilhar" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Controle o que deseja partilhar com outros" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5224,8 +5326,8 @@ msgstr "Nome do _computador" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Partilha de ficheiros _pessoais" +msgid "_File Sharing" +msgstr "Partilha de _ficheiros" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5244,8 +5346,8 @@ msgstr "Alguns serviços estão inativos por não haver acesso à rede." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Partilha de ficheiros pessoais" +msgid "File Sharing" +msgstr "Partilha de ficheiros" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5260,8 +5362,8 @@ msgstr "Partilha do ecrã" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "_Permitir controlo remoto" +msgid "_Allow connections to control the screen" +msgstr "Permitir coneções para control_ar o ecrã" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5288,11 +5390,8 @@ msgstr "Partilha de multimédia" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Partilhar multimédia permite-lhe partilhar música, fotografias e vídeos na " -"rede." +msgid "Share music, photos and videos over the network." +msgstr "Partilhar música, fotografias e vídeos pela rede." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5526,12 +5625,17 @@ msgid "Custom" msgstr "Personalizado" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Acesso universal" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Tornar mais simples ver, ouvir, escrever, apontar e clicar" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5629,9 +5733,8 @@ msgstr "Teclas de som" #: ../panels/universal-access/uap.ui.h:25 -#| msgid "Beep when Num Lock or Caps Lock are turned on or off." -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Apitar quando Num Lock ou Caps Lock são ligados." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Apitar quando Num Lock ou Caps Lock são ligados ou desligados." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6015,96 +6118,70 @@ msgstr "Efeitos de cor" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Adicionar utilizador" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Nome completo" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#: ../panels/user-accounts/um-user-panel.c:899 msgid "Standard" msgstr "Padrão" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 +#: ../panels/user-accounts/um-user-panel.c:897 msgid "Administrator" msgstr "Administrador" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Nome completo" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "Account _Type" msgstr "_Tipo de conta" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Permitir que o utilizador defina uma senha ao iniciar a próxima _sessão" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Definir uma senha _agora" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verificar" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Confirmar" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"O inicio de sessão empresarial permite que uma conta existente e gerida " -"centralmente seja usada neste dispositivo." +"O inicio de sessão empresarial permite que uma conta existente gerida " +"centralmente seja usada neste dispositivo. Pode também utilizar esta conta " +"para aceder aos recursos da companhia através da internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domínio" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Ir online para adicionar\n" -"contas de inicio de sessão empresarial." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Início de sessão _Empresarial" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Adicionar utilizador" +msgid "You are Offline" +msgstr "Está desligado" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Registar" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Início de sessão de administrador de domínio" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"De forma a utilizar contas empresariais, este computador\n" -"tem de ser adicionado ao domínio. Por favor, peça ao administrador\n" -"da sua rede para inserir aqui a sua senha de domínio." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Nome do administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Tem de estar online para adicionar contas de utilizadores empresarial." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Senha do administrador" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Início de sessão _Empresarial" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6178,9 +6255,32 @@ "Iniciar sessão;Nome;Impressões digitais;Avatar;Imagem de perfil;Logótipo;" "Cara;Face;Senha;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Histórico de início de sessão" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Registar" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Início de sessão de administrador de domínio" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"De forma a utilizar contas empresariais, este computador\n" +"tem de ser adicionado ao domínio. Por favor, peça ao administrador\n" +"da sua rede para inserir aqui a sua senha de domínio." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Nome do administrador" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Senha do administrador" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6203,41 +6303,41 @@ msgstr "Senha a_tual" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Permitir que o utilizador defina uma senha ao iniciar a próxima sessão" +msgid "Allow user to change their password on next login" +msgstr "Permitir que o utilizador mude a senha ao iniciar a próxima sessão" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Definir uma senha agora" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 msgid "Add User Account" msgstr "Adicionar conta de utilizador" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Remove User Account" msgstr "Remover conta de utilizador" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opções de início de sessão" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "A_utomatic Login" msgstr "Início de sessão a_utomático" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "_Fingerprint Login" msgstr "Início de sessão com _impressão digital" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "User Icon" msgstr "Ícone de utilizador" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Last Login" msgstr "Última sessão" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +msgid "_Account Activity" +msgstr "_Atividade da conta" + #: ../panels/user-accounts/org.gnome.controlcenter.user-accounts.policy.in.h:1 msgid "Manage user accounts" msgstr "Gerir contas de utilizador" @@ -6337,8 +6437,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Misture letras maiúsculas e minúsculas e utilize um ou dois números." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Misture letras maiúsculas com minúsculas e tente utilizar um ou dois números." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6428,32 +6529,32 @@ msgstr "Erro desconhecido" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Deve coincidir com o endereço web do seu fornecedor de conta." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Falha ao adicionar conta" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Senhas não coincidem." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Falha ao registar conta" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nenhuma forma suportada de autenticar com este domínio" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Falha ao ligar ao domínio" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6461,7 +6562,7 @@ "Este nome de inicio de sessão não resultou.\n" "Por favor, tente novamente." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6469,15 +6570,25 @@ "Esta senha de inicio de sessão não funcionou.\n" "Por favor, tente novamente." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Falha ao ligar ao domínio" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "" "Impossível encontrar o domínio. Talvez tenha cometido um erro ao escrever?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Padrão" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrador" + #: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6601,7 +6712,7 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. #: ../panels/user-accounts/um-history-dialog.c:177 -#: ../panels/user-accounts/um-user-panel.c:841 +#: ../panels/user-accounts/um-user-panel.c:840 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" @@ -6609,20 +6720,27 @@ #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. #: ../panels/user-accounts/um-history-dialog.c:180 -#: ../panels/user-accounts/um-user-panel.c:845 +#: ../panels/user-accounts/um-user-panel.c:844 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Sessão terminou" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Sessão iniciou" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Atividade da conta" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Por favor, selecione uma senha diferente." @@ -6684,30 +6802,30 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Impossível ligar ao domínio %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:236 msgid "Other Accounts" msgstr "Outras contas" -#: ../panels/user-accounts/um-user-panel.c:447 +#: ../panels/user-accounts/um-user-panel.c:446 msgid "Failed to delete user" msgstr "Falha ao eliminar o utilizador" -#: ../panels/user-accounts/um-user-panel.c:507 -#: ../panels/user-accounts/um-user-panel.c:566 -#: ../panels/user-accounts/um-user-panel.c:618 +#: ../panels/user-accounts/um-user-panel.c:506 +#: ../panels/user-accounts/um-user-panel.c:565 +#: ../panels/user-accounts/um-user-panel.c:617 msgid "Failed to revoke remotely managed user" msgstr "Falha ao revogar o utilizador gerido remotamente" -#: ../panels/user-accounts/um-user-panel.c:674 +#: ../panels/user-accounts/um-user-panel.c:673 msgid "You cannot delete your own account." msgstr "Não pode apagar a sua própria conta." -#: ../panels/user-accounts/um-user-panel.c:683 +#: ../panels/user-accounts/um-user-panel.c:682 #, c-format msgid "%s is still logged in" msgstr "%s ainda tem uma sessão ativa" -#: ../panels/user-accounts/um-user-panel.c:687 +#: ../panels/user-accounts/um-user-panel.c:686 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." @@ -6715,12 +6833,12 @@ "Eliminar um utilizador enquanto este tem uma sessão ativa pode deixar o " "sistema num estado inconsistente." -#: ../panels/user-accounts/um-user-panel.c:696 +#: ../panels/user-accounts/um-user-panel.c:695 #, c-format msgid "Do you want to keep %s's files?" msgstr "Deseja manter os ficheiros de %s?" -#: ../panels/user-accounts/um-user-panel.c:700 +#: ../panels/user-accounts/um-user-panel.c:699 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." @@ -6728,51 +6846,51 @@ "É possível manter a pasta pessoal, spool de email e ficheiros temporários ao " "eliminar a conta de um utilizador." -#: ../panels/user-accounts/um-user-panel.c:703 +#: ../panels/user-accounts/um-user-panel.c:702 msgid "_Delete Files" msgstr "_Eliminar os ficheiros" -#: ../panels/user-accounts/um-user-panel.c:704 +#: ../panels/user-accounts/um-user-panel.c:703 msgid "_Keep Files" msgstr "_Manter os ficheiros" -#: ../panels/user-accounts/um-user-panel.c:718 +#: ../panels/user-accounts/um-user-panel.c:717 #, c-format msgid "Are you sure you want to revoke remotely managed %s's account?" msgstr "Tem a certeza de que deseja revogar a conta gerida remotamente de %s?" -#: ../panels/user-accounts/um-user-panel.c:722 +#: ../panels/user-accounts/um-user-panel.c:721 msgid "_Delete" msgstr "_Eliminar" -#: ../panels/user-accounts/um-user-panel.c:774 +#: ../panels/user-accounts/um-user-panel.c:773 msgctxt "Password mode" msgid "Account disabled" msgstr "Conta desativada" -#: ../panels/user-accounts/um-user-panel.c:782 +#: ../panels/user-accounts/um-user-panel.c:781 msgctxt "Password mode" msgid "To be set at next login" msgstr "A ser definida ao iniciar a próxima sessão" -#: ../panels/user-accounts/um-user-panel.c:785 +#: ../panels/user-accounts/um-user-panel.c:784 msgctxt "Password mode" msgid "None" msgstr "Nenhuma" -#: ../panels/user-accounts/um-user-panel.c:834 +#: ../panels/user-accounts/um-user-panel.c:833 msgid "Logged in" msgstr "Com sessão ativa" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1282 msgid "Failed to contact the accounts service" msgstr "Falha ao contactar o serviço de contas" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1284 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Certifique-se que o AccountService está instalado e ativo." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1325 msgid "" "To make changes,\n" "click the * icon first" @@ -6780,12 +6898,12 @@ "Para realizar alterações,\n" "clique primeiro no ícone *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1363 msgid "Create a user account" msgstr "Criar uma conta de utilizador" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1686 msgid "" "To create a user account,\n" "click the * icon first" @@ -6793,12 +6911,12 @@ "Para criar uma conta de utilizador,\n" "clique primeiro no ícone *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1384 msgid "Delete the selected user account" msgstr "Apagar a conta de utilizador selecionada" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1396 +#: ../panels/user-accounts/um-user-panel.c:1691 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6806,33 +6924,32 @@ "Para apagar a conta de utilizador selecionada,\n" "clique primeiro no ícone *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1600 msgid "My Account" msgstr "A minha conta" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Já existe um utilizador com o nome \"%s\"" +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Este nome de utilizador não está disponível. Por favor, tente outro." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "O nome de utilizador é demasiado extenso." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "O nome de utilizador não pode começar por \"-\"." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "O nome de utilizador só pode ser composto por letras minúsculas e maiúsculas " -"de a-z, dígitos e qualquer dos caracteres \".\", \"-\" e \"_\"" +"de a-z, dígitos e qualquer dos caracteres . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Será utilizado para dar o nome à sua pasta pessoal e não pode ser alterado." @@ -6922,19 +7039,19 @@ msgid "Button" msgstr "Botão" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablet Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Ver o mapeamento dos botões e ajustar a sensibilidade do estilo de tablets " "gráficos" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Caneta;Stylus;Borracha;Rato;" @@ -6966,6 +7083,10 @@ msgid "Bluetooth Settings" msgstr "Definições de Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapear para monitor…" @@ -7151,6 +7272,11 @@ msgid "Tip Pressure Feel" msgstr "Sensibilidade da pressão da caneta" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Todas as definições" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Centro de controlo GNOME" @@ -7207,22 +7333,18 @@ msgid "Quit" msgstr "Sair" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Todas as definições" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Pessoal" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Equipamento" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistema" @@ -7260,3 +7382,51 @@ msgctxt "shortcut window" msgid "Cancel search" msgstr "Cancelar procura" + +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Hotspot" + +#~ msgid "Login History" +#~ msgstr "Histórico de início de sessão" + +#~ msgid "Add Network Connection" +#~ msgstr "Adicionar ligação de rede" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nenhum certificado de autoridade certificadora selecionado" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Não utilizar um certificado de Autoridade Certificadora (AC) pode " +#~ "resultar em ligações a redes Wi-Fi inseguras ou comprometidas. Deseja " +#~ "selecionar um certificado de Autoridade Certificadora?" + +#~ msgid "Ignore" +#~ msgstr "Ignorar" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Selecionar um certificado de AC" + +#~ msgid "As_k for this password every time" +#~ msgstr "P_erguntar sempre por esta senha" + +#~ msgid "Don't _warn me again" +#~ msgstr "Não me avisar _novamente" + +#~ msgid "No" +#~ msgstr "Não" + +#~ msgid "Yes" +#~ msgstr "Sim" + +#~ msgid "Personal File Sharing" +#~ msgstr "Partilha de ficheiros pessoais" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Permitir controlo remoto" diff -Nru gnome-control-center-3.20.2/po/ru.po gnome-control-center-3.22.1/po/ru.po --- gnome-control-center-3.20.2/po/ru.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ru.po 2016-09-27 12:37:36.000000000 +0000 @@ -23,16 +23,16 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-23 20:57+0000\n" -"PO-Revision-Date: 2016-03-24 00:30+0300\n" +"POT-Creation-Date: 2016-09-20 14:55+0000\n" +"PO-Revision-Date: 2016-09-20 22:13+0300\n" "Last-Translator: Stas Solovey \n" -"Language-Team: Русский \n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 2.91.7\n" #: ../panels/background/background.ui.h:1 @@ -105,7 +105,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Домашняя папка" @@ -120,25 +120,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -169,16 +168,17 @@ msgid "Current background" msgstr "Текущий фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Фон" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Изменить фоновое изображение на обои или фото" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Обои;Экран;Рабочий;" @@ -218,18 +218,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Для включения Bluetooth выключите режим для авиаперелётов." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Включение и отключение Bluetooth. Подключение устройств Bluetooth" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "общий;доступ;bluetooth;obex;" @@ -399,7 +398,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Все файлы" @@ -439,7 +438,7 @@ msgstr "Сохранить профиль" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Сохранить" @@ -698,7 +697,7 @@ "\"windows\">Microsoft Windows." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Краткая информация" @@ -710,11 +709,11 @@ msgid "_Import File…" msgstr "_Импортировать файл…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Добавить" @@ -867,17 +866,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Цвет" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Калибровка цвета устройств, таких как экраны, камеры или принтеры" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Цвет;ICC;Профиль;Калибровка;Принтер;Экран;" @@ -895,23 +895,23 @@ msgid "No languages found" msgstr "Ни один язык не найден" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Сегодня" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Вчера" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b." #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b. %Y" @@ -1033,8 +1033,9 @@ msgid "December" msgstr "Декабрь" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Дата и время" @@ -1091,12 +1092,12 @@ msgid "AM / PM" msgstr "12-часовой" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Изменить дату и время, включая часовой пояс" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Часы;Часовой;пояс;Местоположение;" @@ -1108,207 +1109,222 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Для изменения времени или даты требуется аутентификация." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Крышка ноутбука закрыта" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Дублируемый" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Основной" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Выключено" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Дополнительный" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Упорядочить сгруппированные экраны" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Применить" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Перетащите экраны, чтобы изменить их порядок" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Гц (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Гц" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Повернуть против часовой стрелки на 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Повернуть на 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Повернуть по часовой стрелке на 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Размер" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Соотношение сторон" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Разрешение" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Отрегулировать для ТВ" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Частота обновления" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Показывать верхнюю панель и режим обзора на этом дисплее" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Дополнительный экран" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Объединить этот дисплей с другим для увеличения рабочего пространства" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Презентация" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Показывать только слайд-шоу и мультимедиа" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Зеркало" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Показывать текущий вид на обоих дисплеях" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Выключить" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Не использовать этот монитор" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Не удалось получить информацию об экране" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Расположить объединённые дисплеи" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Мониторы" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Выберите, как использовать подключённые мониторы и проекторы" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Панель;Проектор;xrandr;Экран;Разрешение;Обновить;Монитор;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Неизвестно" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-бит (ID сборки: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-бит (ID сборки: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-бит" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-бит" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Спрашивать, что делать" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ничего не делать" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Открыть папку" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Другой носитель" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Выберите приложение для звуковых компакт-дисков" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Выберите приложения для видео DVD" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Выберите приложение, запускаемое при подключении музыкального плеера" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Выберите приложение, запускаемое при подключении камеры" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Выберите приложение для компакт-дисков с программами" @@ -1317,88 +1333,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "звуковой DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "чистый диск Blu-ray" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "чистый компакт-диск" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "чистый диск DVD" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "чистый диск HD DVD" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "видеодиск Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "устройство чтения электронных книг" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "видеодиск HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "диск Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "компакт-диск Super Video" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "видеодиск VCD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "приложение Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Раздел" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Обзор" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Приложения по умолчанию" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Съёмный носитель" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Версия %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Подробности" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Просмотр информации о системе" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1574,8 +1588,9 @@ msgid "Launch help browser" msgstr "Запустить справочный браузер" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Параметры" @@ -1648,7 +1663,6 @@ msgstr "Заблокировать экран" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Универсальный доступ" @@ -1684,11 +1698,21 @@ msgid "High contrast on or off" msgstr "Включить или выключить высокую контрастность" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Дополнительные комбинации клавиш" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1715,115 +1739,126 @@ msgid "Modifiers-only switch to next source" msgstr "Клавиша-модификатор переключает источник ввода" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Клавиатура" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Сбросить комбинацию на значение по умолчанию" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s уже используется для %s. Если применить, комбинация для %s будет " +"отключена" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Установить пользовательскую комбинацию клавиш" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Установить комбинацию клавиш" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Введите новую комбинацию для изменения %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Добавить пользовательскую комбинацию клавиш" +# спецсимвол-невидимый перенос тут между стрелок <­>, копировать через vim или nano +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Клавиа­тура" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Просмотр и изменение комбинаций клавиш, а также настройка ввода" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Комбинация;Повтор;Мигание;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Дополнительные комбинации клавиш" +msgid "No keyboard shortcut found" +msgstr "Комбинации клавиш не найдена" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Название:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Коман_да:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Добавить комбинацию клавиш" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Удалить комбинацию клавиш" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Попробуйте другой поисковый запрос" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Чтобы изменить комбинацию клавиш, нажмите на строку и зажмите новые клавиши; " -"для очистки нажмите Backspace." +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Нажмите клавишу Esc для отмены." -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Дополнительные комбинации клавиш" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Имя" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Неизвестное действие>" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Команда" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Нельзя использовать комбинацию «%s», поскольку набор с использованием этой " -"клавиши станет невозможным.\n" -"Попробуйте клавиши Control, Alt или Shift одновременно." +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Комбинация" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Комбинация клавиш «%s» уже используется для\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Правка" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"После переопределения комбинации на «%s», комбинация «%s» будет выключена." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Нет" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Переопределить" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Удалить" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Введите новую комбинацию" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "Комбинация «%s» используется для «%s». Переопределить её для «%s»?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Отменить" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Комбинация «%s» сейчас используется для «%s», эта комбинация будет выключена." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Добавить" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Назначить" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Заменить" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Установить" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Проверить параметры" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Мышь и сенсорная панель" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Мышь и сенсор­ная панель" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1831,7 +1866,7 @@ "кнопок для правши или левши" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Трэкпад;Указатель;Щелчок;Нажатие;Двойной;Кнопка;Трэкбол;Прокрутка;" @@ -1890,6 +1925,10 @@ msgstr "Нажатие касанием" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Прокрутка двумя пальцами" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Участки прокрутки по краям" @@ -1928,11 +1967,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Режим для _авиаперелётов" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Сетевая прокси-служба" @@ -1940,19 +1979,19 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "К сожалению, что-то пошло не так. Обратитесь к поставщику программного " "обеспечения." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager должен быть запущен." @@ -1968,7 +2007,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1985,59 +2024,64 @@ msgid "page 2" msgstr "страница 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Безопасность" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "автоматический" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Профиль %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Предприятие" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Нет" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Никогда" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2046,179 +2090,179 @@ msgstr[2] "%i дней назад" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Мб/с" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Нет" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Слабый" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Средний" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Хороший" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Отличный" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Подробности" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Идентификация" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Адрес" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "Маска сети" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Шлюз" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Удалить адрес" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Добавить" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Сервер" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Удалить сервер DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Метрика" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Удалить маршрут" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Автоматический (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Вручную" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Только для локальной сети" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Префикс" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Автоматический" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Автоматический, только DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Сбросить" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Нет" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "40/128-битный ключ WEP (Hex или ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "128-битная парольная фраза WEP" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Динамический WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Персональный WPA и WPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Корпоративный WPA и WPA2" @@ -2233,30 +2277,30 @@ msgstr "Скорость передачи данных" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Адрес IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Адрес IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Аппаратный адрес" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2266,7 +2310,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2349,13 +2393,13 @@ msgid "Firewall _Zone" msgstr "_Зона брандмауэра" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "По умолчанию" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Зона определяет уровень доверия соединению" @@ -2397,47 +2441,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Не удалось открыть редактор соединений" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Создать профиль" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -# см. network-manager-applet -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Агрегированное (Bond)" - -# см. network-manager-applet -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Агрегированное (Team)" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Мост" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Не удалось загрузить модули VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Импортировать из файла…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Добавить сетевое подключение" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Добавить VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2445,7 +2467,7 @@ msgstr "_Сбросить" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Забыть" @@ -2471,11 +2493,11 @@ msgid "S_ecurity" msgstr "_Безопасность" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Не удалось импортировать соединение VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2488,36 +2510,36 @@ "\n" "Ошибка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Выберите файл для импортирования" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Открыть" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Файл с именем «%s» уже существует." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Заменить" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Заменить %s сохраняемым VPN-соединением?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Не удалось экспортировать соединение VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2528,7 +2550,7 @@ "\n" "Ошибка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Экспортировать VPN-соединение" @@ -2555,62 +2577,46 @@ msgid "Make available to _other users" msgstr "Сделать доступным для _других пользователей" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Сеть" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Управление подключением к Интернету" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Широковещательное;Модем;" -"Bluetooth;vpn;vlan;мост;bond;агрегированное;DNS;" - -# см. network-manager-applet -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Слейвы агрегированного соединения (Bond)" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(нет)" - -# см. network-manager-applet -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Слейвы сетевого моста" +"Сеть;Беспроводная;Wi-Fi;Wifi;IP;LAN;Прокси;WAN;Мобильная;Модем;Bluetooth;vpn;" +"DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "никогда" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "сегодня" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "вчера" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Адрес IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Последнее использование" @@ -2620,34 +2626,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Проводное" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Параметры…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Профиль %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Добавить новое подключение" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Слейвы агрегированного соединения (Team)" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2656,14 +2653,14 @@ "подключение к Интернету, беспроводную точку доступа можно настроить для " "подключения к Интернету других пользователей." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Переключение на беспроводную точку доступа приведёт к отключению от %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2671,23 +2668,23 @@ "Доступ к Интернету по беспроводному каналу возможен только при отключённой " "точке доступа." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Остановить точку доступа и отключить всех пользователей?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Остановить точку доступа" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Использование в качестве точки доступа запрещено системной политикой" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Беспроводное устройство не поддерживает режим точки доступа" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2695,11 +2692,11 @@ "Сетевые данные для выделенных сетей, включая пароли и любые пользовательские " "настройки, будут утеряны." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "История" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2707,7 +2704,7 @@ msgstr "_Закрыть" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Забыть" @@ -2744,6 +2741,10 @@ msgid "Provider" msgstr "Провайдер" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Сеть" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2849,16 +2850,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Пароль" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Нет" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Показать п_ароль" @@ -2952,7 +2949,6 @@ msgstr "_Подключиться к скрытой сети…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_История" @@ -2974,359 +2970,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Пароль" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Инфраструктура" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Состояние неизвестно" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Неуправляемое" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Недоступно" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Подключение" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Требуется аутентификация" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Подключено" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Отключение" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Сбой подключения" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Состояние неизвестно (отсутствует)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Не подключено" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Сбой настройки" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Сбой настройки IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Истёк срок настроек IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Требуется пароль, но он не задан" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Клиент 802.1x отключён" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Сбой настройки клиента 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Сбой клиента 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Клиент 802.1x слишком долго ожидал аутентификации" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Не удалось запустить службу PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Служба PPP отключена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Сбой PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Не удалось запустить клиент DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Ошибка клиента DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Сбой клиента DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Не удалось запустить службу общего подключения" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Сбой службы общего подключения" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Не удалось запустить службу AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Ошибка службы AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Сбой службы AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Линия занята" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Нет гудка в линии" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Невозможно установить несущую" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Время, отведённое на звонок, истекло" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Не удалось дозвониться" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Не удалось инициализировать модем" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Не удалось выбрать указанный APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Нет сетей для поиска" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Отказано в регистрации в сети" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Время в регистрации сети истекло" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Не удалось зарегистрироваться в запрошенной сети" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Сбой проверки PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Возможно, отсутствует микропрограмма устройства" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Подключение пропало" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Предполагалось, что соединение существует" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Модем не найден" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Сбой подключения по Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Не вставлена SIM-карта" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Требуется SIM Pin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Требуется SIM Puk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Некорректный SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Устройство InfiniBand не поддерживает режим подключения" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Сбой зависимости подключения" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Отсутствует прошивка" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Кабель не подключён" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Сертификат центра сертификации не выбран" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "неизвестная ошибка в безопасности 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "файлы не выбраны" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Если вы не используете сертификат центра сертификации, это может привести к " -"проблемам безопасности. Хотите выбрать сертификат центра сертификации?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Игнорировать" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Выбрать сертификат ЦС" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Закрытые ключи DER, PEM, или PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "неизвестная ошибка проверки файла ЕАР-методом" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, или приватные ключи PKCS#12 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Сертификаты DER или PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "отсутствует файл EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Выберите PAC-файл" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Файлы PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Файл PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Внутренняя аутентификация" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "_Инициализация PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3335,41 +3308,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Анонимный" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Аутентифицированный" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Оба" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Файл PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Внутренняя аутентификация" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Разрешить автоматическое _выделение ресурсов PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "отсутствует имя пользователя EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "отсутствует пароль EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Имя пользователя" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Показывать пароль" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "недействительный сертификат EAP-PEAP CA: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "недействительный сертификат EAP-PEAP CA: сертификат не указан" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Выберите сертификат центра сертификации" @@ -3385,21 +3390,58 @@ #: ../panels/network/wireless-security/eap-method-tls.ui.h:3 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:3 msgid "C_A certificate" -msgstr "Сертификат _CA" +msgstr "Сертификат C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Сертификат CA не _требуется" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Версия PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Спрашивать каждый раз этот пароль" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "отсутствует имя пользователя EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "отсутствует пароль EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "отсутствует идентичность EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "недействительный сертификат EAP-TLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "недействительный сертификат EAP-TLS CA: сертификат не указан" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "недействительный пароль EAP-TLS: пароль отсутствует" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "недействительный секретный ключ EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "недействительный пользовательский сертификат EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Незашифрованные закрытые ключи являются небезопасными" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3413,11 +3455,11 @@ "\n" "(Вы можете защитить приватный ключ с помощью openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Выберите свой персональный сертификат" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Выберите ваш приватный ключ" @@ -3429,51 +3471,56 @@ msgid "_User certificate" msgstr "_Сертификат пользователя" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Приватный _ключ" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Пароль приватного ключа" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "недействительный сертификат EAP-TTLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "недействительный сертификат EAP-TTLS CA: сертификат не указан" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Больше не предупреждать" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Нет" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Да" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Неизвестная ошибка проверки безопасности 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Туннелированный TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Защищённый EAP (PEAP)" @@ -3483,6 +3530,51 @@ msgid "Au_thentication" msgstr "А_утентификация" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "отсутствует leap-имя пользователя" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "отсутствует leap-пароль" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "отсутствует wep-ключ" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"недействительный wep-ключ: ключ с длиной %zu должен содержать только " +"шестнадцатеричные цифры" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"недействительный wep-ключ: ключ с длиной %zu должен содержать только символы " +"ASCII" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"недействительный wep-ключ: ключ с неверной длиной %zu. Ключ должен быть " +"длины 5/13 (ASCII) или 10/26 (HEX)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "недействительный wep-ключ: парольная фраза не может быть пустой" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "" +"недействительный wep-ключ: парольная фраза должна быть короче 64 символов" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (по умолчанию)" @@ -3519,19 +3611,34 @@ msgid "WEP inde_x" msgstr "_Индекс WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"недействительный wpa-psk: ключ неверной длины %zu. Должен быть [8,63] байт " +"или 64 шестнадцатеричных цифр" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"недействительный wpa-psk: невозможно интерпретировать ключ с 64 байт как " +"шестнадцатеричный" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Тип" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Включено" @@ -3568,16 +3675,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Показывать _подробности уведомлений на заблокированном экране" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Уведомления" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "Уведомле­ния" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Управление отображением и содержанием уведомлений" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Уведомления;Всплывающее;Сообщение;Лоток;Всплывающее;" @@ -3595,80 +3703,69 @@ msgid "Applications" msgstr "Приложения" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Другое" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Добавление учётной записи" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Почта" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Календарь" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Контакты" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Чат" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ресурсы" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Ошибка при входе в систему под учётной записью" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Срок действия учётных данных истёк." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Войдите, чтобы включить эту учётную запись." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Войти" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Ошибка при создании учётной записи" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Ошибка при удалении учётной записи" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Действительно удалить учётную запись?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Это не приведёт к удалению учётной записи на сервере." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Удалить" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Сетевые учётные записи" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Сетевые учёт­ные записи" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Подключиться к сетевым учётным записям и решить для чего их использовать" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3681,6 +3778,7 @@ msgstr "Нет ни одной настроенной сетевой учётной записи" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Удалить учётную запись" @@ -3827,7 +3925,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "Батарея" @@ -3875,103 +3973,104 @@ msgid "When _idle" msgstr "При п_ростое" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "Энергосбережение" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "Яркость _экрана" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "Автоматическая регулировка яркости" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "Яркость подсветки _клавиатуры" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "У_меньшать яркость экрана при простое" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "_Выключение экрана" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "Выключите Wi-Fi для уменьшения энергопотребления." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "_Мобильный Интернет" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Выключите адаптер мобильного широкополосного доступа (3G, 4G, WiMax и т.д.) " "для уменьшения энергопотребления." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "При работе от батареи" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "При подключении" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "Перевести в режим ожидания" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "Перевести в режим гибернации" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "Ничего не делать" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "Режим ожидания и кнопка выключения" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "_Автоматический режим ожидания" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "Автоматический режим ожидания" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "_При нажатии кнопки выключения" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Устройства" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "Электропитание" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "Электро­питание" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Просмотр состояния батареи и изменение параметров энергосбережения" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4064,11 +4163,6 @@ msgid "Delay" msgstr "Задержка" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Отменить" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Аутентификация" @@ -4078,138 +4172,138 @@ msgstr "Требуется аутентификация" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "Мало тонера" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "Тонер закончился" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "Мало проявителя" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "Проявитель закончился" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "Маркер скоро закончится" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "Маркер закончился" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "Открыта крышка" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "Открыта дверца" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "Мало бумаги" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "Бумага закончилась" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "Выключен" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "Остановлен" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "Резервуар почти полон" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "Резервуар заполнен" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "Фотобарабан скоро выйдет из строя" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "Фотобарабан перестал работать" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "Настройка" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "Готов" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Не принимает задания" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "Обработка" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "Уровень тонера" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "Уровень чернил" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "Уровень ресурсов" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "Установка" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4218,15 +4312,15 @@ msgstr[2] "%u активных" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "Не удалось добавить новый принтер." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "Выберите файл PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4234,48 +4328,45 @@ "Файлы PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "Подходящий драйвер не найден" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "Поиск предпочтительных драйверов…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "Выбрать из базы данных…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "Использовать файл PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "Пробная страница" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Принтеров нет" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "Не удалось загрузить интерфейс пользователя: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Принтеры" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Добавление принтеров, просмотр текущих заданий и выбор способа печати" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Принтер;Очередь;Печать;Бумага;Чернила;Тонер;" @@ -4437,6 +4528,11 @@ msgid "Parallel Port" msgstr "Параллельный порт" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4648,13 +4744,17 @@ msgid "_Options" msgstr "_Параметры" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Принтеров нет" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Добавить принтер" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4662,70 +4762,70 @@ "Системная служба печати\n" "недоступна или не запущена." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Блокировка экрана" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Используется" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Включено" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Выключено" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Сервисы местоположения" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Статистика и история" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Удалить все объекты из корзины?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Все объекты корзины будут безвозвратно удалены." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Очистить корзину" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Удалить все временные файлы?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Все временные файлы будут безвозвратно удалены." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Удалить временные файлы" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Очистка корзины и временные файлы" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Использование ПО" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Сообщение об ошибках" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4734,20 +4834,21 @@ "Отправка сообщения о технических проблемах помогает нам улучшить %s. Отчеты " "отправляются анонимно и не содержат персональных данных." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Политика конфиденциальности" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Конфиденциальность" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Конфиден­циаль­ность" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Управление конфиденциальностью" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4922,21 +5023,21 @@ msgid "Other" msgstr "Другое" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Необходимо перезапустить сеанс, чтобы изменения вступили в силу" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Перезапустить сейчас" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Не выбран источник ввода" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Экран входа" @@ -4968,18 +5069,19 @@ msgid "Paper" msgstr "Бумага" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Язык и регион" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Выбор языка интерфейса, форматов, раскладки клавиатуры и источников ввода" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Язык;Раскладка;Клавиатура;Ввод;" @@ -5036,7 +5138,7 @@ msgstr "Левый+Правый Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Язык" @@ -5084,26 +5186,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "Параметры входа в систему используются всеми пользователями" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Места" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Закладки" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Другое" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Выберите расположение" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_ОК" @@ -5111,17 +5198,18 @@ msgid "No applications found" msgstr "Приложения не найдены" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Поиск" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "Какие приложения показывают результаты поиска в режиме «Обзор»" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Поиск;Найти;Индекс;Скрыть;Конфиденциальность;Результаты;" @@ -5129,6 +5217,18 @@ msgid "Search Locations" msgstr "Места поиска" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Места" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Другое" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Поднять" @@ -5141,6 +5241,11 @@ msgid "Preferences" msgstr "Настройки" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Не выбрано ни одной сети для обеспечения общего доступа" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5166,21 +5271,54 @@ msgid "Choose a Folder" msgstr "Выберите папку" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Общий доступ к файлам позволяет открыть доступ к папкам для других " +"пользователей сети с помощью: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"При включённом удалённом входе, удалённые пользователи могут подключаться " +"используя команду Secure Shell:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Общий доступ к экрану позволяет удалённым пользователям просматривать и " +"управлять вашим экраном, подключившись к vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Копировать" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Общий доступ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Общий доступ" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Общий доступ для других пользователей" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5188,6 +5326,10 @@ "общий;доступ;ssh;узел;имя;удалённый;рабочий;стол;медиа;аудио;видео;" "изображения;фото;фильмы;сервер;обработчик;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Сети" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Включение или отключение удалённого входа в систему" @@ -5198,24 +5340,12 @@ "Для включения или выключения удалённого доступа необходимо выполнить " "проверку подлинности" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Не выбрано ни одной сети для обеспечения общего доступа" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Сети" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Имя _компьютера" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" +msgid "_File Sharing" msgstr "Общий доступ к _файлам" #: ../panels/sharing/sharing.ui.h:3 @@ -5235,84 +5365,54 @@ msgstr "Некоторые службы отключены из-за отсутствия доступа к сети." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" +msgid "File Sharing" msgstr "Общий доступ к файлам" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Общий доступ к файлам позволяет открыть доступ к папкам для других " -"пользователей сети с помощью: dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Требовать пароль" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Удалённая авторизация" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Позволить удалённым пользователям подключаться, используя команду SSH:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Общий доступ к экрану" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Разрешить удалённым пользователям просматривать и управлять вашим экраном, " -"подключившись к: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Разрешить удалённое управление" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Разрешить соединения для управления экраном" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Пароль:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "П_оказать пароль" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Параметры доступа" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Новые подключения должны запрашивать доступ" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Требовать пароль" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Общий доступ к мультимедиа" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Общий доступ к мультимедиа позволяет открыть доступ к музыке, фото и видео " -"по сети." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Общий доступ к музыке, фото и видео по сети." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Папки" @@ -5443,11 +5543,6 @@ msgid "Peak detect" msgstr "Пиковый детектор" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Название" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Устройство" @@ -5543,18 +5638,23 @@ msgid "Subwoofer" msgstr "Сабвуфер" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Другой" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Универсаль­ный доступ" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "" "Упрощение ввода, наведения и нажатия, а также улучшение видимости и " "слышимости" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5654,8 +5754,8 @@ msgstr "Озвучивание клавиши" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Подавать сигнал при включении Num Lock или Caps Lock." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Подавать сигнал при нажатии Num Lock или Caps Lock." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6036,96 +6136,70 @@ msgstr "Цветовые эффекты" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Добавить пользователя" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Полное имя" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Обычный" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Администратор" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Полное имя" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Тип учётной записи" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "_Разрешить пользователю установить пароль при следующем входе с систему" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "_Установите пароль сейчас" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Проверить" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Подтвердить" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Корпоративный вход в систему позволяет использовать существующую управляемую " -"централизованно учётную запись пользователя на этом устройстве." +"централизованно учётную запись пользователя на этом устройстве. Также можно " +"использовать данную учётную запись для доступа к ресурсам компании в " +"интернете." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Домен" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Выйдите в сеть, чтобы добавить\n" -"корпоративные учётные записи." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Корпоративный вход" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Добавить пользователя" +msgid "You are Offline" +msgstr "Сетевое подключение отсутствует" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Зарегистрировать" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Вход для администратора домена" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." msgstr "" -"Для использования корпоративного входа этот компьютер необходимо\n" -"внести в домен. Попросите системного администратора ввести сюда\n" -"пароль домена." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Имя администратора" +"Для добавления корпоративных учётных записей требуется подключение к сети." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Пароль администратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Корпоративный вход" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6160,7 +6234,7 @@ msgstr "Правый мизинец" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Включить вход в систему по отпечатку" @@ -6197,9 +6271,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Вход;Имя;Отпечаток;Аватар;Логотип;Лицо;Пароль;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Журнал входа в систему" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Зарегистрировать" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Вход для администратора домена" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Для использования корпоративного входа этот компьютер необходимо\n" +"внести в домен. Попросите системного администратора ввести сюда\n" +"пароль домена." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Имя администратора" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Пароль администратора" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6222,38 +6319,30 @@ msgstr "Текущий па_роль" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Разрешить пользователю установить пароль при следующем входе с систему" +msgid "Allow user to change their password on next login" +msgstr "Разрешить пользователю изменить пароль при следующем входе с систему" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Установите пароль сейчас" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Добавить учётную запись пользователя" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Удалить учётную запись пользователя" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Добавить пользователя…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Параметры входа в систему" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Автоматический в_ход" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Вход по отпечатку" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Значок пользователя" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Последний вход" @@ -6358,7 +6447,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Смешайте заглавные и строчные буквы несколько раз." #: ../panels/user-accounts/pw-utils.c:119 @@ -6450,32 +6539,32 @@ msgstr "Неизвестная ошибка" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Веб-адрес должен совпадать с адресом провайдера вашей учётной записи." +msgid "Should match the web address of your login provider." +msgstr "Должно совпадать с веб-адресом провайдера вашей учётной записи." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Не удалось добавить учётную запись" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Пароли не совпадают." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Не удалось зарегистрировать учётную запись" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Нет поддерживаемого метода аутентификации в этом домене" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Не удалось подключить к домену" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6483,7 +6572,7 @@ "Неправильное имя пользователя.\n" "Попробуйте ещё раз." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6491,14 +6580,24 @@ "Неправильный пароль.\n" "Попробуйте ещё раз." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Не удалось войти в домен" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Не удалось найти домен. Может быть, он написан с ошибкой?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Обычный" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Администратор" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6517,30 +6616,30 @@ msgid "Enabled" msgstr "Включено" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Удалить зарегистрированные отпечатки?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Удалить отпечатки" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "" "Удалить зарегистрированные отпечатки пальцев и запретить доступ по отпечатку?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Выполнено!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Не удалось получить доступ к устройству «%s»" @@ -6548,16 +6647,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Не удалось снять отпечаток с устройства «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Не удалось получить доступ к устройствам сканирования отпечатков" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Для получения помощи свяжитесь с системным администратором." @@ -6566,7 +6665,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6575,11 +6674,11 @@ "Чтобы включить вход по отпечатку пальца, необходимо снять один или несколько " "образцов, используя устройство «%s»." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Выбор пальца" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Регистрация отпечатков пальцев" @@ -6634,14 +6733,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Сеанс завершён" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Сеанс начат" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — активность учётной записи" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Выберите другой пароль." @@ -6703,7 +6809,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Не удалось подключиться к домену %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Другие учётные записи" @@ -6783,15 +6889,15 @@ msgid "Logged in" msgstr "Авторизованный" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Не удалось связаться со службой учётных записей" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Убедитесь, что AccountService установлен и включён." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6799,12 +6905,12 @@ "Чтобы изменить,\n" "сначала нажмите на значок *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Создать учётную запись пользователя" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6812,12 +6918,12 @@ "Чтобы создать учётную запись пользователя,\n" "сначала нажмите на значок *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Удалить выбранную учётную запись пользователя" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6825,33 +6931,32 @@ "Чтобы удалить выбранную учётную запись пользователя,\n" "сначала нажмите на значок *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Моя учётная запись" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Пользователь с именем «%s» уже существует." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Данное имя пользователя не доступно. Попробуйте ввести другое." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Имя пользователя слишком длинное." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Имя пользователя не может начинаться с символа «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Имя пользователя может состоять из букв латинского алфавита в верхнем и " -"нижнем регистре, цифр и символов «.», «-», «_»." +"Имя пользователя может состоять только из букв латинского алфавита в верхнем " +"и нижнем регистре, цифр и следующих символов: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Используется для именования вашей домашней папки и не может быть изменено." @@ -6942,19 +7047,19 @@ msgid "Button" msgstr "Кнопка" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Планшет Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Установка отображения кнопок и настройка чувствительности пера для " "графических планшетов" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Планшет;Wacom;Перо;Ластик;Мышь;" @@ -6986,6 +7091,10 @@ msgid "Bluetooth Settings" msgstr "Параметры Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Планшет Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Отображение на экран…" @@ -7079,22 +7188,22 @@ msgid "Mode Switch #%d" msgstr "Переключение режима #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Левая кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Правая кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Верхняя кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Нижняя кнопка #%d" @@ -7173,6 +7282,11 @@ msgid "Tip Pressure Feel" msgstr "Чувствительность нажатия пера" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Все параметры" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Центр управления GNOME" @@ -7229,22 +7343,18 @@ msgid "Quit" msgstr "Завершить" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Все параметры" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Персональные" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Оборудование" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Система" @@ -7283,6 +7393,183 @@ msgid "Cancel search" msgstr "Отменить поиск" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Точка доступа" + +#~ msgid "Color" +#~ msgstr "Цвет" + +#~ msgid "_Name:" +#~ msgstr "_Название:" + +#~ msgid "Remove Shortcut" +#~ msgstr "Удалить комбинацию клавиш" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Чтобы изменить комбинацию клавиш, нажмите на строку и зажмите новые " +#~ "клавиши; для очистки нажмите Backspace." + +#~ msgid "" +#~ msgstr "<Неизвестное действие>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Нельзя использовать комбинацию «%s», поскольку набор с использованием " +#~ "этой клавиши станет невозможным.\n" +#~ "Попробуйте клавиши Control, Alt или Shift одновременно." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Комбинация клавиш «%s» уже используется для\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "После переопределения комбинации на «%s», комбинация «%s» будет выключена." + +#~ msgid "_Reassign" +#~ msgstr "_Переопределить" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "Комбинация «%s» используется для «%s». Переопределить её для «%s»?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Комбинация «%s» сейчас используется для «%s», эта комбинация будет " +#~ "выключена." + +#~ msgid "_Assign" +#~ msgstr "_Назначить" + +# см. network-manager-applet +#~ msgid "Bond" +#~ msgstr "Агрегированное (Bond)" + +# см. network-manager-applet +#~ msgid "Team" +#~ msgstr "Агрегированное (Team)" + +#~ msgid "Bridge" +#~ msgstr "Мост" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Не удалось загрузить модули VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Добавить сетевое подключение" + +# см. network-manager-applet +#~ msgid "Bond slaves" +#~ msgstr "Слейвы агрегированного соединения (Bond)" + +#~ msgid "(none)" +#~ msgstr "(нет)" + +# см. network-manager-applet +#~ msgid "Bridge slaves" +#~ msgstr "Слейвы сетевого моста" + +#~ msgid "Team slaves" +#~ msgstr "Слейвы агрегированного соединения (Team)" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Устройство InfiniBand не поддерживает режим подключения" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Сертификат центра сертификации не выбран" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Если вы не используете сертификат центра сертификации, это может привести " +#~ "к проблемам безопасности. Хотите выбрать сертификат центра сертификации?" + +#~ msgid "Ignore" +#~ msgstr "Игнорировать" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Выбрать сертификат ЦС" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Спрашивать каждый раз этот пароль" + +#~ msgid "Don't _warn me again" +#~ msgstr "Больше не предупреждать" + +#~ msgid "No" +#~ msgstr "Нет" + +#~ msgid "Yes" +#~ msgstr "Да" + +#~ msgid "Error logging into the account" +#~ msgstr "Ошибка при входе в систему под учётной записью" + +#~ msgid "Credentials have expired." +#~ msgstr "Срок действия учётных данных истёк." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Войдите, чтобы включить эту учётную запись." + +#~ msgid "_Sign In" +#~ msgstr "_Войти" + +#~ msgid "Power" +#~ msgstr "Электропитание" + +#~ msgid "Privacy" +#~ msgstr "Конфиденциальность" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Другое" + +#~ msgid "Personal File Sharing" +#~ msgstr "Общий доступ к файлам" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Разрешить удалённое управление" + +#~ msgid "_Verify" +#~ msgstr "_Проверить" + +#~ msgid "Login History" +#~ msgstr "Журнал входа в систему" + +#~ msgid "Add User Account" +#~ msgstr "Добавить учётную запись пользователя" + +#~ msgid "Remove User Account" +#~ msgstr "Удалить учётную запись пользователя" + +#~ msgid "Login Options" +#~ msgstr "Параметры входа в систему" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Пользователь с именем «%s» уже существует." + #~ msgid "Used to determine your geographical location" #~ msgstr "Используется для определения вашего географического местоположения" diff -Nru gnome-control-center-3.20.2/po/rw.po gnome-control-center-3.22.1/po/rw.po --- gnome-control-center-3.20.2/po/rw.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/rw.po 2016-08-12 12:43:57.000000000 +0000 @@ -19,10 +19,10 @@ "PO-Revision-Date: 2005-03-31 20:55-0700\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" +"Language: rw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"ULL NAME \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../capplets/about-me/eel-alert-dialog.c:114 diff -Nru gnome-control-center-3.20.2/po/si.po gnome-control-center-3.22.1/po/si.po --- gnome-control-center-3.20.2/po/si.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/si.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-08-08 14:58+0530\n" "Last-Translator: Danishka Navin \n" "Language-Team: Sinhala \n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/sk.po gnome-control-center-3.22.1/po/sk.po --- gnome-control-center-3.20.2/po/sk.po 2016-10-11 14:13:30.000000000 +0000 +++ gnome-control-center-3.22.1/po/sk.po 2016-09-27 12:37:36.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-06-29 08:34+0000\n" -"PO-Revision-Date: 2016-07-09 09:38+0200\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-10 16:46+0200\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -23,7 +23,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" "X-Launchpad-Export-Date: 2012-10-06 09:48+0000\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" # desktop entry name #: ../panels/background/background.ui.h:1 @@ -101,7 +101,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Domov" @@ -117,25 +117,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1560 -#: ../panels/display/cc-display-panel.c:2193 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:250 -#: ../panels/network/connection-editor/vpn-helpers.c:379 -#: ../panels/network/net-device-wifi.c:1283 -#: ../panels/network/net-device-wifi.c:1483 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:266 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -168,18 +167,19 @@ msgstr "Aktuálne pozadie" # desktop entry name -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Pozadie" # desktop entry comment -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Mení vaše pozadie na tapetu alebo fotografiu" # desktop entry keywords #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Tapeta;Obrazovka;Plocha;Pozadie;" @@ -224,19 +224,18 @@ msgstr "Vypnite prepínač režimu v lietadle na povolenie Bluetooth." # desktop entry name -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" # desktop entry comment -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Zapína a vypína Bluetooth a pripája vaše zariadenia" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "" "spoločné používanie;spoločne používať;zdieľať;zdieľanie;sprístupniť;" @@ -415,7 +414,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Všetky súbory" @@ -455,7 +454,7 @@ msgstr "Uloženie profilu" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:380 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Uložiť" @@ -743,7 +742,7 @@ # 1. GtkAssistant title; #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:731 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Zhrnutie" @@ -757,11 +756,11 @@ msgid "_Import File…" msgstr "_Importovať súbor…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "P_ridať" @@ -942,20 +941,20 @@ msgid "D75" msgstr "D75" -# 1. GtkWindow title; 2. desktop entry name; -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Farby" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Farba" # desktop entry comment -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibruje farby vašich zariadení, ako napr. displeje, kamery alebo tlačiarne" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Farba;Farby;ICC;Profil;Kalibrovať;Tlačiareň;Displej;" @@ -976,13 +975,13 @@ # naposledy použité #: ../panels/common/cc-util.c:127 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Dnes" # naposledy použité #: ../panels/common/cc-util.c:131 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Včera" @@ -1133,8 +1132,9 @@ msgstr "december" # desktop entry name +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Dátum a čas" @@ -1199,12 +1199,12 @@ msgstr "AM / PM" # desktop entry comment -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Mení dátum a čas vrátané časového pásma" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Hodiny;Čas;Zóna;Pásmo;Poloha;" @@ -1221,29 +1221,29 @@ "totožnosť." # GtkButton label -#: ../panels/display/cc-display-panel.c:572 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Zavretý kryt" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Zrkadlený" # DK: displej # GtkLabel label -#: ../panels/display/cc-display-panel.c:577 -#: ../panels/display/cc-display-panel.c:2387 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Hlavný" # MČ: ak displej tak vypnutý. V iných prípadoch to môže byť inak. Treba skontrolovať pre všetky výskyty, prípadne dať rozdeliť. # * https://bugzilla.gnome.org/show_bug.cgi?id=708580 -#: ../panels/display/cc-display-panel.c:579 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -1254,208 +1254,223 @@ msgstr "Vypnuté" # atkobject -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Vedľajší" # dialog title #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1557 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Rozmiestnenie kombinovaných displejov" # GtkButton label -#: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2194 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Použiť" # GtkLabel -#: ../panels/display/cc-display-panel.c:1585 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Potiahnutím displejov zmeníte ich rozmiestnenie" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1791 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1797 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" # tooltip -#: ../panels/display/cc-display-panel.c:2243 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Otočí o 90° doľava" # tooltip -#: ../panels/display/cc-display-panel.c:2261 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Otočí o 180°" # tooltip -#: ../panels/display/cc-display-panel.c:2279 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Otočí o 90° doprava" -#: ../panels/display/cc-display-panel.c:2300 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Veľkosť" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2313 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Pomer strán" -#: ../panels/display/cc-display-panel.c:2335 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Rozlíšenie" -#: ../panels/display/cc-display-panel.c:2357 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Úprava pre TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Obnovovacia frekvencia" # tooltip -#: ../panels/display/cc-display-panel.c:2388 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Zobrazí hornú lištu a Prehľad aktivít na tomto displeji" # atkobject -#: ../panels/display/cc-display-panel.c:2394 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Vedľajší displej" # tooltip -#: ../panels/display/cc-display-panel.c:2395 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Spojí tento displej s iným a rozšíri tým pracovný priestor" -#: ../panels/display/cc-display-panel.c:2402 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Prezentácia" # tooltip -#: ../panels/display/cc-display-panel.c:2403 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Zobrazí iba prezentácie a médiá" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2408 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Zrkadlo" # tooltip -#: ../panels/display/cc-display-panel.c:2409 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Zobrazí vaše existujúce zobrazenie na oboch displejoch" # GtkButton label -#: ../panels/display/cc-display-panel.c:2415 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Vypnúť" -#: ../panels/display/cc-display-panel.c:2416 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Nepoužívať tento displej" -#: ../panels/display/cc-display-panel.c:2727 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Nepodarilo sa získať informácie o obrazovke" # DK: preklad je presny. overil som to vo fedore 20. Po kliknuti na tlacidlo s tymto textom sa otvori dialog, v ktorom su miniatury displejov a uzivatel ich moze "rozmiestnit" ako chce. -#: ../panels/display/cc-display-panel.c:2758 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Rozmiestniť kombináciu displejov" # desktop entry name -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Displeje" # desktop entry comment -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Volí spôsob použitia pripojených displejov a projektorov" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Projektor;xrandr;Obrazovka;Rozlíšenie;Obnovovanie;Displej;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" # * https://bugzilla.gnome.org/show_bug.cgi?id=695517 # grafika, AP typ #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Neznámy" +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bitový (ID zostavy: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bitový (ID zostavy: %s)" + # Typ OS -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d bitový" # Typ OS -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d bitový" # chooser_button -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Spýtať sa, čo robiť" # chooser_button -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Nespraviť nič" # chooser_button -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Otvoriť priečinok" # window title -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Ostatné nosiče" # window heading -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Vyberte si aplikáciu pre audio CD" # window heading -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Vyberte si aplikáciu pre video DVD" #  window heading -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "" "Vyberte si aplikáciu, ktorá sa spustí pri pripojení hudobného prehrávača" # window heading -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Vyberte si aplikáciu, ktorá sa spustí pri pripojení fotoaparátu" # window heading -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Vyberte si aplikáciu pre CD so softvérom" @@ -1465,107 +1480,105 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "audio DVD" # listore item -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "prázdny disk Blu-ray" # listore item -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "prázdny disk CD" # listore item -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "prázdny disk DVD" # listore item -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "prázdny disk HD DVD" # listore item -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "video disk Blu-ray " # listore item -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "elektronická čítačka kníh" # listore item -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "video disk HD DVD" # PM: je to názov formátu od Kodaku # listore item -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" # listore item -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" # listore item -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" # listore item -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "softvér systému Windows" # 1.,2. treeviewcolumn; -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sekcia" # 1. listore item; tab -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Prehľad" # 1. listore item; tab -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Predvolené aplikácie" # 1. listore item; tab -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Vymeniteľné nosiče" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Verzia %s" # 1.desktop entry name;2. page; 3. GtkListStore item -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Podrobnosti" # desktop entry comment -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Zobrazuje informácie o vašom systéme" # desktop entry keywords #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1781,8 +1794,9 @@ msgid "Launch help browser" msgstr "Spustiť prehliadač pomocníka" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Nastavenia" @@ -1872,7 +1886,6 @@ # KeyListEntries name; desktop entry name #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Bezbariérový prístup" @@ -1916,15 +1929,26 @@ msgid "High contrast on or off" msgstr "Zapnúť alebo vypnúť vysoký kontrast" +# KeyListEntry name +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Vlastné skratky" + # 4. GtkComboBox item (manual, dhcp, link-local...) +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 -#: ../panels/user-accounts/um-fingerprint-dialog.c:215 +#: ../panels/user-accounts/um-fingerprint-dialog.c:213 msgid "Disabled" msgstr "Zakázané" @@ -1953,126 +1977,134 @@ msgid "Modifiers-only switch to next source" msgstr "Prepnutie na ďalší zdroj iba pomocou modifikátorov" +# tooltip +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Obnoví skratku na predvolenú hodnotu" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"Skratka %s sa už používa pre akciu %s. Ak ju nahradíte, akcia %s bude " +"zakázaná" + +# KeyListEntry name +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Nastavenie vlastnej skratky" + +# tab +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Nastaviť skratku" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Zadajte novú skratku na zmenu akcie %s." + +# PM: že ide o klávesovú vyplýva z kontextu +# GtkDialog title +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +msgid "Add Custom Shortcut" +msgstr "Pridanie vlastnej skratky" + # desktop entry name; GtkDialog title -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" msgstr "Klávesnica" # desktop entry comment -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Zobrazuje a mení klávesové skratky a tiež nastavuje vami preferované voľby " "písania" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Skratka;Skratky;Opakovanie;Blikanie;Rýchlosť;" -# PM: že ide o klávesovú vyplýva z kontextu -# GtkDialog title -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Vlastná skratka" - # GtkLabel label -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Názov:" - -# GtkLabel label -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "P_ríkaz:" - -# GtkToolButton label -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Pridať skratku" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 +msgid "No keyboard shortcut found" +msgstr "Nenašla sa žiadna klávesová skratka" -# GtkToolButton label -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Odstrániť skratku" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Skúste vyhľadať niečo iné" -# GtkLabel label -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Klávesovú skratku môžete upraviť tak, že kliknete na príslušný riadok a " -"stlačíte novú skratku, alebo ju vymažete stlačením klávesu Backspace." +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Stlačte kláves Esc na zrušenie." -# KeyListEntry name -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Vlastné skratky" +# tree view column +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Názov" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Príkaz" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Skratka „%s“ sa nedá použiť, pretože by potom nebolo možné normálne písať " -"týmto klávesom.\n" -"Prosím, skúste to súčasne s klávesmi ako Ctrl, Alt alebo Shift." +# tab +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Skratka" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Klávesová skratka „%s“ sa už používa pre\n" -"„%s“" +# button label +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Upraviť" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Ak pridelíte klávesovú skratku pre „%s“, skratka pre „%s“ bude zrušená." +# PK: to druhe neni v tom subore +# PM: to druhé máš tu https://git.gnome.org/browse/gnome-control-center/tree/panels/universal-access/uap.ui?h=gnome-3-8#n77 - vyzerá to na výber programu pre klávesnicu na obrazovke asi to treba rozdeliť +# 1. combobox item s položkou WPA 2. +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Žiadne" # button -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "P_rideliť" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Odstrániť" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Zadajte novú skratku" -# DK:https://bugzilla.gnome.org/show_bug.cgi?id=736336 -# PV:https://git.gnome.org/browse/gnome-control-center/commit/?id=72cd2e69e13d1c21986cf71ada4d08e5a9a2c210 -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Skratka pre akciu „%s“ je previazaná so skratkou pre akciu „%s“. Chcete " -"automaticky prideliť klávesovú skratku „%s“?" +# GtkButton label +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Zrušiť" -# DK:https://bugzilla.gnome.org/show_bug.cgi?id=736336 -# PV:https://git.gnome.org/browse/gnome-control-center/commit/?id=72cd2e69e13d1c21986cf71ada4d08e5a9a2c210 -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"Skratka „%s“ je momentálne pridelená k akcii „%s“. Ak budete pokračovať, " -"bude táto skratka zrušená." +# button atk +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Pridať" -# button -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "P_rideliť" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Nahradiť" + +# tlačidlo +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Nastaviť" # toggle button #: ../panels/mouse/cc-mouse-panel.c:82 @@ -2080,12 +2112,13 @@ msgstr "_Vyskúšať vaše nastavenia" # desktop entry name -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Myš a touchpad" # desktop entry comment -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -2093,7 +2126,7 @@ "ľavákov alebo pravákov" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Ukazovateľ;Kurzor;Klik;Dotyk;Dvojité;Tlačidlo;Trackball;Rolovanie;" @@ -2160,8 +2193,13 @@ msgid "Tap to Click" msgstr "Kliknúť dotykom" -# GtkListStore row +# GtkCheckButton label #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Rolovať dvoma prstami" + +# GtkListStore row +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Rolovať hranou" @@ -2202,11 +2240,11 @@ # label #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Režim v _lietadle" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Sieťový sprostredkovateľ (proxy)" @@ -2214,18 +2252,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ale nie. Niekde nastala chyba. Prosím, kontaktuje vášho dodávateľa softvéru." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager musí byť spustený." @@ -2245,7 +2283,7 @@ # GtkLabel label #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -2265,8 +2303,8 @@ msgstr "strana č. 2" #  1.2. page; 3. 4. GtkLabel label -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" @@ -2276,65 +2314,65 @@ # DK: nenechame tvar: "automaticky" ? # spinbutton default # doriesit v master vetve -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automaticky" -#: ../panels/network/connection-editor/ce-page.c:545 +#: ../panels/network/connection-editor/ce-page.c:521 #, c-format msgid "Profile %d" msgstr "Profil č. %d" # zabezpečenie #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:395 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" # zabezpečenie #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:400 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" # zabezpečenie #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" # PM: toto je v NMA preložené # zabezpečenie #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Podnikové" # zabezpečenie -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:385 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Žiadne" # naposledy použité -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nikdy" # naposledy použité -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:489 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2344,205 +2382,205 @@ # rýchlosť pripojenia #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:546 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mbit/s" # sila signálu -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:575 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Žiadny" # sila signálu -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:577 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Slabý" # sila signálu -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:579 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" # sila signálu -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:581 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Dobrý" # sila signálu -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:583 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Vynikajúci" +# 1.desktop entry name;2. page; 3. GtkListStore item +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Podrobnosti" + # 1.2.3. page; GtkListStore item -#: ../panels/network/connection-editor/ce-page-ethernet.c:228 -#: ../panels/network/connection-editor/ce-page-vpn.c:222 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Totožnosť" # GtkLabel label -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresa" # label -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Maska siete" # label -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Brána" # button atk -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Odstrániť adresu" -# button atk -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Pridať" - # label -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" # button atk -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Odstrániť server DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrika" # button atk -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Odstrániť smerovanie" # GtkComboBox item -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Zistiť automaticky (DHCP)" # GtkComboBox item -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ručné" # ListStore item (Manual, Automatic (DHCP)) -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Len lokálne pripojenie" # GtkListStore item -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" # label -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Predpona" # GtkListStore (tp;aui;bnc;mii); GtkListStore (10Mb/s, 100Mb/s ...) -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Zistiť automaticky" # PM asi tiež Zistiť automaticky #  ListStore item (Automatic, manual, link-local) -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatické, len DHCP" # GtkListStore item -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" # GtkListStore item; page -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Vrátiť pôvodné" # GtkListStore item -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Žiadne" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128 bitový kľúč (šestnástkový alebo ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128 bitové heslo" # liststore item -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamické WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Osobný WPA a WPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Podnikový WPA a WPA 2" @@ -2560,25 +2598,25 @@ # GtkLabel label #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Adresa IPv4" # GtkLabel label #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Adresa IPv6" # GtkLabel label #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" @@ -2586,7 +2624,7 @@ # GtkLabel label #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2597,7 +2635,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2756,47 +2794,27 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Nepodarilo sa otvoriť nástroj na zmenu pripojení" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Nový profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Previazanie" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Spolupráca" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Premostenie" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:738 -msgid "Could not load VPN plugins" -msgstr "Nepodarilo sa načítať zásuvné moduly VPN" - # label -#: ../panels/network/connection-editor/net-connection-editor.c:807 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importovať zo súboru…" # window title -#: ../panels/network/connection-editor/net-connection-editor.c:878 -msgid "Add Network Connection" -msgstr "Pridanie nového pripojenia" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Pridanie VPN" # GtkButton label #: ../panels/network/connection-editor/reset-page.ui.h:1 @@ -2806,7 +2824,7 @@ # GtkButton label #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1484 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Zabudnúť" @@ -2835,12 +2853,12 @@ msgid "S_ecurity" msgstr "Z_abezpečenie" -#: ../panels/network/connection-editor/vpn-helpers.c:210 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Nedá sa importovať pripojenie VPN" # PK: recognized moze byt aj nieco ze to neni standard -#: ../panels/network/connection-editor/vpn-helpers.c:212 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2854,37 +2872,37 @@ "Chyba: %s." # window title -#: ../panels/network/connection-editor/vpn-helpers.c:247 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Výber súboru na importovanie" -#: ../panels/network/connection-editor/vpn-helpers.c:251 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Otvoriť" -#: ../panels/network/connection-editor/vpn-helpers.c:299 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Súbor s názvom „%s“ už existuje." -#: ../panels/network/connection-editor/vpn-helpers.c:301 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Nahradiť" -#: ../panels/network/connection-editor/vpn-helpers.c:303 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Chcete nahradiť %s s pripojením VPN, ktoré sa pokúšate uložiť?" -#: ../panels/network/connection-editor/vpn-helpers.c:339 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Pripojenie VPN sa nedá exportovať" # druhe je subor (moze byt none) -#: ../panels/network/connection-editor/vpn-helpers.c:341 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2896,7 +2914,7 @@ "Chyba: %s." # window title -#: ../panels/network/connection-editor/vpn-helpers.c:376 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportovanie pripojenia VPN" @@ -2928,67 +2946,51 @@ msgstr "Sprístupniť _ostatným používateľom" # desktop entry name -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Sieť" # desktop entry comment -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Ovláda spôsob pripojenia k internetu" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Sieť;Bezdrôtová;Wi-Fi;Wifi;IP;Proxy;LAN;WAN;Modem;Bluetooth;Broadband;Mobil;" -"Širokopásmové;vpn;premostenie;previazanie;DNS;" - -# asi názov virtuálneho zariadenia -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Členovia previazania" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(žiadne)" - -# asi názov virtuálneho zariadenia -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Členovia premostenia" +"Sieť;Bezdrôtová;Wi-Fi;Wifi;IP;Proxy;sprostredkovateľ;LAN;WAN;Modem;Bluetooth;" +"Broadband;Mobil;Širokopásmové;vpn;DNS;" # last used -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nikdy" # last used -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:485 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "dnes" # last used -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:487 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "včera" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Adresa IP" # GtkLabel label -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Naposledy použité" @@ -2999,15 +3001,15 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Drôtové" # button atk; -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1642 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 @@ -3015,54 +3017,50 @@ msgstr "Voľby…" # liststore item -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Pridať nové pripojenie" -# asi názov virtuálneho zariadenia -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Členovia spolupráce" - -#: ../panels/network/net-device-wifi.c:1190 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." msgstr "" "Ak ste pripojený k internetu bez použitia bezdrôtovej siete, tak môžete " -"vytvoriť bezdrôtový hotspot a sprístupniť pripojenie ostatným." +"vytvoriť bezdrôtový prístupový bod a sprístupniť pripojenie ostatným." -#: ../panels/network/net-device-wifi.c:1194 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." -msgstr "Zapnutie bezdrôtového hotspotu vás odpojí od siete %s." +msgstr "" +"Zapnutím bezdrôtového prístupového bodu budete odpojený od siete %s." -#: ../panels/network/net-device-wifi.c:1198 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "" -"Ak je aktívny hotspot, tak nie je možné pristupovať k internetu pomocou " -"bezdrôtovej siete." +"Ak je aktívny prístupový bod, tak nie je možné pristupovať k internetu " +"pomocou bezdrôtovej siete." -#: ../panels/network/net-device-wifi.c:1281 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" -msgstr "Zastaviť hotspot a odpojiť všetkých používateľov?" +msgstr "Zastaviť prístupový bod a odpojiť všetkých používateľov?" # button -#: ../panels/network/net-device-wifi.c:1284 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" -msgstr "_Zastaviť hotspot" +msgstr "_Zastaviť prístupový bod" -#: ../panels/network/net-device-wifi.c:1348 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" -msgstr "Systémové pravidlá zakazujú použitie režimu hotspot" +msgstr "Systémové pravidlá zakazujú použitie režimu prístupového bodu" -#: ../panels/network/net-device-wifi.c:1351 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" -msgstr "Bezdrôtové zariadenie nepodporuje režim hotspot" +msgstr "Bezdrôtové zariadenie nepodporuje režim prístupového bodu" -#: ../panels/network/net-device-wifi.c:1480 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -3071,12 +3069,12 @@ "stratené." # window title; -#: ../panels/network/net-device-wifi.c:1795 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "História" # GtkButton label -#: ../panels/network/net-device-wifi.c:1799 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -3085,7 +3083,7 @@ # button #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1807 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Zabudnúť" @@ -3126,6 +3124,11 @@ msgid "Provider" msgstr "Poskytovateľ" +# desktop entry name +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Sieť" + # GtkListStore item #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" @@ -3259,18 +3262,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Heslo" -# PK: to druhe neni v tom subore -# PM: to druhé máš tu https://git.gnome.org/browse/gnome-control-center/tree/panels/universal-access/uap.ui?h=gnome-3-8#n77 - vyzerá to na výber programu pre klávesnicu na obrazovke asi to treba rozdeliť -# 1. combobox item s položkou WPA 2. -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Žiadne" - # GtkCheckButton label #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" @@ -3361,7 +3357,7 @@ # GtkLabel label #: ../panels/network/network-wifi.ui.h:52 msgid "Wi-Fi Hotspot" -msgstr "Hotspot Wi-Fi" +msgstr "Prístupový bod Wi-Fi" # GtkButton label #: ../panels/network/network-wifi.ui.h:53 @@ -3381,7 +3377,7 @@ # GtkButton label #: ../panels/network/network-wifi.ui.h:56 msgid "_Use as Hotspot…" -msgstr "Po_užiť ako hotspot…" +msgstr "Po_užiť ako prístupový bod…" # GtkButton label #: ../panels/network/network-wifi.ui.h:57 @@ -3390,7 +3386,6 @@ # GtkButton label #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_História" @@ -3417,373 +3412,346 @@ # GtkLabel label #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Heslo" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infraštruktúra" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Neznámy stav" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Nespravované" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nedostupné" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Pripája sa" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Vyžadované je overenie totožnosti" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Pripojené" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Odpája sa" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Pripojenie zlyhalo" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Stav neznámy (chýba)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Nepripojené" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Nastavenie zlyhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Nastavenie IP zlyhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Platnosť nastavenia IP vypršala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Boli požadované tajné informácie, ale neboli poskytnuté" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Žiadateľ 802.1x bol odpojený" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Zlyhalo nastavenia žiadateľa 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Žiadateľ 802.1x zlyhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Overenie totožnosti žiadateľa 802.1x trvalo príliš dlho" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Služba PPP zlyhala pri štarte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Služba PPP bola odpojená" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP zlyhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Klient DHCP zlyhal pri štarte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Chyba klienta DHCP " #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Klient DHCP zlyhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Nepodarilo sa spustiť službu sprístupneného pripojenia" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Služba sprístupneného pripojenia zlyhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Nepodarilo sa spustiť službu AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Chyba služby AutoIP" # AutoIP je termin, ako napr. DHCP #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Služba AutoIP zlyhala " #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linka je zaneprázdnená" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nie je oznamovací tón" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nepodarilo sa pripojiť k žiadnemu poskytovateľovi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Vypršal časový limit pre požiadavku na vytáčanie" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Pokus o vytáčanie zlyhal" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Inicializácia modemu zlyhala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Zlyhalo vybratie určeného APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Nehľadá siete" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Registrácia siete bola zamietnutá" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Vypršal limit pre registráciu siete" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Nepodarilo sa zaregistrovať v požadovanej sieti" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Zlyhala kontrola kódu PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Firmvér pre toto zariadenie môže chýbať" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Pripojenie sa stratilo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Existujúce pripojenie bolo odhadnuté" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Nenájdený modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth pripojenie zlyhalo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Karta SIM nie je vložená" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Vyžadovaný kód Pin pre kartu SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Vyžadovaný kód Puk pre kartu SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Zlá karta SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Zariadenie InfiniBand nepodporuje pripojený režim" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Závislosť pripojenia zlyhala" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Chýba firmvér" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kábel odpojený" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nebol zvolený certifikát certifikačnej autority" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "nedefinovaná chyba v zabezpečení protokolu 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Nebol vybratý žiadny súbor" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Nepoužitie certifikátu certifikačnej autority môže viesť k nezabezpečeným " -"pripojeniam a narušiteľným sieťam Wi-FI. Chcete zvoliť certifikát " -"certifikačnej autority?" - -# button -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorovať" - -# PK: aby to nebolo moc dlhe -# button -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Zvoliť certifikát CA" +msgid "unspecified error validating eap-method file" +msgstr "nešpecifikovaná chyba pri overovaní súboru metódy protokolu eap" # PK: pkcs#12 je zauzivane # file filter -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Súkromné kľúče typu DER, PEM alebo PKCS#12 (*.der, *.pem, *.p12)" +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "" +"Súkromné kľúče typu DER, PEM alebo PKCS#12 (*.der, *.pem, *.p12, *.key)" # file filter -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certifikáty typu DER alebo PEM (*.der, *.pem, *.crt, *.cer)" +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "chýba súbor PAC protokolu EAP-FAST" + # liststore item -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" # liststore item -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" # DK:dialog title -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Výber súboru PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Súbory PAC (*.pac)" -# PM: nebude lepšie súbor s povereniami? -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Súbor PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Vnútorné overenie totožnosti" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "Z_aobstarávanie PAC" - # * https://bugzilla.gnome.org/show_bug.cgi?id=695517 # GtkListStore item -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3794,49 +3762,82 @@ # PAC provisioning # GtkListStore item -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonymné" # PAC provisioning # GtkListStore item -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Overením totožnosti" # PAC provisioning # GtkListStore item -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Oba spôsoby" +# PM: nebude lepšie súbor s povereniami? +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Súbor PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Vnútorné overenie totožnosti" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Umožniť automatické zaobstarávanie PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "chýba používateľské meno protokolu EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "chýba heslo protokolu EAP-LEAP" + # GtkLabel label #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Používateľské meno" # GtkCheckButton label #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Zobraziť heslo" +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "neplatný certifikát protokolu EAP-PEAP CA: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "neplatný certifikát protokolu EAP-PEAP CA: certifikát nebol určený" + # liststore (MSCHAPv2,GTC) -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" # DK:všetko dialog title -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Výber certifikátu certifikačnej autority" @@ -3860,22 +3861,59 @@ msgid "C_A certificate" msgstr "_Certifikát certifikačnej autority (CA)" +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nie je vyžadovaný žiadny certifikát CA" + # GtkLabel label -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Verzia PEAP" -# GtkCheckButton -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Vždy sa _pýtať na heslo" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "chýba používateľské meno protokolu EAP" + +# DK:dialog title +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "chýba heslo EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "chýba identita protokolu EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "Neplatný certifikát protokolu EAP-TLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "neplatný certifikát protokolu EAP-TLS CA: certifikát nebol určený" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "neplatné heslo protokolu EAP-TLS: chýba" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "neplatný súkromný kľúč protokolu EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "neplatný certifikát používateľa protokolu EAP-TLS: %s" # gtkdialog title -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Nezašifrované súkromné kľúče nie sú bezpečné" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3890,12 +3928,12 @@ "(Váš súkromný klúč môžete opatriť heslom pomocou nástroja openssl)" # DK:button -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Vybrať váš osobný certifikát" # DK:button -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Vybrať váš súkromný kľúč" @@ -3910,60 +3948,64 @@ msgstr "_Používateľský certifikát" # GtkLabel label -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Súkromný _kľúč" # GtkLabel label -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Heslo súkromného kľúča" +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "neplatný certifikát protokolu EAP-TTLS CA: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "neplatný certifikát protokolu EAP-TTLS CA: certifikát nebol určený" + # litstore item -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" # litstore item -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" # litstore item -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -# GtkCheckButton label -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Znovu _ma neupozorňovať" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nie" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Áno" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Neznáma chyba pri overovaní bezpečnosti štandardu 802.1x" # litstore item -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + # litstore item -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" # litstore item -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunelované TLS" # litstore item -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Chránený EAP (PEAP)" @@ -3974,6 +4016,50 @@ msgid "Au_thentication" msgstr "_Overenie totožnosti" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "chýba používateľské meno protokolu leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "chýba heslo protokolu leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "chýba kľúč zabezpečenia wep" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba " +"hexadecimálne čísla" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"neplatný kľúč zabezpečenia wep: kľúč o dĺžke %zu musí obsahovať iba znaky v " +"kódovaní ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"neplatný kľúč zabezpečenia wep: nesprávna dĺžka kľúča %zu. Kľúč musí byť o " +"dĺžke buď 5/13 (ascii) alebo 10/26 (hexadecimálne)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "neplatný kľúč zabezpečenia wep: heslo nemôže byť prázdne" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "neplatný kľúč zabezpečenia wep: heslo musí byť kratšie ako 64 znakov" + # WEP index # GtkListStore item #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 @@ -4025,6 +4111,21 @@ msgid "WEP inde_x" msgstr "WEP inde_x" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"neplatné zabezpečenie wpa-psk: neplatná dĺžka kľúča %zu. Musí byť o dĺžke " +"[8,63] bajtov alebo 64 hexadecimálnych čísel" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"neplatné zabezpečenie wpa-psk: nedá sa interpretovať 64 bajtový kľúč ako " +"hexadecimálny" + # GtkLabel label #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" @@ -4032,9 +4133,9 @@ # #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 #: ../panels/universal-access/cc-ua-panel.c:590 #: ../panels/universal-access/cc-ua-panel.c:603 @@ -4083,17 +4184,18 @@ msgstr "Zobrazovať _obsah správ v uzamknutej obrazovke" # desktop entry name -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Oznámenia" # desktop entry comment -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Ovláda zobrazovanie oznámení a ich obsah" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Oznámenia;Bublina;Správa;Oblasť upozornení;Vyskakovacie;" @@ -4114,89 +4216,77 @@ msgid "Applications" msgstr "Aplikácie" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Iný" # * https://bugzilla.gnome.org/show_bug.cgi?id=695517 #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Pridanie účtu" # account dialog group -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Pošta" +# GtkLabel label +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendár" + # account dialog group -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakty" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Rozhovor" # account dialog group -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Zdroje" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Chyba pri prihlásení do účtu" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Poverenia vypršali." - -# PM: poverenia vypršali takže je potrebné znova aktivovať účet ručným prihlásením -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Keď chcete tento účet povoliť, prihláste sa." - -# button -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Prihlásiť sa" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Chyba pri vytváraní nového účtu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Chyba pri odstraňovaní účtu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Naozaj chcete odstrániť tento účet?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Toto neodstráni účet zo servera." # button -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "O_dstrániť" # desktop entry name -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Účty služieb" # desktop entry comment -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Pripojí vás k vašim účtom sieťových služieb a rozhodne na čo sa použijú" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -4211,6 +4301,7 @@ # GtkToolButton label #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Odstrániť účet" @@ -4361,7 +4452,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batéria" @@ -4411,127 +4502,127 @@ msgstr "Pri neč_innosti" # label -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Šetrenie energie" # label -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Jas obrazovky" # GtkSwitch AtkObject -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatický jas" # label -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Jas _klávesnice" # label -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Stmaviť obrazovku pri neaktivite" # PK: toto je divne, skor vypnut obrazovku # PM: no blank screen praveze nie je vypnutie obrazovky, balnk screen je vyplnenie obrazovky čiernou ale je stále zapnutá. Používa sa to pri starých monitoroch, ktoré zobrazujú pri ATM hlásku ze nie je signál. # label -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "Vy_prázdniť obrazovku za" # PM: pozerám že je tam aj reťazec Turns off wireless devices ako label, nemá byť aj on na preklad? # PK: nie, je to label v tom dialogu hruby a potom prepinac # label -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Vypnutím Wi-Fi ušetríte energiu." # label -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Širokopásmové _mobilné pripojenie" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Vypnutím šírokopásmových mobilných zariadení (3G, 4G, LTE, atď) ušetríte " "energiu." # label -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" #  label -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Pri napájaní z batérie" # PK: ked je zastrceny v zasuvke #  label -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Pri zastrčení do zásuvky" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Uspať" # GtkListStore item -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Hibernovať" # chooser_button -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Nespraviť nič" # label #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Tlačidlo uspania a napájania" # label -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automaticky uspať" # label -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatické uspanie" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "K_eď je stlačené tlačidlo napájania" # label -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Zariadenia" -# desktop entry name -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Napájanie" # desktop entry comment -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "" "Zobrazuje stav vašej batérie a umožňuje zmenu nastavení šetrenia energie" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4653,12 +4744,6 @@ msgstr "Oddialiť o" # GtkButton label -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Zrušiť" - -# GtkButton label #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Overeniť totožnosť" @@ -4669,138 +4754,138 @@ msgstr "Vyžaduje sa overenie totožnosti" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Málo tonera" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Minul sa toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Málo vývojky" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Minula sa vývojka" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Málo farby" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Minula sa farba" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Otvorený kryt" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Otvorené dvierka" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Málo papiera" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Minul sa papier" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Vypnutá" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Zastavená" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Odpadová nádržka takmer plná" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Odpadová nádržka plná" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Fotovalcu onedlho skončí životnosť" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Fotovalec už nie je funkčný" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Nastavuje sa" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Pripravená" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Neprijíma úlohy" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Pracuje" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Úroveň tonera" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Úroveň atramentu" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Úroveň náplne" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Inštaluje sa" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4809,16 +4894,16 @@ msgstr[2] "%u aktívne" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Pridávanie novej tlačiarne zlyhalo." # file chooser dialog title -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Výber súboru PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4827,56 +4912,52 @@ "GZ)" # gtk_menu_item -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nenašiel sa žiadny vhodný ovládač" # gtk_image_menu_item -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Hľadajú sa preferované ovládače…" # gtk_image_menu_item -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Vybrať z databázy…" # gtk_image_menu_item -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Poskytnúť súbor PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2607 -#: ../panels/printers/cc-printers-panel.c:2630 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Skúšobná strana" -# desktop entry name -#: ../panels/printers/cc-printers-panel.c:2743 -msgid "No printers" -msgstr "Žiadne tlačiarne" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3089 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Nepodarilo sa načítať súbor používateľského rozhrania: %s" # desktop entry name -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Tlačiarne" # desktop entry comment -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Pridáva tlačiarne, zobrazuje úlohy a umožňuje vám rozhodnúť ako sa bude " "tlačiť" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Tlačiareň;Rad;Tlač;Papier;Atrament;Toner;" @@ -5048,6 +5129,12 @@ msgid "Parallel Port" msgstr "Paralelný port" +# desktop entry name +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + # GtkLabel label #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 @@ -5276,14 +5363,19 @@ msgid "_Options" msgstr "_Voľby" +# desktop entry name +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Žiadne tlačiarne" + # GtkToolButton label #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Pridať tlačiareň" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -5292,79 +5384,79 @@ "sa zdá byť nedostupná." # 2 GtkDialog title -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Uzamknutie obrazovky" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Používa sa" # -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Zapnuté" # MČ: ak displej tak vypnutý. V iných prípadoch to môže byť inak. Treba skontrolovať pre všetky výskyty, prípadne dať rozdeliť. # * https://bugzilla.gnome.org/show_bug.cgi?id=708580 -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Vypnuté" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Služby umiestnenia" # 2 GtkDialog title -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Použitie a história" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Vysypať všetky položky z Koša?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Všetky položky v koši budú natrvalo odstránené." # GtkButton label -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Vyprázdniť kôš" # 2 GtkDialog title -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Odstrániť všetky dočasné súbory?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Všetky dočasné súbory budú natrvalo odstránené." # GtkButton label -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Vymazať dočasné súbory" # 2 GtkDialog title -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Vyprázdnenie koša a dočasné súbory" # GtkLabel label -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Používanie softvéru" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Hlásenie problémov" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -5374,22 +5466,22 @@ "Hlásenia sú odosielané anonymne a neobsahujú osobné údaje." # desktop entry name -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Zabezpečenie súkromia" -# desktop entry name -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Súkromie" # desktop entry comment -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Chráni vaše osobné údaje a obmedzuje prístup pre ostatných" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -5596,23 +5688,23 @@ msgstr "Iný" # label -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Aby sa prejavili zmeny, musíte reštartovať vašu reláciu" # button -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Reštartovať teraz" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nebol vybraný žiadny zdroj vstupu" # toggle button -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Prihlasovacia obrazovka" @@ -5653,19 +5745,20 @@ msgstr "Papier" # desktop entry name -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Región a jazyk" # desktop entry comment -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Umožňuje výber jazyka, formátov, rozloženia klávesnice a zdrojov vstupu" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Jazyk;Rozloženie;Klávesnica;Vstup;" @@ -5734,7 +5827,7 @@ # GtkLabel #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Jazyk" @@ -5789,28 +5882,13 @@ msgstr "" "Nastavenia prihlásenia sú používané všetkými používateľmi na tomto systéme" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Miesta" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Záložky" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Iné" - # file chooser dialog title -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Výber miesta" # liststore item -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Ok" @@ -5819,19 +5897,20 @@ msgstr "Nenašli sa žiadne aplikácie" # desktop entry name -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Vyhľadávanie" # desktop entry comment -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Ovláda zoznam aplikácií, ktoré môžu zobraziť výsledky v prehľade aktivít" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Vyhľadávanie;Nájsť;Index;Skryť;Súkromie;Výsledky;" @@ -5840,6 +5919,18 @@ msgid "Search Locations" msgstr "Vyhľadávanie v umiestneniach" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Miesta" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Záložky" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Ostatné" + # GtkButton AtkObject #: ../panels/search/search.ui.h:1 msgid "Move Up" @@ -5855,6 +5946,11 @@ msgid "Preferences" msgstr "Nastavenia" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nie sú vybraté žiadne siete na sprístupnenie" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5869,7 +5965,7 @@ #: ../panels/sharing/cc-sharing-panel.c:295 msgctxt "service is enabled" msgid "Enabled" -msgstr "Povolené" +msgstr "Povolená" #: ../panels/sharing/cc-sharing-panel.c:298 msgctxt "service is active" @@ -5896,21 +5992,23 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Umožniť vzdialeným používateľom pripojenie pomocou príkazu Secure Shell:\n" +"Keď je povolené vzdialené prihlásenie, vzdialení používatelia sa môžu " +"pripojiť pomocou príkazu Secure Shell:\n" "ssh %s" # GtkLabel label #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Umožniť vzdialeným používateľom zobraziť alebo ovládať vašu obrazovku " -"pripojením k: vnc://%s" +"Sprístupnenie obrazovky umožňuje vzdialeným používateľom zobraziť alebo " +"ovládať vašu obrazovku pripojením k vnc://%s" # menu item #: ../panels/sharing/cc-sharing-panel.c:796 @@ -5919,17 +6017,22 @@ # desktop entry name #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Sprístupnenie" -# desktop entry comment +# desktop entry name +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Sprístupnenie" + +# desktop entry comment +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Ovláda, ktoré údaje chcete sprístupniť ostatným" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5938,6 +6041,11 @@ "pracovná plocha;multimédiá;médiá;audio;zvuk;video;obrázky;fotografie;filmy;" "videá;server;vykreslovač;" +# desktop entry name +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Siete" + #  policy action description #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5950,28 +6058,14 @@ "Na povolenie alebo zakázanie vzdialeného prihlásenia je vyžadované overenie " "totožnosti" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nie sú vybraté žiadne siete na sprístupnenie" - -# desktop entry name -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Siete" - # GtkLabel label #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Názov _počítača" -# GtkDialog title #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Spoločné používanie osobných súborov" +msgid "_File Sharing" +msgstr "_Spoločné používanie súborov" # GtkDialog title #: ../panels/sharing/sharing.ui.h:3 @@ -5993,10 +6087,10 @@ msgid "Some services are disabled because of no network access." msgstr "Niektoré služby sú zakázané kvôli nedostupnosti sieťového pripojenia." -# GtkDialog title +# gtkdialog title #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Spoločné používanie osobných súborov" +msgid "File Sharing" +msgstr "Spoločné používanie súborov" # GtkLabel label #: ../panels/sharing/sharing.ui.h:8 @@ -6013,10 +6107,9 @@ msgid "Screen Sharing" msgstr "Sprístupnenie obrazovky" -# GtkLabel label #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "_Umožniť vzdialené ovládanie" +msgid "_Allow connections to control the screen" +msgstr "_Umožniť pripojeniam ovládať obrazovku" # GtkLabel label #: ../panels/sharing/sharing.ui.h:13 @@ -6049,11 +6142,8 @@ # GtkLabel label #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Spoločné požívanie multimédií vám umožňuje sprístupniť hudbu, fotografie a " -"videá cez sieť." +msgid "Share music, photos and videos over the network." +msgstr "Sprístupnite hudbu, fotografie a videá cez sieť." # GtkToolButton label #: ../panels/sharing/sharing.ui.h:20 @@ -6202,12 +6292,6 @@ msgstr "Detekcia špičiek" # tree view column -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Názov" - -# tree view column #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Zariadenie" @@ -6328,14 +6412,20 @@ msgid "Custom" msgstr "Vlastná" -# desktop entry comment +# KeyListEntries name; desktop entry name +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Bezbariérový prístup" + +# desktop entry comment +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Uľahčuje videnie, písanie, počúvanie, ukazovanie a klikanie" # desktorp entry keywords #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -6455,8 +6545,8 @@ msgstr "Zvukové klávesy" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pípnuť pri zapnutí funkcie Num Lock alebo Caps Lock." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pípnuť pri zapnutí alebo vypnutí funkcie Num Lock alebo Caps Lock." # GtkLabel #: ../panels/universal-access/uap.ui.h:26 @@ -6911,110 +7001,78 @@ msgid "Color Effects" msgstr "Farebné efekty" -# GtkListStore item +# GtkToolButton label #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Pridať používateľa" + +# GtkLabel +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Celé meno" + +# GtkListStore item +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Štandardný" # GtkListStore item -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Správca" # GtkLabel -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Celé meno" - -# GtkLabel -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Typ účtu:" # GtkListStore item -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Umožniť používateľovi nastaviť heslo pri najbližšom _prihlásení" # GtkListStore item -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Nastaviť heslo _teraz" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "O_veriť" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Potvrdiť" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Podnikové prihlásenie umožňuje použitie existujúceho, centrálne " -"spravovaného, používateľského účtu na tomto zariadení." +"spravovaného, používateľského účtu na tomto zariadení. Tiež môžete použiť " +"tento účet na prístup k prostriedkom spoločnosti na internete." # GtkLabel -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Doména" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Na pridanie podnikových účtov\n" -"prejdite do pripojeného režimu." +#: ../panels/user-accounts/data/account-dialog.ui.h:16 +msgid "You are Offline" +msgstr "Ste odpojený" + +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Na pridanie podnikových účtov sa musíte pripojiť." # GtkToggleButton label -#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/account-dialog.ui.h:18 msgid "_Enterprise Login" msgstr "_Podnikové prihlásenie" -# GtkToolButton label -#: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Pridať používateľa" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "Zar_egistrovať" - -# GtkLabel label -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Prihlásenie správcu domény" - -# GtkLabel label -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Aby bolo možné použiť podnikové prihlásenia, tento počítač\n" -"musí byť súčasťou domény. Požiadajte, prosím, vášho správcu,\n" -"aby sem zadal heslo k doméne." - -# GtkLabel -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Meno správcu" - -# GtkLabel -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Heslo správcu" - # GtkListStore item #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -7057,7 +7115,7 @@ # GtkAssistant title #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:688 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Povolenie prihlásenia odtlačkom prsta" @@ -7099,10 +7157,36 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Prihlásenie;Meno;Odtlačok prsta;Podobizeň;Logo;Tvár;Heslo;" -# GtkDialog title -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "História prihlásení" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "Zar_egistrovať" + +# GtkLabel label +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Prihlásenie správcu domény" + +# GtkLabel label +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Aby bolo možné použiť podnikové prihlásenia, tento počítač\n" +"musí byť súčasťou domény. Požiadajte, prosím, vášho správcu,\n" +"aby sem zadal heslo k doméne." + +# GtkLabel +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Meno správcu" + +# GtkLabel +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Heslo správcu" # DK:dialog title #: ../panels/user-accounts/data/password-dialog.ui.h:1 @@ -7131,8 +7215,8 @@ # GtkListStore item #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Umožniť používateľovi nastaviť heslo pri najbližšom prihlásení" +msgid "Allow user to change their password on next login" +msgstr "Umožniť používateľovi zmeniť heslo pri najbližšom prihlásení" # GtkListStore item #: ../panels/user-accounts/data/password-dialog.ui.h:8 @@ -7140,37 +7224,27 @@ msgstr "Nastaviť heslo teraz" # GtkToolButton label -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Pridať používateľský účet" - -# GtkToolButton label -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Odstrániť používateľský účet" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Pridať používateľa…" # GtkLabel #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Možnosti prihlásenia" - -# GtkLabel -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatické prihlásenie" # GtkLabel -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Prihlásenie _odtlačkom prsta" # AtkObject -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ikona používateľa" # GtkLabel -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Posledné prihlásenie" @@ -7276,8 +7350,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Zmiešajte veľké a malé písmená a použite jedno alebo viac číslic." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Zmiešajte veľké a malé písmená a skúste použiť jedno alebo viac číslic." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -7371,32 +7446,32 @@ msgstr "Neznáma chyba" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Mala by sa zhodovať s webovou adresou vášho poskytovateľa účtu." +msgid "Should match the web address of your login provider." +msgstr "Mala by sa zhodovať s webovou adresou vášho poskytovateľa prihlásenia." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Zlyhalo pridanie účtu" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Heslá sa nezhodujú." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Zlyhala registrácia účtu" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Overenie totožnosti nie je pri tejto doméne podporované" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Zlyhalo pripojenie k doméne" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -7404,7 +7479,7 @@ "Prihlasovacie meno nefunguje.\n" "Prosím, skúste to znovu." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -7412,42 +7487,54 @@ "Prihlasovacie heslo nefunguje.\n" "Prosím, skúste to znovu." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Zlyhalo prihlásenie do domény" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Nepodarilo sa nájsť doménu. Napísali ste ju správne?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:140 +# GtkListStore item +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Štandardný" + +# GtkListStore item +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Správca" + +#: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." msgstr "" "Nemáte povolený prístup k zariadeniu. Kontaktujte vášho správcu systému." -#: ../panels/user-accounts/um-fingerprint-dialog.c:142 +#: ../panels/user-accounts/um-fingerprint-dialog.c:140 msgid "The device is already in use." msgstr "Zariadenie sa už používa." -#: ../panels/user-accounts/um-fingerprint-dialog.c:144 +#: ../panels/user-accounts/um-fingerprint-dialog.c:142 msgid "An internal error occurred." msgstr "Vyskytla sa vnútorná chyba." # zariadenie -#: ../panels/user-accounts/um-fingerprint-dialog.c:218 +#: ../panels/user-accounts/um-fingerprint-dialog.c:216 msgid "Enabled" msgstr "Povolené" -#: ../panels/user-accounts/um-fingerprint-dialog.c:265 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Odstrániť zaregistrované odtlačky prstov?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:269 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "O_dstrániť odtlačky prstov" -#: ../panels/user-accounts/um-fingerprint-dialog.c:275 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -7455,15 +7542,15 @@ "Chcete odstrániť vaše zaregistrované odtlačky prstov, čím sa zakáže " "prihlásenie odtlačkom prsta?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:445 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Hotovo!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:506 -#: ../panels/user-accounts/um-fingerprint-dialog.c:548 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Nepodaril sa prístup k zariadeniu „%s“" @@ -7471,16 +7558,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:589 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Nepodarilo sa naštartovať čítanie odtlačku na zariadení „%s“" -#: ../panels/user-accounts/um-fingerprint-dialog.c:639 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Nepodaril sa prístup k žiadnej čítačke odtlačkov prstov" -#: ../panels/user-accounts/um-fingerprint-dialog.c:640 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Ak potrebujete pomoc, prosím, kontaktujte správcu vášho systému." @@ -7489,7 +7576,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:722 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -7499,12 +7586,12 @@ "odtlačkov prstov, pomocou zariadenia „%s“." # assistant page title -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Výber prsta" # assistant page title -#: ../panels/user-accounts/um-fingerprint-dialog.c:730 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Registrovanie odtlačkov prstov" @@ -7567,6 +7654,13 @@ msgid "Session Started" msgstr "Spustenie relácie" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Aktivita účtu" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Prosím, zvoľte si iné heslo." @@ -7633,7 +7727,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Nepodarilo sa pripojiť k doméne %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Iné účty" @@ -7715,17 +7809,17 @@ msgid "Logged in" msgstr "Prihlásený" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Spojenie so službou účtov zlyhalo" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "" "Uistite sa, prosím, že je služba AccountService nainštalovaná a povolená." # tooltip -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -7734,13 +7828,13 @@ "kliknite najprv na ikonu *" # tooltip -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Vytvorí používateľský účet" # tooltip -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -7749,13 +7843,13 @@ "kliknite najprv na ikonu *" # tooltip -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Odstráni vybraný používateľský účet" # tooltip -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -7763,33 +7857,33 @@ "Keď chcete odstrániť používateľský účet,\n" "kliknite najprv na ikonu *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Môj účet" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Používateľ s menom „%s“ už existuje." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Prepáčte, ale toto používateľské meno nie je dostupné. Prosím, skúste iné." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Používateľské meno je príliš dlhé." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Používateľské meno nemôže začínať znakom „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Používateľské meno sa musí skladať iba z malých a veľkých písmen a-z, číslic " -"a niektorého zo znakov „.“, „-“ a „_“." +"Používateľské meno by sa malo skladať iba z malých a veľkých písmen a-z, " +"číslic a nasledovných znakov: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Toto sa použije ako názov vášho domovského priečinka a nie je možné ho " @@ -7889,13 +7983,13 @@ msgstr "Tlačidlo" # desktop entry name -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Tablet Wacom" # desktop entry comment -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Nastavuje mapovanie tlačidiel a upravuje citlivosť pera grafických tabletov" @@ -7903,7 +7997,7 @@ # DK: nechal by som aj Stylus.niekto ma zauzivene toto slovo # desktop entry keywords #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Pero;Guma;Myš;" @@ -7941,6 +8035,11 @@ msgid "Bluetooth Settings" msgstr "Nastavenia Bluetooth" +# desktop entry name +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Tablet Wacom" + # GtkButton #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" @@ -8146,6 +8245,11 @@ msgid "Tip Pressure Feel" msgstr "Pocit tlaku hrotu" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Všetky nastavenia" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Ovládacie stredisko prostredia GNOME" @@ -8210,22 +8314,18 @@ msgid "Quit" msgstr "Ukončiť" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Všetky nastavenia" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Osobné" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hardvér" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Systém" @@ -8267,6 +8367,225 @@ msgid "Cancel search" msgstr "Zrušenie vyhľadávania" +# button +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Prístupový bod" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Klávesová skratka pre %s. Zadaním novej skratky ju zmeníte" + +# GtkLabel label +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Klávesovú skratku môžete upraviť tak, že kliknete na príslušný riadok a " +#~ "stlačíte novú skratku, alebo ju vymažete stlačením klávesu Backspace." + +#~ msgid "Error logging into the account" +#~ msgstr "Chyba pri prihlásení do účtu" + +#~ msgid "Credentials have expired." +#~ msgstr "Poverenia vypršali." + +# PM: poverenia vypršali takže je potrebné znova aktivovať účet ručným prihlásením +#~ msgid "Sign in to enable this account." +#~ msgstr "Keď chcete tento účet povoliť, prihláste sa." + +# button +#~ msgid "_Sign In" +#~ msgstr "_Prihlásiť sa" + +# GtkLabel label +#~ msgid "_Name:" +#~ msgstr "_Názov:" + +# GtkToolButton label +#~ msgid "Add Shortcut" +#~ msgstr "Pridať skratku" + +# GtkToolButton label +#~ msgid "Remove Shortcut" +#~ msgstr "Odstrániť skratku" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Skratka „%s“ sa nedá použiť, pretože by potom nebolo možné normálne písať " +#~ "týmto klávesom.\n" +#~ "Prosím, skúste to súčasne s klávesmi ako Ctrl, Alt alebo Shift." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Klávesová skratka „%s“ sa už používa pre\n" +#~ "„%s“" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Ak pridelíte klávesovú skratku pre „%s“, skratka pre „%s“ bude zrušená." + +# button +#~ msgid "_Reassign" +#~ msgstr "P_rideliť" + +# DK:https://bugzilla.gnome.org/show_bug.cgi?id=736336 +# PV:https://git.gnome.org/browse/gnome-control-center/commit/?id=72cd2e69e13d1c21986cf71ada4d08e5a9a2c210 +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Skratka pre akciu „%s“ je previazaná so skratkou pre akciu „%s“. Chcete " +#~ "automaticky prideliť klávesovú skratku „%s“?" + +# DK:https://bugzilla.gnome.org/show_bug.cgi?id=736336 +# PV:https://git.gnome.org/browse/gnome-control-center/commit/?id=72cd2e69e13d1c21986cf71ada4d08e5a9a2c210 +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "Skratka „%s“ je momentálne pridelená k akcii „%s“. Ak budete pokračovať, " +#~ "bude táto skratka zrušená." + +# button +#~ msgid "_Assign" +#~ msgstr "P_rideliť" + +# window title +#~ msgid "Add Network Connection" +#~ msgstr "Pridanie nového pripojenia" + +# GtkDialog title +#~ msgid "Personal File Sharing" +#~ msgstr "Spoločné používanie osobných súborov" + +# GtkLabel label +#~ msgid "_Allow Remote Control" +#~ msgstr "_Umožniť vzdialené ovládanie" + +# GtkDialog title +#~ msgid "Login History" +#~ msgstr "História prihlásení" + +# GtkToolButton label +#~ msgid "Add User Account" +#~ msgstr "Pridať používateľský účet" + +# GtkToolButton label +#~ msgid "Remove User Account" +#~ msgstr "Odstrániť používateľský účet" + +#~ msgid "Welcome to the Control Center" +#~ msgstr "Vitajte v ovládacom stredisku" + +#~ msgid "Select a panel in the sidelist to see the available options" +#~ msgstr "Vyberte panel v bočnom zozname na zobrazenie dostupných volieb" + +#~ msgid "Bond" +#~ msgstr "Previazanie" + +#~ msgid "Team" +#~ msgstr "Spolupráca" + +#~ msgid "Bridge" +#~ msgstr "Premostenie" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Nepodarilo sa načítať zásuvné moduly VPN" + +# asi názov virtuálneho zariadenia +#~ msgid "Bond slaves" +#~ msgstr "Členovia previazania" + +#~ msgid "(none)" +#~ msgstr "(žiadne)" + +# asi názov virtuálneho zariadenia +#~ msgid "Bridge slaves" +#~ msgstr "Členovia premostenia" + +# asi názov virtuálneho zariadenia +#~ msgid "Team slaves" +#~ msgstr "Členovia spolupráce" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Zariadenie InfiniBand nepodporuje pripojený režim" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nebol zvolený certifikát certifikačnej autority" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Nepoužitie certifikátu certifikačnej autority môže viesť k nezabezpečeným " +#~ "pripojeniam a narušiteľným sieťam Wi-FI. Chcete zvoliť certifikát " +#~ "certifikačnej autority?" + +# button +#~ msgid "Ignore" +#~ msgstr "Ignorovať" + +# PK: aby to nebolo moc dlhe +# button +#~ msgid "Choose CA Certificate" +#~ msgstr "Zvoliť certifikát CA" + +# GtkCheckButton +#~ msgid "As_k for this password every time" +#~ msgstr "Vždy sa _pýtať na heslo" + +# GtkCheckButton label +#~ msgid "Don't _warn me again" +#~ msgstr "Znovu _ma neupozorňovať" + +#~ msgid "No" +#~ msgstr "Nie" + +#~ msgid "Yes" +#~ msgstr "Áno" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Iné" + +#~ msgid "_Verify" +#~ msgstr "O_veriť" + +# GtkLabel +#~ msgid "Login Options" +#~ msgstr "Možnosti prihlásenia" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Používateľ s menom „%s“ už existuje." + +# 1. GtkWindow title; 2. desktop entry name; +#~ msgid "Color" +#~ msgstr "Farby" + +# desktop entry name +#~ msgid "Power" +#~ msgstr "Napájanie" + +# desktop entry name +#~ msgid "Privacy" +#~ msgstr "Súkromie" + # label #~ msgid "Used to determine your geographical location" #~ msgstr "Použije sa na určenie vášho geografického umiestnenia" @@ -8337,10 +8656,6 @@ #~ msgid "Color" #~ msgstr "Farba" -# GtkCheckButton label -#~ msgid "Two Finger Scrolling" -#~ msgstr "Rolovať dvoma prstami" - # GtkLabel label #~ msgid "_Delay:" #~ msgstr "Č_akanie:" @@ -8371,10 +8686,6 @@ #~ msgid "S_peed:" #~ msgstr "Rýchlo_sť:" -# tab -#~ msgid "Shortcuts" -#~ msgstr "Klávesové skratky" - #~ msgid "For mice and touchpads." #~ msgstr "Pre myši a touchpady." diff -Nru gnome-control-center-3.20.2/po/sq.po gnome-control-center-3.22.1/po/sq.po --- gnome-control-center-3.20.2/po/sq.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/sq.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2008-09-20 11:58+0200\n" "Last-Translator: Laurent Dhima \n" "Language-Team: albanian \n" +"Language: sq\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/sr@latin.po gnome-control-center-3.22.1/po/sr@latin.po --- gnome-control-center-3.20.2/po/sr@latin.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/sr@latin.po 2016-09-27 12:37:36.000000000 +0000 @@ -1,29 +1,28 @@ # Serbian translation of gnome-control-center -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. # This file is distributed under the same license as the gnome-control-center package. # Veljko M. Stanojević # Danilo Šegan , 2005. # Slobodan D. Sredojević , 2006. # Miloš Popović , 2010, 2011. -# Miroslav Nikolić , 2011—2015. +# Miroslav Nikolić , 2011—2016. # Marko M. Kostić , 2016. msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-19 08:45+0000\n" -"PO-Revision-Date: 2016-03-19 15:11+0100\n" -"Last-Translator: Marko M. Kostić \n" -"Language-Team: Serbian \n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-11 08:29+0200\n" +"Last-Translator: Miroslav Nikolić \n" +"Language-Team: srpski \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -"X-Generator: Poedit 1.8.7.1\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -95,7 +94,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Lično" @@ -110,25 +109,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -159,16 +157,17 @@ msgid "Current background" msgstr "Trenutna pozadina" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Pozadina" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Izmenite sliku pozadine na tapet ili fotografiju" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "pozadina;ekran;radna površ;" @@ -208,20 +207,19 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Isključite avionski režim rada biste uključili blutut." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Blutut" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Uključite ili isključite blutut i povežite vaše uređaje" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" -msgstr "deljenje;blutut;obeks;deljenje;blutut;obeks;" +msgstr "deljenje;blutut;obeks;" #. TRANSLATORS: The user has to attach the sensor to the screen #: ../panels/color/cc-color-calibrate.c:361 @@ -390,7 +388,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Sve datoteke" @@ -430,7 +428,7 @@ msgstr "Sačuvaj profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Sačuvaj" @@ -687,7 +685,7 @@ "\"windows\">Majkrosoft Vindouza korisne." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Sažetak" @@ -699,11 +697,11 @@ msgid "_Import File…" msgstr "_Uvezi datoteku…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Dodaj" @@ -853,18 +851,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Boja" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibrirajte boje vaših uređaja, kao što su ekrani, foto-aparati ili štampači" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "boja;icc;profil;kalibriraj;štampač;ekran;" @@ -882,25 +881,25 @@ msgid "No languages found" msgstr "Nisam pronašao jezike" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Danas" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Juče" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" -msgstr "%e. %b, %Y" +msgstr "%e. %b, %Y." #: ../panels/common/language-chooser.ui.h:1 msgid "Language" @@ -1018,8 +1017,9 @@ msgid "December" msgstr "Decembar" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Datum i vreme" @@ -1077,12 +1077,12 @@ msgid "AM / PM" msgstr "PrP/PoP" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Izmenite datum i vreme, uključujući vremensku zonu" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "sat;vremenska zona;mesto;" @@ -1095,207 +1095,222 @@ msgstr "" "Da izmenite podešavanja vremena i datuma, morate da potvrdite identitet." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Spušten poklopac" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Preslikano" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Glavni" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Isklj." -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sporedni" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Rasporedite objedinjene prikaze" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Primeni" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Prevucite prikaze da ih prerasporedite" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d herca (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d herca" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Suprotno smeru kazaljke na satu za 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Zaokreni za 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "U smeru kazaljke na satu za 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Veličina" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Razmera" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Rezolucija" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Doterivanje za TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Stopa osvežavanja" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Prikaži gornju traku i pregled aktivnosti na ovom prikazu" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Pomoćni prikaz" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Pridružite ovaj prikaz sa drugim da napravite dodatni radni prostor" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Izlaganje" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Prikažite samo pokretne prikaze i medije" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Preslikano" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Prikažite vaš postojeći pregled na oba prikaza" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Isključi" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Ne koristi ovaj prikaz" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Ne mogu da dobijem podatke o ekranu" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Rasporedi objedinjene prikaze" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ekrani" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Izaberite kako ćete koristiti povezane ekrane i projektore" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "panel;projektor;iks-randr;ekran;rezolucija;osvežavanje;monitor;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Vejland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Nepoznato" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bita (IB izgradnje: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bita (IB izgradnje: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d bita" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bita" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Pitaj šta da radiš" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Ne radi ništa" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Otvori fasciklu" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Ostali nosači podataka" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Izaberite program za audio diskove (CD)" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Izaberite program za video diskove (DVD)" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Izaberite program za pokretanje kada je priključen muzički plejer" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Izaberite program za pokretanje kada je priključena kamera" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Izaberite program za diskove sa softverom" @@ -1304,88 +1319,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "audio DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "prazan Blu-rej disk" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "prazan CD disk" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "prazan DVD disk" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "prazan HD DVD disk" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-rej video disk" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "čitač el. knjiga" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD video disk" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD sa slikama" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Vindouz programi" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Odeljak" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Pregled" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Podrazumevani programi" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Prenosni nosači" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Izdanje %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Pojedinosti" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Pogledajte podatke o vašem sistemu" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1560,8 +1573,9 @@ msgid "Launch help browser" msgstr "Pokreće pregledač pomoći" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Podešavanja" @@ -1634,7 +1648,6 @@ msgstr "Zaključaj ekran" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Univerzalni pristup" @@ -1670,11 +1683,21 @@ msgid "High contrast on or off" msgstr "Uključi/isključi veliki kontrast" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Proizvoljne prečice" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1701,118 +1724,127 @@ msgid "Modifiers-only switch to next source" msgstr "Izmenjivači samo prebacuju na sledeći izvor" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tastatura" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Vrati prečicu na njenu osnovnu vrednost" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "„%s“ se već koristi za %s. Ako zamenite, „%s“ biće isključeno" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Postavi proizvoljnu prečicu" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Postavi prečicu" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Unesite novu prečicu da izmenite %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Dodajte proizvoljnu prečicu" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tastatura" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Pogledajte i izmenite prečice tastature i podesite vaše postavke kucanja" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "prečica;ponovi;trepni;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Proizvoljna prečica" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Naziv:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "N_aredba:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Dodaj prečicu" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Ukloni prečicu" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Da izmenite prečicu, kliknite na odgovarajući red i ukucajte novu " -"kombinaciju tastera ili pritisnite „Backspace“ da obrišete prečicu." +msgid "No keyboard shortcut found" +msgstr "Nisam našao rečicu tastature" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Proizvoljne prečice" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Probajte drugačiju pretragu" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Pritisni Esc da otkažete." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Prečica „%s“ ne može biti korišćena jer će biti nemoguće kucati koristeći " -"ovaj taster.\n" -"Probajte da pridodate taster kao što je „Ctrl, Alt ili Šift“." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Naziv" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Prečica „%s“ se već koristi za\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Naredba" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Prečica" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Uredi" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Ukoliko dodelite prečicu za „%s“, prečica „%s“ će biti isključena." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ništa" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Ponovo dodeli" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Ukloni" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Unesite novu prečicu" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"„%s“ prečica ima pridruženu „%s“ prečicu. Da li želite da je samostalno " -"podesite na „%s“?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Otkaži" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"„%s“ je trenutno pridružena sa „%s“, ova prečica će biti isključena ako " -"nastavite." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Dodaj" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Dodeli" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Zameni" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Postavi" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Isprobaj _podešavanja" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Miš i dodirna tabla" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1820,7 +1852,7 @@ "desnorukost" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "ploča;pokazivač;klik;dodir;duplo;dugme;kuglica;klizanje;" @@ -1878,6 +1910,10 @@ msgstr "Lupni za klik" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Premicanje sa dva prsta" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Klizanje po strani" @@ -1916,11 +1952,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Režim u _avionu" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Mrežni posrednik" @@ -1928,17 +1964,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Uups, nešto je pošlo naopako. Obratite se vašem prodavcu softvera." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Upravljač mrežom treba biti pokrenut." @@ -1954,7 +1990,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1971,59 +2007,64 @@ msgid "page 2" msgstr "strana 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Bezbednost" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "samostalno" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil „%d“" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "VEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "VPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "VPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprajz" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ništa" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Nikad" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2033,179 +2074,179 @@ msgstr[3] "Pre jednog dana" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Nema signala" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Slab signal" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Dobar signal" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Odličan signal" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Izvrstan signal" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Pojedinosti" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitet" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adresa" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Mrežna maska" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Mrežni prolaz" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Obriši adresu" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Dodaj" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Obriši DNS server" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrički" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Obriši rutu" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Samostalno (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ručno" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Samo veži-lokalno" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefiks" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Samostalno" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Samostalno, samo DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Ponovo postavi" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ništa" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "VEP 40/128-bitni ključ (Heksa ili ASKRI)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "VEP 128-bitna lozinka" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dinamički VEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Lični VPA & VPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Poslovni VPA & VPA2" @@ -2220,30 +2261,30 @@ msgstr "Brzina veze" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 adresa" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 adresa" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hardverska adresa" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2253,7 +2294,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2336,13 +2377,13 @@ msgid "Firewall _Zone" msgstr "Oblast _mrežne barijere" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Osnovno" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Oblast određuje nivo poverenja veze" @@ -2384,45 +2425,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Ne mogu da otvorim uređivača veze" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Novi profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Veza" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Ekipa" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Most" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Ne mogu da učitam VPN priključke" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Uvezi iz datoteke…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Dodavanje mrežne veze" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Dodaj VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2430,7 +2451,7 @@ msgstr "_Ponovo postavi" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Zaboravi" @@ -2456,11 +2477,11 @@ msgid "S_ecurity" msgstr "B_ezbednost" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Ne mogu da uvezem VPN vezu" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2473,36 +2494,36 @@ "\n" "Greška: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Izaberite datoteku za uvoz" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Otvori" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Datoteka pod nazivom „%s“ već postoji." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Zameni" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Da li želite da zamenite „%s“ VPN vezom koju sada čuvate?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Ne mogu da izvezem VPN vezu" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2513,7 +2534,7 @@ "\n" "Greška: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Izvezi VPN vezu" @@ -2540,60 +2561,46 @@ msgid "Make available to _other users" msgstr "Učini dostupno _drugim korisnicima" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Mreža" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Upravljajte vašim povezivanjem na Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "mreža;bežična;vaj-faj;ip;lan;posrednik;van;širokopojasna;modem;blutut;vpn;" -"vlan;most;sveza;DNS;" +"DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Podanici sveze" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ništa)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Podanici mosta" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "nikad" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "danas" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "juče" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP adresa" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Korišćena" @@ -2603,34 +2610,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Žičana" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Mogućnosti…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil „%d“" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Dodajte novu vezu" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Podanici tima" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2638,12 +2636,12 @@ "Ako imate neku drugu vezu na Internet osim bežične, možete da podesite " "bežičnu vruću tačku da delite vezu sa drugima." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Uključivanjem bežične vruće tačke prekinućete vezu sa %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2651,23 +2649,23 @@ "Nije moguće pristupiti Internetu preko vaše bežične dok je uključena vruća " "tačka." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Da zaustavim vruću tačku i da isključim sve korisnike?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Zaustavi vruću tačku" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Politika sistema zabranjuje upotrebu kao vruće tačke" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Bežični uređaj ne podržava režim vruće tačke" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2675,11 +2673,11 @@ "Detalji mreže za izabrane mreže, uključujući lozinku i sva proizvoljna " "podešavanja će biti izgubljeni." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Istorijat" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2687,7 +2685,7 @@ msgstr "_Zatvori" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Zaboravi" @@ -2724,6 +2722,10 @@ msgid "Provider" msgstr "Dostavljač" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Mreža" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2829,16 +2831,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Lozinka" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ništa" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Prikaži _lozinku" @@ -2932,7 +2930,6 @@ msgstr "_Poveži se na skrivenu bežičnu mrežu…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Istorijat" @@ -2954,359 +2951,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Lozinka" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hok" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastrukturno" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Nepoznato stanje" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Neupravljan" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Nedostupno" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Povezujem se" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Potrebno je potvrđivanje identiteta" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Povezani ste" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Isključujem" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Povezivanje nije uspelo" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Stanje je nepoznato (nedostaje)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Niste povezani" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Nije uspelo podešavanje" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Nije uspelo podešavanje IP-a" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Isteklo je podešavanje IP-a" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Zatražene su tajne, ali nisu dostavljene" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Prekinuta je veza sa 802.1x moliocem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Nije uspelo podešavanje 802.1x molioca" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x molilac nije uspeo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Potvrđivanje identiteta 802.1x molioca je trajalo predugo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP usluga nije uspela da se pokrene" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP usluga je isključena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP nije uspelo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP klijent nije uspeo da e pokrene" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Greška DHCP klijenta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP klijent nije uspeo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Usluga deljene veze nije uspela da se pokrene" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Usluga deljene veze nije uspela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Usluga samostalnog IP-a nije uspela da se pokrene" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Greška usluge samostalnog IP-a" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Usluga samostalnog IP-a nije uspela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linija je zauzeta" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Nema tona pozivanja" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Nijedan nosač ne može biti uspostavljen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Isteklo je vreme zahteva pozivanja" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Pokušaj pozivanja nije uspeo" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Nije uspelo pokretanje modema" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Nisam uspeo da izaberem navedeni NTP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Ne tražim mreže" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Zavođenje mreže je odbijeno" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Isteklo je vreme za zavođenje mreže" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Nisam uspeo da zavedem sa zahtevanom mrežom" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Provera PIN-a nije uspela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Možda nedostaje firmver za uređaj" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Veza je nestala" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Postojeća veza biće prisvojena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Nije pronađen modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Veza blututa nije uspela" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM kartica nije ubačena" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Potreban je SIM PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Potreban je SIM PUK" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Pogrešna SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Infiniband uređaji ne podržavaju povezani režim" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Nije uspela zavisnost veze" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Nedostaje firmver" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabal je isključen" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Nije izabrano uverenje izdavača ovlašćenja" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "neodređena greška u 802.1x bezbednosti (vpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Nije izabrana datoteka" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Ukoliko ne izaberete uverenje izdavača ovlašćenja (CA) vaša bežična veza može " -"biti nesigurna ili lažna. Da li želite da izaberete uverenje?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Zanemari" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Izaberite CA uverenje" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, ili PKCS#12 lični ključevi (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "neodređena greška potvrđivanja datoteke eap-metoda" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, ili PKCS#12 lični ključevi (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER ili PEM uverenja (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "nedostaje datoteka EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Izaberi PAC datoteku" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC datoteke (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _datoteka" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Unutrašnja prijava" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC _snabdevanje" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3315,41 +3289,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonimno" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Potvrđenim identitetom" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Oba" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _datoteka" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Unutrašnja prijava" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Dozvoli automatsko PAC _snabdevanje" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "nedostaje EAP-LEAP korisničko ime" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "nedostaje EAP-LEAP lozinka" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" -msgstr "_Korisničko ime" +msgstr "_Korisnik" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Po_kaži lozinku" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "neispravno EAP-PEAP uverenje izdavača uverenja: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"neispravno EAP-PEAP uverenje izdavača uverenja: nije navedeno nikakvo uverenje" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Izaberite uverenje izdavača ovlašćenja" @@ -3367,19 +3374,57 @@ msgid "C_A certificate" msgstr "CA _uverenje" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Nije potrebno _uverenje izdavača uverenja" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _izdanje" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Uvek zatraži _lozinku" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "nedostaje EAP korisničko ime" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "nedostaje EAP lozinka" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "nedostaje EAP-TLS identitet" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "neispravno EAP-TLS uverenje izdavača uverenja: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" +"neispravno EAP-TLS uverenje izdavača uverenja: nije navedeno nikakvo uverenje" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "neispravna EAP-TLS LOZINKA: nedostaje" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "neispravan EAP-TLS privatni ključ: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "neispravno EAP-TLS uverenje korisnika: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Nešifrovani privatni ključevi nisu sigurni" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3393,11 +3438,11 @@ "\n" "(Možete zaštititi privatne ključeve koristeći „openssl“)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Izaberite vaše lično uverenje" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Izaberite lični ključ" @@ -3409,51 +3454,57 @@ msgid "_User certificate" msgstr "Uverenje _korisnika" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Lični _ključ" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Lozinka ličnog ključa" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "neispravno EAP-TTLS uverenje izdavača uverenja: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"neispravno EAP-TTLS uverenje izdavača uverenja: nije navedeno nikakvo uverenje" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Ne _upozoravaj me više" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ne" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Da" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Nepoznata greška potvrđivanja 802.1x bezbednosti" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "LZN" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS kroz tunel" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Zaštićeni EAP (PEAP)" @@ -3463,6 +3514,47 @@ msgid "Au_thentication" msgstr "Potvrđivanje _identiteta" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "nedostaje leap korisničko ime" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "nedostaje leap lozinka" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "nedostaje vep ključ" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"neispravan vep ključ: ključ dužine %zu mora da sadrži samo heksadecimalne cifre" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "neispravan vep ključ: ključ dužine %zu mora da sadrži samo askri znakove" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"neispravan vep ključ: pogrešna dužina ključa %zu. Ključ mora biti dužine 5/13 " +"(askri) ili 10/26 (heksa)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "neispravan vep ključ: propusna reč ne sme biti prazna" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "neispravan vep ključ: propusna reč mora biti kraća od 64 znakova" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Osnovno)" @@ -3499,19 +3591,33 @@ msgid "WEP inde_x" msgstr "VEP i_ndeks" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"neispravan vpa-psk: neispravna dužina ključa %zu. Mora biti [8,63] bajta ili " +"64 heksadecimalnih cifara" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"neispravan vpa-psk: ne mogu da rastumačim ključ sa 64 bajta kao heksadecimalni" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Vrsta" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Uklj." @@ -3548,16 +3654,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Prikaži sadržaj p_oruke na ekranu zaključavanja" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Obaveštenja" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Upravljajte prikazanim obaveštenjima i njihovim sadržajem" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "obaveštenja;vrpca;poruka;fioka;iskočko;" @@ -3575,80 +3682,69 @@ msgid "Applications" msgstr "Programi" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Drugo" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Dodaj nalog" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "El. pošta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalendar" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakti" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Ćaskanje" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Izvorišta" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Greška prijavljivanja na nalog" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Punomoćstva su istekla." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Učlanite se da uključi ovaj nalog." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Učlani me" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Greška u stvaranju naloga" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Greška u uklanjanju naloga" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Da li ste sigurni da želite da uklonite nalog?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Ovo neće ukloniti nalog na serveru." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Ukloni" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Nalozi na mreži" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Povežite se na vaše naloge na mreži i odlučite za šta ćete ih koristiti" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3661,6 +3757,7 @@ msgstr "Nisu podešeni nalozi na mreži" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Ukloni nalog" @@ -3812,7 +3909,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Baterija" @@ -3860,102 +3957,103 @@ msgid "When _idle" msgstr "Kada _miruje" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Ušteda napajanja" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Osvetljaj _ekrana" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Samostalno podešavanje osvetljenja" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Osvetljaj _tastature" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Zatamni ekran kada je neradan" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Prazan ekran" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Bežična" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Isključite bežičnu karticu da biste uštedeli bateriju." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobilna širokopojasna" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Isključite mobilni internet (3G, 4G, LTE, itd.) da biste uštedeli bateriju." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Blutut" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Kada se napaja sa baterije" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Kada je uključen" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Obustavi" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Zamrzni" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ništa" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Dugme za gašenje i obustavu" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Sam obustavi" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Samostalna obustava uređaja" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Kada je dugme za napajanje pritisnuto" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Uređaji" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Napajanje" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Pogledajte stanje vaše baterije i izmenite podešavanja uštede napajanja" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4040,11 +4138,6 @@ msgid "Delay" msgstr "Zastoj" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Otkaži" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Potvrdi identitet" @@ -4054,138 +4147,138 @@ msgstr "Potrebno je potvrđivanje identiteta" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Ponestaje tonera" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Nema više tonera" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Ponestaje razvijača" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Nema više razvijača" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Ponestaje markera" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Nema više mastila" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Otvoren poklopac" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Otvorena vratanca" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Ponestaje papira" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Nema više papira" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Isključen" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Zaustavljen" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Posuda za otpad je skoro puna" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Posuda za otpad je puna" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Optički provodnik fotografija je pri kraju života" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Optički provodnik fotografija više ne funkcioniše" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Podešavam" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Spreman" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Ne prihvata poslove" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Obrađuje" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Nivo tonera" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Nivoa mastila" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Nivo zaliha" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Instaliram" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4195,15 +4288,15 @@ msgstr[3] "Jedan pokrenut" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Nisam uspeo da dodam novi štampač." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Izaberite PPD datoteku" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4211,50 +4304,47 @@ "Datoteke opisa Post skript štampača (*.ppd,*.PPD, *.ppd.gz, *PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Nisu pronađeni odgovarajući upravljački programi" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Tražim podesne upravljačke programe…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Izaberi iz baze podataka…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Priloži PPD datoteku…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Probna stranica" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Nema štampača" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Ne mogu da učitam sučelje: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Štampači" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Dodajte štampače, pogledajte poslove štampanja i odlučite kao želite da " "štampate" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "štampač;red;štampa;papir;mastilo;toner;" @@ -4399,7 +4489,7 @@ #, c-format msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" -msgstr "%s - pokrenuti poslovi" +msgstr "%s — pokrenuti poslovi" #. Translators: The found device is a printer connected via USB #: ../panels/printers/pp-new-printer-dialog.c:1659 @@ -4416,6 +4506,11 @@ msgid "Parallel Port" msgstr "Paralelni priključnik" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Blutut" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4627,13 +4722,17 @@ msgid "_Options" msgstr "_Opcije" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Nema štampača" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Dodaj štampač" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4641,70 +4740,70 @@ "Izgleda da nije dostupan pozadinski\n" "program za štampu." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Zaključavanje ekrana" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Koristi se" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Uklj." -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Isklj." -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Usluge mesta" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Upotreba i istorijat" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Da izbacim sve stavke iz smeća?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Sve stavke iz smeća će biti trajno uklonjene." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Izbaci Smeće" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Da obrišem sve privremene datoteke?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Sve privremene datoteke će biti trajno obrisane." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Pročisti privremene datoteke" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Očisti smeće i privremene datoteke" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Upotreba softvera" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Izveštavanje o problemu" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4713,20 +4812,21 @@ "Slanje izveštaja o tehničkim problemima nam pomaže da poboljšamo „%s“. " "Izveštaji se šalju bezimeno i očišćeni su od ličnih podataka." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Politika privatnosti" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Privatnost" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Zaštitite vaše lične podatke i odlučite šta drugi mogu da vide" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4896,21 +4996,21 @@ msgid "Other" msgstr "Drugo" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Morate ponovo da pokrenete sesiju kako bi izmene stupile u dejstvo" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Ponovo pokreni sada" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Nije izabran izvor ulaza" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Ekran _za prijavljivanje" @@ -4942,18 +5042,19 @@ msgid "Paper" msgstr "Papir" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Region i jezik" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Izaberite vaš prikazani jezik, zapise, rasporede tastature i izvore ulaza" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "jezik;raspored;tastatura;unos;" @@ -5010,7 +5111,7 @@ msgstr "Levi+desni alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Jezik" @@ -5059,26 +5160,11 @@ msgstr "" "Podešavanja prijavljivanja koriste svi korisnici kada se prijavljuju na sistem" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Mesta" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Obeleživači" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Drugo" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Izaberi mesto" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "U _redu" @@ -5086,11 +5172,12 @@ msgid "No applications found" msgstr "Nisam pronašao programe" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Pretraga" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5098,7 +5185,7 @@ "aktivnosti" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "nađi;traži;pronađi;potraži;popis;indeks;sakrij;privatnost;rezultati;" @@ -5106,6 +5193,18 @@ msgid "Search Locations" msgstr "Mesta pretrage" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Mesta" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Obeleživači" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Drugo" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Pomeri gore" @@ -5118,6 +5217,11 @@ msgid "Preferences" msgstr "Postavke" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Nisu izabrane mreže za deljenje" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5143,30 +5247,65 @@ msgid "Choose a Folder" msgstr "Izaberite fasciklu" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Deljenje ličnih datoteka vam omogućava da delite vašu javnu fasciklu sa " +"drugima na vašoj tekućoj mreži koristeći: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Kada je uključeno udaljeno prijavljivanje, udaljeni korisnici mogu da se povežu " +"koristeći naredbu bezbedne školjke:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Deljenje ekrana omogućava udaljenim korisnicima da vide ili da upravljaju vašim " +"ekranom tako što će se povezati na vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Umnožavanje" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Deljenje" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Deljenje" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Odlučite šta želite da delite s drugima" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "" "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;" "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;" -"iscrtavač;deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna " -"površ;blutut;obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;" -"server;iscrtavač;" +"iscrtavač;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Mreže" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5178,25 +5317,13 @@ "Potrebno je potvrđivanje identiteta za uključivanje ili isključivanje udaljenog " "prijavljivanja" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Nisu izabrane mreže za deljenje" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Mreže" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Naziv računara" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Deljenje ličnih datoteka" +msgid "_File Sharing" +msgstr "_Deljenje datoteka" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5215,84 +5342,54 @@ msgstr "Neke usluge su isključene jer nema pristupa na mrežu." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Deljenje ličnih datoteka" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Deljenje ličnih datoteka vam omogućava da delite vašu javnu fasciklu sa " -"drugima na vašoj tekućoj mreži koristeći: dav://%s" +msgid "File Sharing" +msgstr "Deljenje datoteka" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Zahteva lozinku" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Udaljeno prijavljivanje" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Omogućava korisnicima da se povežu koristeći naredbu bezbedne školjke:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Deljenje ekrana" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Omogućava udaljenim korisnicima da vide ili da upravljaju vašim ekranom tako " -"što će se povezati na: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Dozvoli ud_aljeno upravljanje" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Dozvoli vezama da kontrolišu ekran" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Lozinka:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Prikaži lozinku" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Mogućnosti pristupa" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Nove veze moraju zatražiti pristup" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Zahtevaj lozinku" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Deljenje medija" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Deljenje multimedija vam omogućava da delite muziku, fotografije i snimke na " -"mreži." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Delite muziku, fotografije i snimke na mreži." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Fascikle" @@ -5424,11 +5521,6 @@ msgid "Peak detect" msgstr "Otkrivanje vrhunca" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Naziv" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Uređaj" @@ -5523,16 +5615,21 @@ msgid "Subwoofer" msgstr "Subvufer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Proizvoljno" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Univerzalni pristup" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Olakšajte posmatranje, slušanje, kucanje, ukazivanje i klikanje" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5630,8 +5727,9 @@ msgstr "Tasteri zvuka" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Zapišti kada su uključeni zaključavanje brojeva i velikih slova" +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Zapišti kada je zaključavanje brojeva ili velikih slova uključeno ili isključeno." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6012,95 +6110,67 @@ msgstr "Dejstva boje" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Dodajte korisnika" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Ime i prezime" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standardni" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administrator" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Ime i prezime" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Vrsta naloga" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Dozvoli korisniku da podesi _lozinku prilikom sledećeg prijavljivanja" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Postavi lozinku sa_da" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_Potvrdi" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Poslovno prijavljivanje omogućava postojećem centralno upravljanom nalogu " -"korisnika da bude korišćen na ovom uređaju." +"Poslovno prijavljivanje omogućava postojećem centralno upravljanom korisničkom " +"nalogu da se koristi na ovom uređaju. Takođe možete da koristite ovaj nalog " +"da pristupite resursima preduzeća na internetu." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domen" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Idite na mrežu da dodate\n" -"naloge poslovnog prijavljivanja." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Poslovno prijavljivanje" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Dodajte korisnika" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Upiši" +msgid "You are Offline" +msgstr "Van mreže ste" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Prijavljivanje administratora domena" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Da biste koristili poslovna prijavljivanja, ovaj računar treba da bude\n" -"upisan u domenu. Neka administrator vaše mreže ovde upiše lozinku\n" -"njihovih domena." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Ime _administratora" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Morate biti na mreži da biste dodali poslovne korisnike." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Lozinka administratora" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Poslovno prijavljivanje" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6135,7 +6205,7 @@ msgstr "Desni, mali prst" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Omogući prijavljivanje otiskom prsta" @@ -6172,9 +6242,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "prijavljivanje;ime;otisak prstiju;avatar;logo;lice;lozinka;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Istorijat prijavljivanja" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Upiši" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Prijavljivanje administratora domena" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Da biste koristili poslovna prijavljivanja, ovaj računar treba da bude\n" +"upisan u domenu. Neka administrator vaše mreže ovde upiše lozinku\n" +"njihovih domena." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Ime _administratora" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Lozinka administratora" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6197,38 +6290,30 @@ msgstr "Trenutna _lozinka" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Dozvoli korisniku da podesi lozinku prilikom sledećeg prijavljivanja" +msgid "Allow user to change their password on next login" +msgstr "Dozvoli korisniku da izmeni lozinku prilikom sledećeg prijavljivanja" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Postavi lozinku sada" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Dodaj korisnički nalog" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Ukloni korisnički nalog" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Dodaj korisnika…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Opcije prijavljivanja" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Automatsko _prijavljivanje" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Prijavljivanje _otiskom prsta" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Ikonica korisnika" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Poslednje prijavljivanje" @@ -6331,8 +6416,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Mešajte velika i mala slova i koristite jedan ili dva broja." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Mešajte velika i mala slova i probajte da koristite jedan ili dva broja." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6422,32 +6508,32 @@ msgstr "Nepoznata greška" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Treba da podudari veb adresu vašeg dostavljača naloga." +msgid "Should match the web address of your login provider." +msgstr "Treba da podudari veb adresu vašeg dostavljača prijavljivanja." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Nisam uspeo da dodam nalog" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Lozinke se ne podudaraju." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Nisam uspeo da upišem nalog" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Nema podržanog načina za potvrđivanje identiteta sa ovim domenom" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Nisam uspeo da pristupim domenu" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6455,7 +6541,7 @@ "Neispravno ime za prijavljivanje.\n" "Pokušajte ponovo." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6463,14 +6549,24 @@ "Neispravna lozinka za prijavljivanje.\n" "Pokušajte ponovo." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Nisam uspeo da se prijavim na domen" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Ne mogu da pronađem domen. Možda ste ga pogrešno napisali?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standardni" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administrator" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6490,15 +6586,15 @@ msgid "Enabled" msgstr "Omogućeno" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Da obrišem zabeležene otiske prsta?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Obriši otiske prsta" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6506,15 +6602,15 @@ "Da li želite da obrišete zabeležene otiske prsta kako bi onemogućili " "prijavljivanje putem otiska prsta?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Urađeno!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Ne mogu da pristupim uređaju „%s“" @@ -6522,16 +6618,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Ne mogu da uhvatim otisak prsta sa uređaja „%s“" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Ne mogu da pristupim nijednom čitaču otisaka prstiju" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Javite se administratoru sistema za pomoć." @@ -6540,7 +6636,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6549,11 +6645,11 @@ "Morate sačuvati jedan od vaših otisaka prsta sa uređaja „%s“, kako bi " "omogućili prijavu na sistem otiskom prsta." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Biram prst" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Upisujem otiske prstiju" @@ -6607,21 +6703,28 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Kraj sesije" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Početak sesije" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — Aktivnost naloga" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." -msgstr "Molim izaberite drugu lozinku." +msgstr "Izaberite drugu lozinku." #: ../panels/user-accounts/um-password-dialog.c:154 msgid "Please type your current password again." -msgstr "Molim unesite vašu trenutnu lozinku ponovo." +msgstr "Unesite vašu trenutnu lozinku ponovo." #: ../panels/user-accounts/um-password-dialog.c:160 msgid "Password could not be changed" @@ -6676,7 +6779,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Ne mogu da se povežem na domen „%s“: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Ostali nalozi" @@ -6757,15 +6860,15 @@ msgid "Logged in" msgstr "Prijavljen sam" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Nisam uspeo da kontaktiram uslugu naloga" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Molim proverite da li je Usluga naloga instalirana i uključena." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6773,12 +6876,12 @@ "Da napravite izmene,\n" "kliknite prvo na ikonicu *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Napravite korisnički nalog" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6786,12 +6889,12 @@ "Da napravite korisnički nalog,\n" "kliknite prvo na ikonicu *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Obrišite izabrani korisnički nalog" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6799,33 +6902,32 @@ "Da obrišete izabrani korisnički nalog,\n" "kliknite prvo na ikonicu *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Moj nalog" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Korisnik sa korisničkim imenom „%s“ već postoji." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Izvinite, ali to korisničko ime nije dostupno. Probajte neko drugo." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Korisničko ime je predugo." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Korisničko ime ne može početi sa „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Korisničko ime treba da sadrži samo velika i mala slova latinskog alfabeta " -"od a-z, brojeve i bilo koji od znaka „. - _“." +"od a-z, cifre i sledeće znakove: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Biće korišćeno za imenovanje vaše lične fascikle i ne može biti izmenjeno." @@ -6916,18 +7018,18 @@ msgid "Button" msgstr "Dugme" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Vakom tablica" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "podesite mapiranje dugmeta i podesite osetljivost olovke grafičkih tablica" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "tablica;vakom;penkalo;brisač;miš;" @@ -6959,6 +7061,10 @@ msgid "Bluetooth Settings" msgstr "Podešavanja Blututa" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Vakom tablica" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Mapiraj monitor…" @@ -7052,22 +7158,22 @@ msgid "Mode Switch #%d" msgstr "Režim prekidača #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Levo dugme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Desno dugme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Gornje dugme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Donje dugme #%d" @@ -7144,6 +7250,11 @@ msgid "Tip Pressure Feel" msgstr "Osećaj pritiska saveta" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Sva podešavanja" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Gnomov Upravljački Centar" @@ -7200,22 +7311,18 @@ msgid "Quit" msgstr "Izađi" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Sva podešavanja" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Lično" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Uređaji" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistem" @@ -7254,6 +7361,186 @@ msgid "Cancel search" msgstr "Otkaži pretragu" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Vruća tačka" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Prečica tastature za %s. Unesite novu prečicu da izemnite." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Da izmenite prečicu, kliknite na odgovarajući red i ukucajte novu " +#~ "kombinaciju tastera ili pritisnite „Backspace“ da obrišete prečicu." + +#~ msgid "Color" +#~ msgstr "Boja" + +#~ msgid "_Name:" +#~ msgstr "_Naziv:" + +#~ msgid "Add Shortcut" +#~ msgstr "Dodaj prečicu" + +#~ msgid "Remove Shortcut" +#~ msgstr "Ukloni prečicu" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Prečica „%s“ ne može biti korišćena jer će biti nemoguće kucati koristeći " +#~ "ovaj taster.\n" +#~ "Probajte da pridodate taster kao što je „Ctrl, Alt ili Šift“." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Prečica „%s“ se već koristi za\n" +#~ "„%s“" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Ukoliko dodelite prečicu za „%s“, prečica „%s“ će biti isključena." + +#~ msgid "_Reassign" +#~ msgstr "_Ponovo dodeli" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "„%s“ prečica ima pridruženu „%s“ prečicu. Da li želite da je samostalno " +#~ "podesite na „%s“?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "„%s“ je trenutno pridružena sa „%s“, ova prečica će biti isključena ako " +#~ "nastavite." + +#~ msgid "_Assign" +#~ msgstr "_Dodeli" + +#~ msgid "Bond" +#~ msgstr "Veza" + +#~ msgid "Team" +#~ msgstr "Ekipa" + +#~ msgid "Bridge" +#~ msgstr "Most" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Ne mogu da učitam VPN priključke" + +#~ msgid "Add Network Connection" +#~ msgstr "Dodavanje mrežne veze" + +#~ msgid "Bond slaves" +#~ msgstr "Podanici sveze" + +#~ msgid "(none)" +#~ msgstr "(ništa)" + +#~ msgid "Bridge slaves" +#~ msgstr "Podanici mosta" + +#~ msgid "Team slaves" +#~ msgstr "Podanici tima" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Infiniband uređaji ne podržavaju povezani režim" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Nije izabrano uverenje izdavača ovlašćenja" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Ukoliko ne izaberete uverenje izdavača ovlašćenja (CA) vaša bežična veza " +#~ "može biti nesigurna ili lažna. Da li želite da izaberete uverenje?" + +#~ msgid "Ignore" +#~ msgstr "Zanemari" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Izaberite CA uverenje" + +#~ msgid "As_k for this password every time" +#~ msgstr "Uvek zatraži _lozinku" + +#~ msgid "Don't _warn me again" +#~ msgstr "Ne _upozoravaj me više" + +#~ msgid "No" +#~ msgstr "Ne" + +#~ msgid "Yes" +#~ msgstr "Da" + +#~ msgid "Error logging into the account" +#~ msgstr "Greška prijavljivanja na nalog" + +#~ msgid "Credentials have expired." +#~ msgstr "Punomoćstva su istekla." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Učlanite se da uključi ovaj nalog." + +#~ msgid "_Sign In" +#~ msgstr "_Učlani me" + +#~ msgid "Power" +#~ msgstr "Napajanje" + +#~ msgid "Privacy" +#~ msgstr "Privatnost" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Drugo" + +#~ msgid "Personal File Sharing" +#~ msgstr "Deljenje ličnih datoteka" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Dozvoli ud_aljeno upravljanje" + +#~ msgid "_Verify" +#~ msgstr "_Potvrdi" + +#~ msgid "Login History" +#~ msgstr "Istorijat prijavljivanja" + +#~ msgid "Add User Account" +#~ msgstr "Dodaj korisnički nalog" + +#~ msgid "Remove User Account" +#~ msgstr "Ukloni korisnički nalog" + +#~ msgid "Login Options" +#~ msgstr "Opcije prijavljivanja" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Korisnik sa korisničkim imenom „%s“ već postoji." + #~ msgid "Used to determine your geographical location" #~ msgstr "Koristi se za određivanje vašeg geografskog položaja" @@ -7333,9 +7620,6 @@ #~ msgid "S_peed:" #~ msgstr "_Brzina:" -#~ msgid "Shortcuts" -#~ msgstr "Prečice" - #~ msgid "Test Your Settings" #~ msgstr "Isprobajte vaša podešavanja" @@ -7374,9 +7658,6 @@ #~ msgid "Fast" #~ msgstr "Velika" -#~ msgid "Two _finger scroll" -#~ msgstr "Klizanje sa _dva prsta" - #~ msgid "No printers available" #~ msgstr "Nema dostupnih štampača" @@ -7955,9 +8236,6 @@ #~ msgid "The current password is not correct" #~ msgstr "Trenutna lozinka nije tačna" -#~ msgid "Wrong password" -#~ msgstr "Pogrešna lozinka" - #~ msgid "Switch Modes" #~ msgstr "Režimi prebacivanja" diff -Nru gnome-control-center-3.20.2/po/sr.po gnome-control-center-3.22.1/po/sr.po --- gnome-control-center-3.20.2/po/sr.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/sr.po 2016-09-27 12:37:36.000000000 +0000 @@ -1,29 +1,28 @@ # Serbian translation of gnome-control-center -# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016. # This file is distributed under the same license as the gnome-control-center package. # Вељко М. Станојевић # Данило Шеган , 2005. # Слободан Д. Средојевић , 2006. # Милош Поповић , 2010, 2011. -# Мирослав Николић , 2011—2015. +# Мирослав Николић , 2011—2016. # Марко М. Костић , 2016. msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-19 15:11+0100\n" -"Last-Translator: Марко М. Костић \n" -"Language-Team: Serbian \n" +"POT-Creation-Date: 2016-09-10 14:47+0000\n" +"PO-Revision-Date: 2016-09-11 08:29+0200\n" +"Last-Translator: Мирослав Николић \n" +"Language-Team: српски \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" -"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " +"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -"X-Generator: Poedit 1.8.7.1\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -95,7 +94,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Личнo" @@ -110,25 +109,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -159,16 +157,17 @@ msgid "Current background" msgstr "Тренутна позадина" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Позадина" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Измените слику позадине на тапет или фотографију" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "позадина;екран;радна површ;" @@ -208,20 +207,19 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Искључите авионски режим рада бисте укључили блутут." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Блутут" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Укључите или искључите блутут и повежите ваше уређаје" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" -msgstr "дељење;блутут;обекс;deljenje;blutut;obeks;" +msgstr "дељење;блутут;обекс;" #. TRANSLATORS: The user has to attach the sensor to the screen #: ../panels/color/cc-color-calibrate.c:361 @@ -390,7 +388,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Све датотеке" @@ -430,7 +428,7 @@ msgstr "Сачувај профил" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Сачувај" @@ -687,7 +685,7 @@ "\"windows\">Мајкрософт Виндоуза корисне." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Сажетак" @@ -699,11 +697,11 @@ msgid "_Import File…" msgstr "_Увези датотеку…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Додај" @@ -853,18 +851,19 @@ msgid "D75" msgstr "Д75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Боја" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Калибрирајте боје ваших уређаја, као што су екрани, фото-апарати или штампачи" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "боја;ицц;профил;калибрирај;штампач;екран;" @@ -882,25 +881,25 @@ msgid "No languages found" msgstr "Нисам пронашао језике" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Данас" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Јуче" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e. %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" -msgstr "%e. %b, %Y" +msgstr "%e. %b, %Y." #: ../panels/common/language-chooser.ui.h:1 msgid "Language" @@ -1018,8 +1017,9 @@ msgid "December" msgstr "Децембар" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Датум и време" @@ -1077,12 +1077,12 @@ msgid "AM / PM" msgstr "ПрП/ПоП" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Измените датум и време, укључујући временску зону" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "сат;временска зона;место;" @@ -1095,207 +1095,222 @@ msgstr "" "Да измените подешавања времена и датума, морате да потврдите идентитет." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Спуштен поклопац" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Пресликано" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Главни" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Искљ." -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Споредни" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Распоредите обједињене приказе" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Примени" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Превуците приказе да их прераспоредите" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d херца (НТСЦ)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d херца" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Супротно смеру казаљке на сату за 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Заокрени за 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "У смеру казаљке на сату за 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Величина" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Размера" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Резолуција" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Дотеривање за ТВ" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Стопа освежавања" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Прикажи горњу траку и преглед активности на овом приказу" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Помоћни приказ" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Придружите овај приказ са другим да направите додатни радни простор" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Излагање" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Прикажите само покретне приказе и медије" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Пресликано" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Прикажите ваш постојећи преглед на оба приказа" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Искључи" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Не користи овај приказ" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Не могу да добијем податке о екрану" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Распореди обједињене приказе" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Екрани" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Изаберите како ћете користити повезане екране и пројекторе" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "панел;пројектор;икс-рандр;екран;резолуција;освежавање;монитор;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Вејланд" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Непознато" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-бита (ИБ изградње: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-бита (ИБ изградње: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d бита" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-бита" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Питај шта да радиш" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Не ради ништа" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Отвори фасциклу" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Остали носачи података" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Изаберите програм за аудио дискове (ЦД)" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Изаберите програм за видео дискове (ДВД)" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Изаберите програм за покретање када је прикључен музички плејер" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Изаберите програм за покретање када је прикључена камера" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Изаберите програм за дискове са софтвером" @@ -1304,88 +1319,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "аудио ДВД" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "празан Блу-реј диск" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "празан ЦД диск" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "празан ДВД диск" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "празан ХД ДВД диск" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Блу-реј видео диск" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "читач ел. књига" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "ХД ДВД видео диск" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "ЦД са сликама" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Супер видео ЦД" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Видео ЦД" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Виндоуз програми" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Одељак" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Преглед" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Подразумевани програми" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Преносни носачи" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Издање %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Појединости" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Погледајте податке о вашем систему" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1560,8 +1573,9 @@ msgid "Launch help browser" msgstr "Покреће прегледач помоћи" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Подешавања" @@ -1634,7 +1648,6 @@ msgstr "Закључај екран" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Универзални приступ" @@ -1670,11 +1683,21 @@ msgid "High contrast on or off" msgstr "Укључи/искључи велики контраст" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Произвољне пречице" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1701,118 +1724,127 @@ msgid "Modifiers-only switch to next source" msgstr "Измењивачи само пребацују на следећи извор" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Тастатура" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Врати пречицу на њену основну вредност" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "„%s“ се већ користи за %s. Ако замените, „%s“ биће искључено" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcuts" +msgid "Set Custom Shortcut" +msgstr "Постави произвољну пречицу" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Постави пречицу" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Унесите нову пречицу да измените %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Додајте произвољну пречицу" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Тастатура" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Погледајте и измените пречице тастатуре и подесите ваше поставке куцања" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "пречица;понови;трепни;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Произвољна пречица" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Назив:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Н_аредба:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Додај пречицу" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Уклони пречицу" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Да измените пречицу, кликните на одговарајући ред и укуцајте нову " -"комбинацију тастера или притисните „Backspace“ да обришете пречицу." +msgid "No keyboard shortcut found" +msgstr "Нисам нашао речицу тастатуре" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Произвољне пречице" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Пробајте другачију претрагу" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Непозната радња>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Притисни Есц да откажете." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Пречица „%s“ не може бити коришћена јер ће бити немогуће куцати користећи " -"овај тастер.\n" -"Пробајте да придодате тастер као што је „Цтрл, Алт или Шифт“." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Назив" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Пречица „%s“ се већ користи за\n" -"„%s“" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Наредба" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Пречица" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Уреди" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Уколико доделите пречицу за „%s“, пречица „%s“ ће бити искључена." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ништа" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Поново додели" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Уклони" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Унесите нову пречицу" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"„%s“ пречица има придружену „%s“ пречицу. Да ли желите да је самостално " -"подесите на „%s“?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Откажи" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"„%s“ је тренутно придружена са „%s“, ова пречица ће бити искључена ако " -"наставите." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Додај" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Додели" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Замени" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Постави" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Испробај _подешавања" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" msgstr "Миш и додирна табла" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1820,7 +1852,7 @@ "деснорукост" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "плоча;показивач;клик;додир;дупло;дугме;куглица;клизање;" @@ -1878,6 +1910,10 @@ msgstr "Лупни за клик" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Премицање са два прста" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Клизање по страни" @@ -1916,11 +1952,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Режим у _авиону" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Мрежни посредник" @@ -1928,17 +1964,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s ВПН" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Уупс, нешто је пошло наопако. Обратите се вашем продавцу софтвера." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Управљач мрежом треба бити покренут." @@ -1954,7 +1990,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1971,59 +2007,64 @@ msgid "page 2" msgstr "страна 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Безбедност" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "самостално" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Профил „%d“" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "ВЕП" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "ВПА" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "ВПА2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Ентерпрајз" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ништа" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Никад" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2033,179 +2074,179 @@ msgstr[3] "Пре једног дана" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Нема сигнала" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Слаб сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Добар сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Одличан сигнал" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Изврстан сигнал" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Појединости" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Идентитет" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Адреса" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Мрежна маска" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Мрежни пролаз" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Обриши адресу" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Додај" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Сервер" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Обриши ДНС сервер" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Метрички" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Обриши руту" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Самостално (ДХЦП)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Ручно" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Само вежи-локално" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "ИПв4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Префикс" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Самостално" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Самостално, само ДХЦП" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "ИПв6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Поново постави" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ништа" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "ВЕП 40/128-битни кључ (Хекса или АСКРИ)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "ВЕП 128-битна лозинка" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "ЛЕАП" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Динамички ВЕП (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Лични ВПА & ВПА2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Пословни ВПА & ВПА2" @@ -2220,30 +2261,30 @@ msgstr "Брзина везе" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "ИПв4 адреса" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "ИПв6 адреса" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Хардверска адреса" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2253,7 +2294,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2336,13 +2377,13 @@ msgid "Firewall _Zone" msgstr "Област _мрежне баријере" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Основно" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Област одређује ниво поверења везе" @@ -2384,45 +2425,25 @@ msgid "IPv_6" msgstr "ИПв_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Не могу да отворим уређивача везе" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Нови профил" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "ВПН" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Веза" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Екипа" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Мост" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "ВЛАН" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Не могу да учитам ВПН прикључке" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Увези из датотеке…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Додавање мрежне везе" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Додај ВПН" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2430,7 +2451,7 @@ msgstr "_Поново постави" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Заборави" @@ -2456,11 +2477,11 @@ msgid "S_ecurity" msgstr "Б_езбедност" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Не могу да увезем ВПН везу" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2473,36 +2494,36 @@ "\n" "Грешка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Изаберите датотеку за увоз" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Отвори" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Датотека под називом „%s“ већ постоји." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Замени" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Да ли желите да замените „%s“ ВПН везом коју сада чувате?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Не могу да извезем ВПН везу" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2513,7 +2534,7 @@ "\n" "Грешка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Извези ВПН везу" @@ -2540,60 +2561,46 @@ msgid "Make available to _other users" msgstr "Учини доступно _другим корисницима" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Мрежа" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Управљајте вашим повезивањем на Интернет" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "мрежа;бежична;вај-фај;ип;лан;посредник;ван;широкопојасна;модем;блутут;впн;" -"влан;мост;свеза;ДНС;" +"ДНС;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Поданици свезе" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ништа)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Поданици моста" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "никад" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "данас" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "јуче" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "ИП адреса" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Коришћена" @@ -2603,34 +2610,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Жичана" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Могућности…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Профил „%d“" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Додајте нову везу" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Поданици тима" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2638,12 +2636,12 @@ "Ако имате неку другу везу на Интернет осим бежичне, можете да подесите " "бежичну врућу тачку да делите везу са другима." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Укључивањем бежичне вруће тачке прекинућете везу са %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2651,23 +2649,23 @@ "Није могуће приступити Интернету преко ваше бежичне док је укључена врућа " "тачка." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Да зауставим врућу тачку и да искључим све кориснике?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Заустави врућу тачку" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Политика система забрањује употребу као вруће тачке" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Бежични уређај не подржава режим вруће тачке" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2675,11 +2673,11 @@ "Детаљи мреже за изабране мреже, укључујући лозинку и сва произвољна " "подешавања ће бити изгубљени." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Историјат" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2687,7 +2685,7 @@ msgstr "_Затвори" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Заборави" @@ -2724,6 +2722,10 @@ msgid "Provider" msgstr "Достављач" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Мрежа" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2829,16 +2831,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Лозинка" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ништа" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Прикажи _лозинку" @@ -2932,7 +2930,6 @@ msgstr "_Повежи се на скривену бежичну мрежу…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Историјат" @@ -2954,359 +2951,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Лозинка" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ад-хок" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Инфраструктурно" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Непознато стање" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Неуправљан" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Недоступно" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Повезујем се" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Потребно је потврђивање идентитета" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Повезани сте" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Искључујем" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Повезивање није успело" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Стање је непознато (недостаје)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Нисте повезани" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Није успело подешавање" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Није успело подешавање ИП-а" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Истекло је подешавање ИП-а" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Затражене су тајне, али нису достављене" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Прекинута је веза са 802.1x молиоцем" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Није успело подешавање 802.1x молиоца" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x молилац није успео" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Потврђивање идентитета 802.1x молиоца је трајало предуго" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "ППП услуга није успела да се покрене" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "ППП услуга је искључена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "ППП није успело" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "ДХЦП клијент није успео да е покрене" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Грешка ДХЦП клијента" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "ДХЦП клијент није успео" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Услуга дељене везе није успела да се покрене" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Услуга дељене везе није успела" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Услуга самосталног ИП-а није успела да се покрене" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Грешка услуге самосталног ИП-а" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Услуга самосталног ИП-а није успела" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Линија је заузета" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Нема тона позивања" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Ниједан носач не може бити успостављен" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Истекло је време захтева позивања" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Покушај позивања није успео" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Није успело покретање модема" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Нисам успео да изаберем наведени НТП" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Не тражим мреже" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Завођење мреже је одбијено" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Истекло је време за завођење мреже" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Нисам успео да заведем са захтеваном мрежом" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Провера ПИН-а није успела" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Можда недостаје фирмвер за уређај" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Веза је нестала" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Постојећа веза биће присвојена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Није пронађен модем" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Веза блутута није успела" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "СИМ картица није убачена" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Потребан је СИМ ПИН" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Потребан је СИМ ПУК" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Погрешна СИМ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Инфинибанд уређаји не подржавају повезани режим" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Није успела зависност везе" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Недостаје фирмвер" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Кабал је искључен" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Није изабрано уверење издавача овлашћења" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "неодређена грешка у 802.1x безбедности (впа-еап)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "Није изабрана датотека" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Уколико не изаберете уверење издавача овлашћења (ЦА) ваша бежична веза може " -"бити несигурна или лажна. Да ли желите да изаберете уверење?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Занемари" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Изаберите ЦА уверење" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "неодређена грешка потврђивања датотеке еап-метода" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "ДЕР или ПЕМ уверења (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "недостаје датотека ЕАП-ФАСТ ПАЦ" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "ГТЦ" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "МСЦХАПв2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Изабери ПАЦ датотеку" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "ПАЦ датотеке (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "ПАЦ _датотека" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Унутрашња пријава" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "ПАЦ _снабдевање" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3315,41 +3289,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Анонимно" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Потврђеним идентитетом" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Оба" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "ПАЦ _датотека" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Унутрашња пријава" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Дозволи аутоматско ПАЦ _снабдевање" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "недостаје ЕАП-ЛЕАП корисничко име" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "недостаје ЕАП-ЛЕАП лозинка" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" -msgstr "_Корисничко име" +msgstr "_Корисник" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "По_кажи лозинку" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "неисправно ЕАП-ПЕАП уверење издавача уверења: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"неисправно ЕАП-ПЕАП уверење издавача уверења: није наведено никакво уверење" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "МД5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Изаберите уверење издавача овлашћења" @@ -3367,19 +3374,57 @@ msgid "C_A certificate" msgstr "ЦА _уверење" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Није потребно _уверење издавача уверења" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "ПЕАП _издање" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Увек затражи _лозинку" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "недостаје ЕАП корисничко име" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "недостаје ЕАП лозинка" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "недостаје ЕАП-ТЛС идентитет" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "неисправно ЕАП-ТЛС уверење издавача уверења: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "" +"неисправно ЕАП-ТЛС уверење издавача уверења: није наведено никакво уверење" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "неисправна ЕАП-ТЛС ЛОЗИНКА: недостаје" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "неисправан ЕАП-ТЛС приватни кључ: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "неисправно ЕАП-ТЛС уверење корисника: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Нешифровани приватни кључеви нису сигурни" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3393,11 +3438,11 @@ "\n" "(Можете заштитити приватне кључеве користећи „openssl“)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Изаберите ваше лично уверење" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Изаберите лични кључ" @@ -3409,51 +3454,57 @@ msgid "_User certificate" msgstr "Уверење _корисника" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Лични _кључ" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_Лозинка личног кључа" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "неисправно ЕАП-ТТЛС уверење издавача уверења: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"неисправно ЕАП-ТТЛС уверење издавача уверења: није наведено никакво уверење" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "ПАП" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "МСЦХАП" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "ЦХАП" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Не _упозоравај ме више" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Не" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Да" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Непозната грешка потврђивања 802.1x безбедности" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "ТЛС" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "ЛЗН" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "ФАСТ" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "ТЛС кроз тунел" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Заштићени ЕАП (ПЕАП)" @@ -3463,6 +3514,47 @@ msgid "Au_thentication" msgstr "Потврђивање _идентитета" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "недостаје леап корисничко име" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "недостаје леап лозинка" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "недостаје веп кључ" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"неисправан веп кључ: кључ дужине %zu мора да садржи само хексадецималне цифре" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "неисправан веп кључ: кључ дужине %zu мора да садржи само аскри знакове" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити дужине 5/13 " +"(аскри) или 10/26 (хекса)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "неисправан веп кључ: пропусна реч не сме бити празна" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "неисправан веп кључ: пропусна реч мора бити краћа од 64 знакова" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Основно)" @@ -3499,19 +3591,33 @@ msgid "WEP inde_x" msgstr "ВЕП и_ндекс" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"неисправан впа-пск: неисправна дужина кључа %zu. Мора бити [8,63] бајта или " +"64 хексадецималних цифара" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"неисправан впа-пск: не могу да растумачим кључ са 64 бајта као хексадецимални" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Врста" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Укљ." @@ -3548,16 +3654,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Прикажи садржај п_оруке на екрану закључавања" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Обавештења" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Управљајте приказаним обавештењима и њиховим садржајем" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "обавештења;врпца;порука;фиока;искочко;" @@ -3575,80 +3682,69 @@ msgid "Applications" msgstr "Програми" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Друго" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Додај налог" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Ел. пошта" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Календар" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Контакти" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Ћаскање" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Изворишта" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Грешка пријављивања на налог" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Пуномоћства су истекла." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Учланите се да укључи овај налог." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Учлани ме" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Грешка у стварању налога" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Грешка у уклањању налога" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Да ли сте сигурни да желите да уклоните налог?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Ово неће уклонити налог на серверу." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Уклони" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Налози на мрежи" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Повежите се на ваше налоге на мрежи и одлучите за шта ћете их користити" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3661,6 +3757,7 @@ msgstr "Нису подешени налози на мрежи" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Уклони налог" @@ -3812,7 +3909,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Батерија" @@ -3860,102 +3957,103 @@ msgid "When _idle" msgstr "Када _мирује" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Уштеда напајања" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Осветљај _екрана" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Самостално подешавање осветљења" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Осветљај _тастатуре" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Затамни екран када је нерадан" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Празан екран" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Бежична" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Искључите бежичну картицу да бисте уштедели батерију." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Мобилна широкопојасна" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Искључите мобилни интернет (3Г, 4Г, ЛТЕ, итд.) да бисте уштедели батерију." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Блутут" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Када се напаја са батерије" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Када је укључен" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Обустави" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Замрзни" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ништа" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Дугме за гашење и обуставу" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Сам обустави" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Самостална обустава уређаја" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Када је дугме за напајање притиснуто" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Уређаји" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Напајање" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Погледајте стање ваше батерије и измените подешавања уштеде напајања" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4040,11 +4138,6 @@ msgid "Delay" msgstr "Застој" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Откажи" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Потврди идентитет" @@ -4054,138 +4147,138 @@ msgstr "Потребно је потврђивање идентитета" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Понестаје тонера" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Нема више тонера" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Понестаје развијача" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Нема више развијача" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Понестаје маркера" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Нема више мастила" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Отворен поклопац" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Отворена вратанца" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Понестаје папира" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Нема више папира" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Искључен" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Заустављен" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Посуда за отпад је скоро пуна" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Посуда за отпад је пуна" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Оптички проводник фотографија је при крају живота" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Оптички проводник фотографија више не функционише" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Подешавам" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Спреман" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Не прихвата послове" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Обрађује" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Ниво тонера" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Нивоа мастила" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Ниво залиха" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Инсталирам" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4195,15 +4288,15 @@ msgstr[3] "Један покренут" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Нисам успео да додам нови штампач." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Изаберите ППД датотеку" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4211,50 +4304,47 @@ "Датотеке описа Пост скрипт штампача (*.ppd,*.PPD, *.ppd.gz, *PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Нису пронађени одговарајући управљачки програми" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Тражим подесне управљачке програме…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Изабери из базе података…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Приложи ППД датотеку…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Пробна страница" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Нема штампача" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Не могу да учитам сучеље: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Штампачи" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Додајте штампаче, погледајте послове штампања и одлучите као желите да " "штампате" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "штампач;ред;штампа;папир;мастило;тонер;" @@ -4399,7 +4489,7 @@ #, c-format msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" -msgstr "%s - покренути послови" +msgstr "%s — покренути послови" #. Translators: The found device is a printer connected via USB #: ../panels/printers/pp-new-printer-dialog.c:1659 @@ -4416,6 +4506,11 @@ msgid "Parallel Port" msgstr "Паралелни прикључник" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Блутут" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4627,13 +4722,17 @@ msgid "_Options" msgstr "_Опције" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Нема штампача" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Додај штампач" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4641,70 +4740,70 @@ "Изгледа да није доступан позадински\n" "програм за штампу." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Закључавање екрана" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Користи се" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Укљ." -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Искљ." -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Услуге места" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Употреба и историјат" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Да избацим све ставке из смећа?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Све ставке из смећа ће бити трајно уклоњене." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Избаци Смеће" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Да обришем све привремене датотеке?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Све привремене датотеке ће бити трајно обрисане." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Прочисти привремене датотеке" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Очисти смеће и привремене датотеке" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Употреба софтвера" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Извештавање о проблему" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4713,20 +4812,21 @@ "Слање извештаја о техничким проблемима нам помаже да побољшамо „%s“. " "Извештаји се шаљу безимено и очишћени су од личних података." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Политика приватности" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Приватност" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Заштитите ваше личне податке и одлучите шта други могу да виде" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4896,21 +4996,21 @@ msgid "Other" msgstr "Друго" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Морате поново да покренете сесију како би измене ступиле у дејство" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Поново покрени сада" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Није изабран извор улаза" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Екран _за пријављивање" @@ -4942,18 +5042,19 @@ msgid "Paper" msgstr "Папир" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "Регион и језик" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" "Изаберите ваш приказани језик, записе, распореде тастатуре и изворе улаза" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "језик;распоред;тастатура;унос;" @@ -5010,7 +5111,7 @@ msgstr "Леви+десни алт" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Језик" @@ -5059,26 +5160,11 @@ msgstr "" "Подешавања пријављивања користе сви корисници када се пријављују на систем" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Места" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Обележивачи" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Друго" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Изабери место" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "У _реду" @@ -5086,11 +5172,12 @@ msgid "No applications found" msgstr "Нисам пронашао програме" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Претрага" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5098,7 +5185,7 @@ "активности" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "нађи;тражи;пронађи;потражи;попис;индекс;сакриј;приватност;резултати;" @@ -5106,6 +5193,18 @@ msgid "Search Locations" msgstr "Места претраге" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Места" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Обележивачи" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Друго" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Помери горе" @@ -5118,6 +5217,11 @@ msgid "Preferences" msgstr "Поставке" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Нису изабране мреже за дељење" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5143,30 +5247,65 @@ msgid "Choose a Folder" msgstr "Изаберите фасциклу" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Дељење личних датотека вам омогућава да делите вашу јавну фасциклу са " +"другима на вашој текућој мрежи користећи: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Када је укључено удаљено пријављивање, удаљени корисници могу да се повежу " +"користећи наредбу безбедне шкољке:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Дељење екрана омогућава удаљеним корисницима да виде или да управљају вашим " +"екраном тако што ће се повезати на vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Умножавање" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Дељење" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Дељење" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Одлучите шта желите да делите с другима" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "" "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;" "обекс;медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;" -"исцртавач;deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna " -"površ;blutut;obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;" -"server;iscrtavač;" +"исцртавач;" + +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Мреже" #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" @@ -5178,25 +5317,13 @@ "Потребно је потврђивање идентитета за укључивање или искључивање удаљеног " "пријављивања" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Нису изабране мреже за дељење" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Мреже" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Назив рачунара" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Дељење личних датотека" +msgid "_File Sharing" +msgstr "_Дељење датотека" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5215,84 +5342,54 @@ msgstr "Неке услуге су искључене јер нема приступа на мрежу." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Дељење личних датотека" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Дељење личних датотека вам омогућава да делите вашу јавну фасциклу са " -"другима на вашој текућој мрежи користећи: dav://%s" +msgid "File Sharing" +msgstr "Дељење датотека" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Захтева лозинку" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Удаљено пријављивање" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Омогућава корисницима да се повежу користећи наредбу безбедне шкољке:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Дељење екрана" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Омогућава удаљеним корисницима да виде или да управљају вашим екраном тако " -"што ће се повезати на: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "Дозволи уд_аљено управљање" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Дозволи везама да контролишу екран" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Лозинка:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Прикажи лозинку" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Могућности приступа" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Нове везе морају затражити приступ" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Захтевај лозинку" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Дељење медија" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Дељење мултимедија вам омогућава да делите музику, фотографије и снимке на " -"мрежи." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Делите музику, фотографије и снимке на мрежи." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Фасцикле" @@ -5424,11 +5521,6 @@ msgid "Peak detect" msgstr "Откривање врхунца" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Назив" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Уређај" @@ -5523,16 +5615,21 @@ msgid "Subwoofer" msgstr "Субвуфер" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Произвољно" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Универзални приступ" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Олакшајте посматрање, слушање, куцање, указивање и кликање" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5630,8 +5727,9 @@ msgstr "Тастери звука" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Запишти када су укључени закључавање бројева и великих слова" +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Запишти када је закључавање бројева или великих слова укључено или искључено." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -6012,95 +6110,67 @@ msgstr "Дејства боје" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Додајте корисника" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Име и презиме" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Стандардни" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Администратор" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Име и презиме" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Врста налога" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Дозволи кориснику да подеси _лозинку приликом следећег пријављивања" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Постави лозинку са_да" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_Потврди" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Пословно пријављивање омогућава постојећем централно управљаном налогу " -"корисника да буде коришћен на овом уређају." +"Пословно пријављивање омогућава постојећем централно управљаном корисничком " +"налогу да се користи на овом уређају. Такође можете да користите овај налог " +"да приступите ресурсима предузећа на интернету." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Домен" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Идите на мрежу да додате\n" -"налоге пословног пријављивања." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Пословно пријављивање" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Додајте корисника" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Упиши" +msgid "You are Offline" +msgstr "Ван мреже сте" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Пријављивање администратора домена" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Да бисте користили пословна пријављивања, овај рачунар треба да буде\n" -"уписан у домену. Нека администратор ваше мреже овде упише лозинку\n" -"њихових домена." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Име _администратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Морате бити на мрежи да бисте додали пословне кориснике." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Лозинка администратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Пословно пријављивање" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6135,7 +6205,7 @@ msgstr "Десни, мали прст" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Омогући пријављивање отиском прста" @@ -6172,9 +6242,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "пријављивање;име;отисак прстију;аватар;лого;лице;лозинка;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Историјат пријављивања" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Упиши" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Пријављивање администратора домена" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Да бисте користили пословна пријављивања, овај рачунар треба да буде\n" +"уписан у домену. Нека администратор ваше мреже овде упише лозинку\n" +"њихових домена." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Име _администратора" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Лозинка администратора" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6197,38 +6290,30 @@ msgstr "Тренутна _лозинка" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Дозволи кориснику да подеси лозинку приликом следећег пријављивања" +msgid "Allow user to change their password on next login" +msgstr "Дозволи кориснику да измени лозинку приликом следећег пријављивања" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Постави лозинку сада" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Додај кориснички налог" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Уклони кориснички налог" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Додај корисника…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Опције пријављивања" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Аутоматско _пријављивање" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Пријављивање _отиском прста" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Иконица корисника" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Последње пријављивање" @@ -6331,8 +6416,9 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Мешајте велика и мала слова и користите један или два броја." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "" +"Мешајте велика и мала слова и пробајте да користите један или два броја." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6422,32 +6508,32 @@ msgstr "Непозната грешка" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Треба да подудари веб адресу вашег достављача налога." +msgid "Should match the web address of your login provider." +msgstr "Треба да подудари веб адресу вашег достављача пријављивања." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Нисам успео да додам налог" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Лозинке се не подударају." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Нисам успео да упишем налог" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Нема подржаног начина за потврђивање идентитета са овим доменом" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Нисам успео да приступим домену" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6455,7 +6541,7 @@ "Неисправно име за пријављивање.\n" "Покушајте поново." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6463,14 +6549,24 @@ "Неисправна лозинка за пријављивање.\n" "Покушајте поново." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Нисам успео да се пријавим на домен" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Не могу да пронађем домен. Можда сте га погрешно написали?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Стандардни" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Администратор" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6490,15 +6586,15 @@ msgid "Enabled" msgstr "Омогућено" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Да обришем забележене отиске прста?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Обриши отиске прста" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6506,15 +6602,15 @@ "Да ли желите да обришете забележене отиске прста како би онемогућили " "пријављивање путем отиска прста?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Урађено!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Не могу да приступим уређају „%s“" @@ -6522,16 +6618,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Не могу да ухватим отисак прста са уређаја „%s“" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Не могу да приступим ниједном читачу отисака прстију" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Јавите се администратору система за помоћ." @@ -6540,7 +6636,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6549,11 +6645,11 @@ "Морате сачувати један од ваших отисака прста са уређаја „%s“, како би " "омогућили пријаву на систем отиском прста." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Бирам прст" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Уписујем отиске прстију" @@ -6607,21 +6703,28 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Крај сесије" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Почетак сесије" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — Активност налога" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." -msgstr "Молим изаберите другу лозинку." +msgstr "Изаберите другу лозинку." #: ../panels/user-accounts/um-password-dialog.c:154 msgid "Please type your current password again." -msgstr "Молим унесите вашу тренутну лозинку поново." +msgstr "Унесите вашу тренутну лозинку поново." #: ../panels/user-accounts/um-password-dialog.c:160 msgid "Password could not be changed" @@ -6676,7 +6779,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Не могу да се повежем на домен „%s“: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Остали налози" @@ -6757,15 +6860,15 @@ msgid "Logged in" msgstr "Пријављен сам" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Нисам успео да контактирам услугу налога" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Молим проверите да ли је Услуга налога инсталирана и укључена." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6773,12 +6876,12 @@ "Да направите измене,\n" "кликните прво на иконицу *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Направите кориснички налог" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6786,12 +6889,12 @@ "Да направите кориснички налог,\n" "кликните прво на иконицу *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Обришите изабрани кориснички налог" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6799,33 +6902,32 @@ "Да обришете изабрани кориснички налог,\n" "кликните прво на иконицу *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Мој налог" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Корисник са корисничким именом „%s“ већ постоји." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Извините, али то корисничко име није доступно. Пробајте неко друго." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Корисничко име је предуго." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Корисничко име не може почети са „-“." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Корисничко име треба да садржи само велика и мала слова латинског алфабета " -"од а-z, бројеве и било који од знака „. - _“." +"од а-z, цифре и следеће знакове: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Биће коришћено за именовање ваше личне фасцикле и не може бити измењено." @@ -6916,18 +7018,18 @@ msgid "Button" msgstr "Дугме" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Ваком таблица" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "подесите мапирање дугмета и подесите осетљивост оловке графичких таблица" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "таблица;ваком;пенкало;брисач;миш;" @@ -6959,6 +7061,10 @@ msgid "Bluetooth Settings" msgstr "Подешавања Блутута" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Ваком таблица" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Мапирај монитор…" @@ -7052,22 +7158,22 @@ msgid "Mode Switch #%d" msgstr "Режим прекидача #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Лево дугме #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Десно дугме #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Горње дугме #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Доње дугме #%d" @@ -7144,6 +7250,11 @@ msgid "Tip Pressure Feel" msgstr "Осећај притиска савета" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Сва подешавања" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Гномов Управљачки Центар" @@ -7200,22 +7311,18 @@ msgid "Quit" msgstr "Изађи" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Сва подешавања" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Лично" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Уређаји" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Систем" @@ -7254,6 +7361,186 @@ msgid "Cancel search" msgstr "Откажи претрагу" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Врућа тачка" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Пречица тастатуре за %s. Унесите нову пречицу да иземните." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Да измените пречицу, кликните на одговарајући ред и укуцајте нову " +#~ "комбинацију тастера или притисните „Backspace“ да обришете пречицу." + +#~ msgid "Color" +#~ msgstr "Боја" + +#~ msgid "_Name:" +#~ msgstr "_Назив:" + +#~ msgid "Add Shortcut" +#~ msgstr "Додај пречицу" + +#~ msgid "Remove Shortcut" +#~ msgstr "Уклони пречицу" + +#~ msgid "" +#~ msgstr "<Непозната радња>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Пречица „%s“ не може бити коришћена јер ће бити немогуће куцати користећи " +#~ "овај тастер.\n" +#~ "Пробајте да придодате тастер као што је „Цтрл, Алт или Шифт“." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Пречица „%s“ се већ користи за\n" +#~ "„%s“" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Уколико доделите пречицу за „%s“, пречица „%s“ ће бити искључена." + +#~ msgid "_Reassign" +#~ msgstr "_Поново додели" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "„%s“ пречица има придружену „%s“ пречицу. Да ли желите да је самостално " +#~ "подесите на „%s“?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "„%s“ је тренутно придружена са „%s“, ова пречица ће бити искључена ако " +#~ "наставите." + +#~ msgid "_Assign" +#~ msgstr "_Додели" + +#~ msgid "Bond" +#~ msgstr "Веза" + +#~ msgid "Team" +#~ msgstr "Екипа" + +#~ msgid "Bridge" +#~ msgstr "Мост" + +#~ msgid "VLAN" +#~ msgstr "ВЛАН" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Не могу да учитам ВПН прикључке" + +#~ msgid "Add Network Connection" +#~ msgstr "Додавање мрежне везе" + +#~ msgid "Bond slaves" +#~ msgstr "Поданици свезе" + +#~ msgid "(none)" +#~ msgstr "(ништа)" + +#~ msgid "Bridge slaves" +#~ msgstr "Поданици моста" + +#~ msgid "Team slaves" +#~ msgstr "Поданици тима" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Инфинибанд уређаји не подржавају повезани режим" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Није изабрано уверење издавача овлашћења" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Уколико не изаберете уверење издавача овлашћења (ЦА) ваша бежична веза " +#~ "може бити несигурна или лажна. Да ли желите да изаберете уверење?" + +#~ msgid "Ignore" +#~ msgstr "Занемари" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Изаберите ЦА уверење" + +#~ msgid "As_k for this password every time" +#~ msgstr "Увек затражи _лозинку" + +#~ msgid "Don't _warn me again" +#~ msgstr "Не _упозоравај ме више" + +#~ msgid "No" +#~ msgstr "Не" + +#~ msgid "Yes" +#~ msgstr "Да" + +#~ msgid "Error logging into the account" +#~ msgstr "Грешка пријављивања на налог" + +#~ msgid "Credentials have expired." +#~ msgstr "Пуномоћства су истекла." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Учланите се да укључи овај налог." + +#~ msgid "_Sign In" +#~ msgstr "_Учлани ме" + +#~ msgid "Power" +#~ msgstr "Напајање" + +#~ msgid "Privacy" +#~ msgstr "Приватност" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Друго" + +#~ msgid "Personal File Sharing" +#~ msgstr "Дељење личних датотека" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Дозволи уд_аљено управљање" + +#~ msgid "_Verify" +#~ msgstr "_Потврди" + +#~ msgid "Login History" +#~ msgstr "Историјат пријављивања" + +#~ msgid "Add User Account" +#~ msgstr "Додај кориснички налог" + +#~ msgid "Remove User Account" +#~ msgstr "Уклони кориснички налог" + +#~ msgid "Login Options" +#~ msgstr "Опције пријављивања" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Корисник са корисничким именом „%s“ већ постоји." + #~ msgid "Used to determine your geographical location" #~ msgstr "Користи се за одређивање вашег географског положаја" @@ -7333,9 +7620,6 @@ #~ msgid "S_peed:" #~ msgstr "_Брзина:" -#~ msgid "Shortcuts" -#~ msgstr "Пречице" - #~ msgid "Test Your Settings" #~ msgstr "Испробајте ваша подешавања" @@ -7374,9 +7658,6 @@ #~ msgid "Fast" #~ msgstr "Велика" -#~ msgid "Two _finger scroll" -#~ msgstr "Клизање са _два прста" - #~ msgid "No printers available" #~ msgstr "Нема доступних штампача" @@ -7955,9 +8236,6 @@ #~ msgid "The current password is not correct" #~ msgstr "Тренутна лозинка није тачна" -#~ msgid "Wrong password" -#~ msgstr "Погрешна лозинка" - #~ msgid "Switch Modes" #~ msgstr "Режими пребацивања" diff -Nru gnome-control-center-3.20.2/po/sv.po gnome-control-center-3.22.1/po/sv.po --- gnome-control-center-3.20.2/po/sv.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/sv.po 2016-09-27 12:37:36.000000000 +0000 @@ -7,7 +7,7 @@ # Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011, 2012. # Josef Andersson , 2014. # Åke Engelbrektson , 2014. -# Anders Jonsson , 2015. +# Anders Jonsson , 2015, 2016. # Mattias Eriksson , 2015. # Sebastian Rasmussen , 2015, 2016. # @@ -16,8 +16,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-17 13:52+0000\n" -"PO-Revision-Date: 2016-03-18 14:12+0100\n" +"POT-Creation-Date: 2016-09-14 18:42+0000\n" +"PO-Revision-Date: 2016-09-15 00:34+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Svenska \n" "Language: sv\n" @@ -25,7 +25,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.9\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -97,7 +97,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Hem" @@ -112,25 +112,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -161,16 +160,17 @@ msgid "Current background" msgstr "Aktuell bakgrund" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "Bakgrund" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "Bak­grund" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Ändra din skrivbordsbakgrund till bakgrundsbild eller foto" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Bakgrundsbild;Wallpaper;Skrivbordsbakgrund;Skärm;Skrivbord;" @@ -210,18 +210,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Slå av växelknappen för flygplansläge för att aktivera Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Slå på samt av Bluetooth och anslut dina enheter" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "dela;delning;share;blåtand;bluetooth;obex;" @@ -391,7 +390,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Alla filer" @@ -431,7 +430,7 @@ msgstr "Spara profil" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Spara" @@ -687,7 +686,7 @@ "\"windows\">Microsoft Windows system användbara." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Sammandrag" @@ -699,11 +698,11 @@ msgid "_Import File…" msgstr "_Importera fil…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Lägg till" @@ -851,18 +850,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Färg" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Kalibrera färgen för dina enheter såsom skärmar, kameror eller skrivare" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Färg;ICC;Profil;Kalibrera;Skrivare;Skärm;" @@ -880,23 +880,23 @@ msgid "No languages found" msgstr "Hittade inga språk" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Idag" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Igår" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b, %Y" @@ -1016,10 +1016,11 @@ msgid "December" msgstr "December" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" -msgstr "Datum & tid" +msgstr "Dat­um & tid" #: ../panels/datetime/datetime.ui.h:14 msgid "Hour" @@ -1074,12 +1075,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Ändra datum och tid, även tidszon" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Klocka;Tidszon;Plats;" @@ -1092,207 +1093,222 @@ msgstr "" "Du måste autentisera dig för att ändra inställningar för tid eller datum." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Lock stängt" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Speglad" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Primär" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Av" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Sekundär" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Arrangera kombinerade skärmar" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Verkställ" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Dra skärmar för att arrangera om dem" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Rotera motsols 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Rotera 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Rotera medsols 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Storlek" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Bildförhållande" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Upplösning" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Justera för TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Uppdateringfrekvens" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Visa systemraden och Aktivitetsöversikten på denna skärm" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Sekundär skärm" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Sammanfoga denna skärm med en annan för att skapa en extra arbetsyta" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Presentation" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Visa endast bildspel och media" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Spegling" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Visa din befintliga vy på båda skärmarna" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Stäng av" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Använd inte denna skärm" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Kunde inte hämta skärminformation" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Arrangera kombinerade skärmar" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Skärmar" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Skärm­ar" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Välj hur anslutna skärmar och projektorer ska användas" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Panel;Projektor;xrandr;Skärm;Upplösning;Uppdatering;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Okänd" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (Bygg-ID: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (Bygg-ID: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bitars" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bitars" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Fråga vad som ska göras" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Gör ingenting" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Öppna mapp" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Övriga media" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Välj ett program för ljud-cd-skivor" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Välj ett program för video-dvd-skivor" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Välj ett program att köra när en musikspelare ansluts" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Välj ett program att köra när en kamera ansluts" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Välj ett program för program-cd-skivor" @@ -1301,88 +1317,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "ljud-dvd" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "tom Blu-ray-skiva" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "tom cd-skiva" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "tom dvd-skiva" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "tom HD DVD-skiva" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray-videoskiva" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-boksläsare" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD-videoskiva" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Bildcd" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video-cd" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Videocd" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Fönsterprogramvara" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Sektion" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Översikt" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Standardprogram" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Flyttbar media" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Version %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "Detaljer" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "De­talj­er" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Visa information om ditt system" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1556,8 +1570,9 @@ msgid "Launch help browser" msgstr "Starta hjälpläsare" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Inställningar" @@ -1630,7 +1645,6 @@ msgstr "Lås skärmen" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Hjälpmedel" @@ -1666,11 +1680,21 @@ msgid "High contrast on or off" msgstr "Hög kontrast på eller av" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Anpassade genvägar" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1697,126 +1721,132 @@ msgid "Modifiers-only switch to next source" msgstr "Byt till nästa källa enbart med modifierare" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Tangentbord" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Återställ genvägen till dess standardvärde" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s används redan för %s. Om du vill ersätta det kommer %s att " +"inaktiveras" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Ställ in anpassad genväg" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Ställ in genväg" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Mata in ny genväg för att ändra %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Lägg till anpassad genväg" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Tan­gent­bord" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Visa och ändra tangentbordsgenvägar samt ange dina skrivinställningar" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Genväg;Repetera;Blinka;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Anpassad genväg" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Namn:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "K_ommando:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Lägg till genväg" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Ta bort genväg" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"För att redigera en genväg så klickar du på raden och håller ner de nya " -"tangenterna, eller trycker på backsteg för att tömma." +msgid "No keyboard shortcut found" +msgstr "Ingen tangentbordsgenväg hittades" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Anpassade genvägar" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Försök med en annan sökning" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Tryck Esc för att avbryta." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Genvägen ”%s” kan inte användas på grund av att den kommer att bli omöjlig " -"att ange med\n" -"den här tangenten. Prova med en tangent såsom Control, Alt eller Skift på " -"samma gång." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Namn" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Genvägen ”%s” används redan för\n" -" ”%s”" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Kommando" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Genväg" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Redigera" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Om du omtilldelar genvägen till ”%s” kommer genvägen ”%s” att inaktiveras." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Ingen" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Omtilldela" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Ta bort" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Mata in den nya genvägen" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Genvägen ”%s” har en associerad genväg ”%s”. Vill du automatiskt sätta den " -"till ”%s”?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Avbryt" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"”%s” är för tillfället associerad med ”%s”, denna genväg kommer att " -"inaktiveras om du fortsätter." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Lägg till" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "Tilldel_a" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Ersätt" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Ställ in" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Prova dina in_ställningar" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Mus & styrplatta" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Mus & styr­platt­a" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" "Ändra din mus- eller styrplattekänslighet och välj höger- eller vänsterhänt" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Styrplatta;Muspekare;Klick;Slå lätt;Dubbel;Knapp;Trackball;Rulla;" @@ -1874,6 +1904,10 @@ msgstr "Knacka för att klicka" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Tvåfingersrullning" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Kantrullning" @@ -1912,11 +1946,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Flyg_plansläge" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Nätverksproxy" @@ -1924,17 +1958,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s-VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Hoppsan, något gick fel. Kontakta din programvaruleverantör." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Nätverkshanteraren måste vara aktiv." @@ -1950,7 +1984,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1967,59 +2001,64 @@ msgid "page 2" msgstr "sida 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Säkerhet" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "automatisk" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Aldrig" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2027,179 +2066,179 @@ msgstr[1] "%i dagar sedan" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Svag" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Bra" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Utmärkt" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Detaljer" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Identitet" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adress" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Nätmask" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Gateway" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Ta bort adress" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Lägg till" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Server" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Radera DNS-server" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrisk" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Standardrutt" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Automatiskt (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Manuell" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Endast lokal länk" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:942 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefix" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Automatisk" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Automatisk, endast DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Återställ" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Ingen" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bitars nyckel (Hex eller ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bitars lösenfras" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dynamisk WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Personal" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Enterprise" @@ -2214,30 +2253,30 @@ msgstr "Länkhastighet" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4-adress" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6-adress" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Hårdvaruadress" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2247,7 +2286,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2330,13 +2369,13 @@ msgid "Firewall _Zone" msgstr "Brandväggs_zon" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Standard" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Zonen anger anslutningens tillitsnivå" @@ -2378,45 +2417,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Kunde inte öppna anslutningsredigeraren" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Ny profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bindning" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Grupp" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Brygga" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Kunde inte läsa in VPN-insticksmoduler" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Importera från fil…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Lägg till nätverksanslutning" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Lägg till VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2424,7 +2443,7 @@ msgstr "_Återställ" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Glöm" @@ -2450,11 +2469,11 @@ msgid "S_ecurity" msgstr "Säk_erhet" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Kan inte importera VPN-anslutning" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2467,36 +2486,36 @@ "\n" "Fel: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Välj fil att importera" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Öppna" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "En fil med namnet ”%s” finns redan." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "E_rsätt" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Vill du ersätta %s med VPN-anslutningen du sparar?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Kan inte exportera VPN-anslutning" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2507,7 +2526,7 @@ "\n" "Fel: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Exportera VPN-anslutning" @@ -2534,60 +2553,46 @@ msgid "Make available to _other users" msgstr "Gör tillgänglig för _andra användare" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "Nätverk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "Nät­verk" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Kontrollera hur du ansluter till Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Nätverk;Trådlöst;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Bredband;Modem;Bluetooth;" -"Blåtand;vpn;vlan;brygga;bond;DNS;" +"Blåtand;vpn;DNS;" -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bindningsslavar" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ingen)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bryggslavar" - -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "aldrig" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "idag" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "igår" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP-adress" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Senast använd" @@ -2597,34 +2602,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Trådbundet" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Alternativ…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Lägg till ny anslutning" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Gruppslavar" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2632,14 +2628,14 @@ "Om du har en annan anslutning till Internet än trådlös, så kan du sätta upp " "en trådlös surfzon för att dela anslutningen med andra." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "" "Aktivering av den trådlösa surfzonen kommer att koppla bort dig från %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2647,23 +2643,23 @@ "Det är inte möjligt att ansluta trådlöst till internet så länge surfzonen är " "aktiv." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Stoppa surfzonen och koppla ifrån eventuella användare?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Stoppa surfzon" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Systempolicyn tillåter ej användning som surfzon" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Den trådlösa enheten stöder inte användning av surfzoner" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2671,11 +2667,11 @@ "Nätverksdetaljer för markerade nätverk, inklusive lösenord och anpassad " "konfiguration kommer att gå förlorade." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Historik" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2683,7 +2679,7 @@ msgstr "_Stäng" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Glöm" @@ -2720,6 +2716,10 @@ msgid "Provider" msgstr "Leverantör" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Nätverk" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2825,16 +2825,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Lösenord" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Ingen" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Visa _lösenord" @@ -2928,7 +2924,6 @@ msgstr "_Anslut till dolt nätverk…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Historik" @@ -2950,360 +2945,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Lösenord" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastruktur" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Okänd status" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Ohanterad" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Otillgänglig" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Ansluter" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Autentisering krävs" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Ansluten" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Kopplar från" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Anslutningen misslyckades" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Okänd status (saknas)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Inte ansluten" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Konfiguration misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP-konfiguration misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP-konfiguration passerade slutdatum" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Hemligheter krävdes, men tillhandahölls inte" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x-supplikanten kopplades från" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Konfiguration av 802.1x-supplikanten misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x-supplikanten misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x-supplikanten tog för lång tid på sig att autentisera" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Misslyckades med att starta PPP-tjänsten" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP-tjänsten kopplades från" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Misslyckades med att starta DHCP-klienten" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP-klient fel" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP-klienten misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Misslyckades med att starta tjänsten för delad anslutning" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Tjänsten för delad anslutning misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Kunde inte starta AutoIP-tjänsten" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Fel i AutoIP-tjänsten" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP-tjänsten misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Linjen är upptagen" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Ingen rington" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Bärvågen kunde inte etableras" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Tidsgränsen för uppringningen överskreds" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Uppringningen misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Initiering av modem misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Misslyckades med att välja angiven APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Söker inte efter nätverk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Nätverksregistrering nekades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Tidsgränsen för nätverksregistrering överstegs" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Misslyckades att registrera med begärt nätverk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Kontroll av PIN-kod misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Enheten kan sakna fast programvara" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Anslutningen försvann" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Befintlig anslutning antogs" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modemet kunde inte hittas" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth-anslutningen misslyckades" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM-kortet är inte isatt" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM-kortet kräver PIN-kod" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM-kortet kräver PUK-kod" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Fel på SIM-kortet" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand-enheten saknar stöd för anslutet läge" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Anslutningsberoende misslyckades" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Fast programvara saknas" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kabeln är frånkopplad" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Inget certifikat för certifikatsutfärdare valt" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "odefinierat fel i 802.1x-säkerhet (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "ingen fil vald" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Att inte använda ett certifikat för certifikatsutfärdare (CA) kan resultera " -"i osäkra anslutningar till falska trådlösa nätverk. Vill du välja ett " -"certifikat för certifikatsutfärdare?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Ignorera" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Välj CA-certifikat" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, eller PKCS#12 privata nycklar (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "ospecificerat fel vid validering av eap-metodfil" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, eller PKCS#12 privata nycklar (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER eller PEM-certifikat (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "saknar PAC-fil för EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Välj en PAC-fil" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC-filer (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC-_fil" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "_Inre autentisering" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC pro_visioning" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3312,41 +3283,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonym" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Autentiserad" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Båda" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC-_fil" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "_Inre autentisering" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Tillåt automatisk PAC-pro_visionering" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "saknar EAP-LEAP-användarnamn" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "saknar EAP-LEAP-lösenord" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "An_vändarnamn" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Visa lösen_ord" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "ogiltigt CA-certifikat för EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "ogiltigt CA-certifikat för EAP-PEAP: inget certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Välj ett certifikat för certifikatsutfärdare" @@ -3364,19 +3367,56 @@ msgid "C_A certificate" msgstr "C_A-certifikat" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "Inget CA-certifikat k_rävs" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _version" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Efte_rfråga detta lösenord var gång" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "saknar EAP-användarnamn" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "saknar EAP-lösenord" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "saknar EAP-TLS-identitet" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "ogiltigt CA-certifikat för EAP-TLS: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "ogiltigt CA-certifikat för EAP-TLS: inget certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "ogiltigt EAP-TLS-lösenord: saknas" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "ogiltig privat nyckel för EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "ogiltigt EAP-TLS-användarcertifikat: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Okrypterade privata nycklar är osäkra" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3390,11 +3430,11 @@ "\n" "(Du kan lösenordsskydda din privata nyckel med openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Välj ditt personliga certifikat" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Välj din privata nyckel" @@ -3406,51 +3446,56 @@ msgid "_User certificate" msgstr "_Användarcertifikat" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Privat nyc_kel" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Lösenord för _privat nyckel" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "ogiltigt CA-certifikat för EAP-TTLS: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "ogiltigt CA-certifikat för EAP-TTLS: inget certifikat angivet" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Varna mig inte igen" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Nej" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Ja" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Okänt fel vid validering av 802.1x-säkerhet" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tunnlad TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Skyddad EAP (PEAP)" @@ -3460,6 +3505,50 @@ msgid "Au_thentication" msgstr "Au_tentisering" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "saknar leap-användarnamn" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "saknar leap-lösenord" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "saknar wep-nyckel" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"ogiltig wep-nyckel: nyckel med en längd på %zu får endast innehålla " +"hexadecimala siffror" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"ogiltig wep-nyckel: nyckel med en längd på %zu får endast innehålla ascii-" +"tecken" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"ogiltig wep-nyckel: felaktig nyckellängd %zu. En nyckel måste ha antingen " +"längden 5/13 (ascii) eller 10/26 (hex)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "ogiltig wep-nyckel: lösenfras får inte vara tom" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "ogiltig wep-nyckel: lösenfras måste vara kortare än 64 tecken" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Standard)" @@ -3496,19 +3585,32 @@ msgid "WEP inde_x" msgstr "WEP-inde_x" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"ogiltig wpa-psk: ogiltig nyckellängd %zu. Måste vara [8,63] byte eller 64 " +"hexadecimala siffror" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "ogiltig wpa-psk: kan inte tolka nyckel med 64 byte som hexadecimal" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Typ" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "På" @@ -3545,16 +3647,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Visa meddelandei_nnehåll på låsskärm" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "Aviseringar" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "A­vi­ser­ing­ar" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Kontrollera vilka aviseringar som visas samt vad de visar" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Aviseringar;Banderoll;Meddelande;Bricka;Popup;" @@ -3572,79 +3675,68 @@ msgid "Applications" msgstr "Program" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Övriga" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Lägg till konto" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "E-post" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Kalender" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kontakter" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Chatt" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Resurser" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Fel vid inloggning med kontot" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Autentiseringsuppgifterna har gått ut." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Logga in för att aktivera detta konto." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Logga in" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Fel vid skapande av kontot" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Fel vid borttagning av kontot" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Är du säker på att du vill ta bort kontot?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Detta kommer inte att ta bort kontot på servern." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Ta bort" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "Nätkonton" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "Nät­kont­on" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Anslut till dina nätkonton och bestäm hur de ska användas" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3657,6 +3749,7 @@ msgstr "Inga nätkonton konfigurerade" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Ta bort konto" @@ -3799,7 +3892,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Batteri" @@ -3847,101 +3940,102 @@ msgid "When _idle" msgstr "När led_ig" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Strömspar" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Skärmljusstyrka" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Automatisk ljusstyrka" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Tangentbordljusstyrka" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Dämpa skärmen när inaktiv" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Töm skärm" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "Trådlöst _nätverk" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Stäng av trådlöst nätverk för att spara ström." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobilt bredband" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Stäng av mobilt bredband (3G, 4G, LTE med mera) för att spara ström." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "När på batteriström" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "När ansluten" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Försätt i vänteläge" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Försätt i viloläge" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Ingenting" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Vänteläges- & avstängningsknapp" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Automatiskt vänteläge" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Automatiskt vänteläge" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_När avstängningsknappen trycks ned" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Enheter" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Ström" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Visa din batteristatus och ändra energisparinställningar" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4020,11 +4114,6 @@ msgid "Delay" msgstr "Fördröjning" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Avbryt" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Autentisera" @@ -4034,138 +4123,138 @@ msgstr "Autentisering krävs" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Låg tonernivå" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Slut på toner" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Nästan slut på framkallningsvätska" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Slut på framkallningsvätska" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Nästan slut på färg" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Slut på färg" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Luckan är öppen" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Luckan är öppen" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Låg pappersnivå" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Slut på papper" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Frånkopplad" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Stoppad" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Skräpkorgen är nästan full" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Skräpkorgen är full" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Den optiska fototrumman är nära slutet på sin livstid" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Den optiska fototrumman är inte längre funktionsduglig" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Konfigurerar" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Redo" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Accepterar inte jobb" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Behandlar" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Tonernivå" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Bläcknivå" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Förbrukningsmaterial" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Installerar" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4173,15 +4262,15 @@ msgstr[1] "%u aktiva" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Misslyckades med att lägga till ny skrivare." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Välj PPD-fil" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4189,48 +4278,45 @@ "PostScript-skrivarbeskrivningsfiler (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD." "GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Ingen lämplig drivrutin kunde hittas" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Söker efter lämpliga drivrutiner…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Välj från databas…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Tillhandahåll PPD-fil…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Testsida" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Inga skrivare" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Kunde inte läsa in användargränssnittet: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "Skrivare" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "Skriv­ar­e" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "Lägg till skrivare, visa skrivarjobb och besluta hur du vill skriva ut" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Skrivare;Kö;Skriv ut;Papper;Bläck;Toner;" @@ -4392,6 +4478,11 @@ msgid "Parallel Port" msgstr "Parallellport" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4603,13 +4694,17 @@ msgid "_Options" msgstr "A_lternativ" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Inga skrivare" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Lägg till en skrivare" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4617,70 +4712,70 @@ "Tyvärr! Systemets utskriftstjänst\n" "verkar inte finnas tillgänglig." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Skärmlås" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "I bruk" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "På" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Av" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Platstjänster" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Användning & historik" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Töm alla objekt i papperskorgen?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Alla objekt i papperskorgen kommer att tas bort permanent." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "_Töm papperskorgen" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Radera alla tillfälliga filer?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Alla tillfälliga filer kommer att raderas permanent." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Ta bort tillfälliga filer" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Rensa papperskorgen & tillfälliga filer" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Programvaruanvändning" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Problemrapportering" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4689,20 +4784,21 @@ "Att skicka in rapporter om tekniska problem hjälper oss att förbättra %s. " "Rapporter skickas anonymt och rensas på personliga data." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Sekretesspolicy" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "Sekretess" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "Sekr­et­ess" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Skydda din personliga information och kontrollera vad andra kan se" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4873,21 +4969,21 @@ msgid "Other" msgstr "Övriga" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Din session behöver startas om för att ändringar ska genomföras" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Starta om nu" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Ingen inmatningskälla vald" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Inloggnings_skärm" @@ -4919,11 +5015,12 @@ msgid "Paper" msgstr "Papper" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Region & språk" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Re­gion & språk" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4931,7 +5028,7 @@ # Antar att detta har att göra med jobbet... #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Språk;Layout;Tangentbord;Inmatning;" @@ -4989,7 +5086,7 @@ # Antar att detta har att göra med jobbet... #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Språk" @@ -5038,26 +5135,11 @@ msgstr "" "Inloggningsinställningar används av alla användare när inloggad i systemet" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Platser" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Bokmärken" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Övrigt" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Välj plats" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_OK" @@ -5065,17 +5147,18 @@ msgid "No applications found" msgstr "Inga program hittades" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Sök" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "Kontrollera vilka program som visar sökresultat i Aktivitetsöversikten" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Sök;Hitta;Index;Göm;Sekretess;Resultat;" @@ -5083,6 +5166,18 @@ msgid "Search Locations" msgstr "Sök platser" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Platser" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Bokmärken" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Övriga" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Flytta upp" @@ -5095,6 +5190,11 @@ msgid "Preferences" msgstr "Inställningar" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Inga nätverk markerade för delning" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5120,21 +5220,54 @@ msgid "Choose a Folder" msgstr "Välj en mapp" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Personlig fildelning låter dig dela din publika mapp med andra på det " +"nätverk du använder för tillfället: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Då fjärrinloggning är aktiverad kan fjärranvändare ansluta med det säkra " +"skalkommandot:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Skärmdelning tillåter fjärranvändare att se eller kontrollera din skärm " +"genom att ansluta till vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopiera" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Dela" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Del­a" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Kontrollera vad du vill dela med andra" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5142,6 +5275,10 @@ "dela;delning;share;ssh;värd;namn;fjärr;skrivbord;media;audio;ljud;video;" "bilder;foton;filmer;server;renderare;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Nätverk" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Aktivera eller inaktivera fjärrinloggning" @@ -5150,25 +5287,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "Autentisering krävs för att aktivera eller inaktivera fjärrinloggning" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Inga nätverk markerade för delning" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Nätverk" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "_Datornamn" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Personlig fildelning" +msgid "_File Sharing" +msgstr "_Fildelning" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5187,84 +5312,54 @@ msgstr "Vissa tjänster är inaktiverade på grund av ingen nätverksåtkomst." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Personlig fildelning" +msgid "File Sharing" +msgstr "Fildelning" -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Personlig fildelning låter dig dela din publika mapp med andra på det " -"nätverk du använder för tillfället: dav://%s" - -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "_Begär lösenord" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Fjärrinloggning" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Tillåt fjärranvändare att ansluta med det säkra skalkommandot:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Skärmdelning" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Tillåt fjärranvändare att se eller kontrollera din skärm genom att ansluta " -"till: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Tillåt fjärrkontroll" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Tillåt anslutningar att styra skärmen" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Lösenord:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Visa lösenord" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Åtkomstalternativ" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Nya anslutningar måste fråga efter åtkomst" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "_Begär ett lösenord" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Mediadelning" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Mediadelning ger dig möjligheten att dela musik, foton och filmer över " -"nätverket." +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Dela musik, foton och filmer över nätverket." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Mappar" @@ -5392,11 +5487,6 @@ msgid "Peak detect" msgstr "Upptäck toppar" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Namn" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Enhet" @@ -5491,16 +5581,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Anpassat" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Hjälp­med­el" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Gör det enklare att se, höra, skriva, peka och klicka" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5599,8 +5694,8 @@ msgstr "Ljudtangenter" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Pip när Caps- och Num Lock används." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Pip när Num Lock eller Caps Lock slås på eller av." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5982,95 +6077,68 @@ msgstr "Färgeffekter" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Lägg till användare" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Fullständigt namn" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standard" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Administratör" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Fullständigt namn" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Konto_typ" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Låt användare välja lösenord vid nästa _inloggning" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Ange ett lösenord _nu" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Verifiera" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_Bekräfta" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Företagsinloggning tillåter att ett befintligt centralt hanterat " -"användarkonto kan användas på denna enhet." +"användarkonto kan användas på denna enhet. Du kan också använda detta konto " +"för att komma åt företagsresurser på internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Domän" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Anslut till nätet för att lägga till\n" -"företagsinloggningskonton." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Företagsinloggning" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Lägg till användare" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Registrera" +msgid "You are Offline" +msgstr "Du är frånkopplad" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Inloggning för domänadministratör" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." msgstr "" -"För att använda företagsinloggning, måste datorn vara\n" -"ansluten till domänen. Låt nätverksadministratören fylla i\n" -"sitt lösenord här." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Administratörs_namn" +"Du måste vara ansluten till nätet för att lägga till företagsanvändare." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Administratörslösenord" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Företagsinloggning" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6105,7 +6173,7 @@ msgstr "Höger lillfinger" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Aktivera fingeravtrycksinloggning" @@ -6142,9 +6210,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Inloggning;Namn;Fingeravtryck;Avatar;Logotyp;Ansikte;Lösenord;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Inloggningshistorik" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Registrera" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Inloggning för domänadministratör" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"För att använda företagsinloggning, måste datorn vara\n" +"ansluten till domänen. Låt nätverksadministratören fylla i\n" +"sitt lösenord här." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Administratörs_namn" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Administratörslösenord" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6167,38 +6258,30 @@ msgstr "Aktuellt _lösenord" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Låt användare välja lösenord vid nästa inloggning" +msgid "Allow user to change their password on next login" +msgstr "Tillåt användare att ändra lösenord vid nästa inloggning" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Ange ett lösenord nu" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Lägg till användarkonto" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Ta bort användarkonto" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Lägg till användare…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Inloggningsalternativ" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "A_utomatisk inloggning" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Fingeravtrycksinloggning" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Användarikon" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Senast inloggad" @@ -6301,8 +6384,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Blanda versaler och gemener och använd en eller flera siffror." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Blanda versaler och gemener och försök använda en eller flera siffror." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6393,32 +6476,32 @@ msgstr "Okänt fel" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Ska matcha din kontoleverantörs webbadress." +msgid "Should match the web address of your login provider." +msgstr "Ska matcha din inloggningsleverantörs webbadress." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Misslyckades med att lägga till konto" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Lösenorden stämmer inte överens." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Misslyckades med att registrera konto" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Inget stöd för att autentisera med denna domän" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Misslyckades med att ansluta till domänen" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6426,7 +6509,7 @@ "Inloggningsnamnet fungerade inte.\n" "Prova igen." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6434,14 +6517,24 @@ "Inloggningsnamnet fungerade inte.\n" "Prova igen." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Misslyckades med att logga in på domänen" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Kunde inte hitta domänen. Kanske felstavade du den?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standard" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Administratör" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6459,15 +6552,15 @@ msgid "Enabled" msgstr "Aktiverad" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Ta bort registrerade fingeravtryck?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Ta bort fingeravtryck" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6475,15 +6568,15 @@ "Vill du ta bort dina registrerade fingeravtryck så att " "fingeravtrycksinloggning inaktiveras?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Färdig!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Kunde inte komma åt enheten ”%s”" @@ -6491,16 +6584,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Kunde inte starta fingeravläsning på enheten ”%s”" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Kunde inte komma åt några fingeravtrycksläsare" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Kontakta din systemadministratör för hjälp." @@ -6509,7 +6602,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6518,11 +6611,11 @@ "Du behöver spara ett av dina fingeravtryck med hjälp av enheten ”%s” för att " "aktivera fingeravtrycksinloggning." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Välj finger" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Läs av fingeravtryck" @@ -6576,14 +6669,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Session avslutad" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Session påbörjad" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Kontoaktivitet" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Välj ett annat lösenord." @@ -6645,7 +6745,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Det gick inte att ansluta till %s-domänen: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Övriga konton" @@ -6725,15 +6825,15 @@ msgid "Logged in" msgstr "Inloggad" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Misslyckades med att kontakta kontotjänsten" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Försäkra dig om att kontotjänsten är installerad och aktiverad." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6741,12 +6841,12 @@ "Klicka först på *-ikonen\n" "för att göra ändringar" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Skapa ett användarkonto" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6754,12 +6854,12 @@ "Klicka först på *-ikonen för\n" "att skapa ett användarkonto" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Ta bort markerat användarkonto" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6767,33 +6867,32 @@ "Klicka först på *-ikonen för att\n" "ta bort markerat användarkonto" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Mitt konto" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "En användare med användarnamnet ”%s” finns redan." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Det användarnamnet är tyvärr inte tillgängligt. Försök med ett annat." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Användarnamnet är för långt." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Användarnamnet får inte börja med ett ”-”." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" "Användarnamnet får endast innehålla stora och små bokstäver från a-z, " -"siffror och något av tecknen ”.”, ”-” samt ”_”." +"siffror och föjande tecken: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Det här kommer att användas för att namnge din hemmapp och kan inte ändras." @@ -6883,18 +6982,18 @@ msgid "Button" msgstr "Knapp" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom-ritplatta" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa­com-rit­platt­a" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Ställ in knappkopplingar och justera styluspennkänsligheten för ritplattor" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Ritplatta;Wacom;Styluspenna;Raderare;Mus;" @@ -6926,6 +7025,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth-inställningar" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom-ritplatta" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Koppla till skärm…" @@ -7019,22 +7122,22 @@ msgid "Mode Switch #%d" msgstr "Lägesväxlare #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Vänsterknapp #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Högerknapp #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Överknapp #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Nederknapp #%d" @@ -7111,6 +7214,11 @@ msgid "Tip Pressure Feel" msgstr "Tryckkänsla för spets" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Alla inställningar" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME Kontrollpanel" @@ -7167,22 +7275,18 @@ msgid "Quit" msgstr "Avsluta" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Alla inställningar" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Personligt" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Hårdvara" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "System" @@ -7221,6 +7325,189 @@ msgid "Cancel search" msgstr "Avbryt sökning" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Surfzon" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Tangentbordsgenväg för %s. Mata in ny genväg för att ändra." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "För att redigera en genväg så klickar du på raden och håller ner de nya " +#~ "tangenterna, eller trycker på backsteg för att tömma." + +#~ msgid "Color" +#~ msgstr "Färg" + +#~ msgid "_Name:" +#~ msgstr "_Namn:" + +#~ msgid "Add Shortcut" +#~ msgstr "Lägg till genväg" + +#~ msgid "Remove Shortcut" +#~ msgstr "Ta bort genväg" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Genvägen ”%s” kan inte användas på grund av att den kommer att bli " +#~ "omöjlig att ange med\n" +#~ "den här tangenten. Prova med en tangent såsom Control, Alt eller Skift på " +#~ "samma gång." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Genvägen ”%s” används redan för\n" +#~ " ”%s”" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Om du omtilldelar genvägen till ”%s” kommer genvägen ”%s” att inaktiveras." + +#~ msgid "_Reassign" +#~ msgstr "_Omtilldela" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Genvägen ”%s” har en associerad genväg ”%s”. Vill du automatiskt sätta " +#~ "den till ”%s”?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "”%s” är för tillfället associerad med ”%s”, denna genväg kommer att " +#~ "inaktiveras om du fortsätter." + +#~ msgid "_Assign" +#~ msgstr "Tilldel_a" + +#~ msgid "Bond" +#~ msgstr "Bindning" + +#~ msgid "Team" +#~ msgstr "Grupp" + +#~ msgid "Bridge" +#~ msgstr "Brygga" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Kunde inte läsa in VPN-insticksmoduler" + +#~ msgid "Add Network Connection" +#~ msgstr "Lägg till nätverksanslutning" + +#~ msgid "Bond slaves" +#~ msgstr "Bindningsslavar" + +#~ msgid "(none)" +#~ msgstr "(ingen)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bryggslavar" + +#~ msgid "Team slaves" +#~ msgstr "Gruppslavar" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand-enheten saknar stöd för anslutet läge" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Inget certifikat för certifikatsutfärdare valt" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Att inte använda ett certifikat för certifikatsutfärdare (CA) kan " +#~ "resultera i osäkra anslutningar till falska trådlösa nätverk. Vill du " +#~ "välja ett certifikat för certifikatsutfärdare?" + +#~ msgid "Ignore" +#~ msgstr "Ignorera" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Välj CA-certifikat" + +#~ msgid "As_k for this password every time" +#~ msgstr "Efte_rfråga detta lösenord var gång" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Varna mig inte igen" + +#~ msgid "No" +#~ msgstr "Nej" + +#~ msgid "Yes" +#~ msgstr "Ja" + +#~ msgid "Error logging into the account" +#~ msgstr "Fel vid inloggning med kontot" + +#~ msgid "Credentials have expired." +#~ msgstr "Autentiseringsuppgifterna har gått ut." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Logga in för att aktivera detta konto." + +#~ msgid "_Sign In" +#~ msgstr "_Logga in" + +#~ msgid "Power" +#~ msgstr "Ström" + +#~ msgid "Privacy" +#~ msgstr "Sekretess" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Övrigt" + +#~ msgid "Personal File Sharing" +#~ msgstr "Personlig fildelning" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Tillåt fjärrkontroll" + +#~ msgid "_Verify" +#~ msgstr "_Verifiera" + +#~ msgid "Login History" +#~ msgstr "Inloggningshistorik" + +#~ msgid "Add User Account" +#~ msgstr "Lägg till användarkonto" + +#~ msgid "Remove User Account" +#~ msgstr "Ta bort användarkonto" + +#~ msgid "Login Options" +#~ msgstr "Inloggningsalternativ" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "En användare med användarnamnet ”%s” finns redan." + #~ msgid "Used to determine your geographical location" #~ msgstr "Används för att fastställa din geografiska position" @@ -7230,9 +7517,6 @@ #~ msgid "Time _Zone" #~ msgstr "Tids_zon" -#~ msgid "Two Finger Scrolling" -#~ msgstr "Tvåfingersrullning" - #~ msgid "Active Jobs" #~ msgstr "Aktiva jobb" @@ -7302,9 +7586,6 @@ #~ msgid "S_peed:" #~ msgstr "Hasti_ghet:" -#~ msgid "Shortcuts" -#~ msgstr "Genvägar" - #~ msgid "Test Your Settings" #~ msgstr "Prova dina inställningar" diff -Nru gnome-control-center-3.20.2/po/th.po gnome-control-center-3.22.1/po/th.po --- gnome-control-center-3.20.2/po/th.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/th.po 2016-09-27 12:37:36.000000000 +0000 @@ -6,7 +6,7 @@ # Supranee Thirawatthanasuk , 2004. # Surichat Sumrit , 2004. # Chanchai Junlouchai , 2004. -# Theppitak Karoonboonyanan , 2004-2012. +# Theppitak Karoonboonyanan , 2004-2012. # Akom Chotiphantawanon , 2010-2011, 2013, 2015-2016. # msgid "" @@ -14,8 +14,8 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-12-30 08:42+0000\n" -"PO-Revision-Date: 2016-01-04 12:28+0700\n" +"POT-Creation-Date: 2016-09-10 00:29+0000\n" +"PO-Revision-Date: 2016-09-10 15:37+0700\n" "Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" "Language: th\n" @@ -26,9 +26,8 @@ "X-Generator: Gtranslator 2.91.6\n" #: ../panels/background/background.ui.h:1 -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" -msgstr "พื้นหลัง" +msgid "_Background" +msgstr "_พื้นหลัง" #. This refers to a slideshow background #: ../panels/background/background.ui.h:3 @@ -37,8 +36,8 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -msgid "Lock Screen" -msgstr "ล็อคหน้าจอ" +msgid "_Lock Screen" +msgstr "หน้าจอ_ล็อค" #: ../panels/background/background.ui.h:6 msgctxt "background, style" @@ -96,7 +95,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "บ้าน" @@ -109,37 +108,36 @@ #: ../panels/background/cc-background-chooser-dialog.c:580 #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 -#: ../panels/color/color.ui.h:29 ../panels/common/language-chooser.ui.h:3 +#: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 +#: ../panels/common/language-chooser.ui.h:3 #: ../panels/display/cc-display-panel.c:1561 -#: ../panels/display/cc-display-panel.c:2023 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:1931 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:568 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 -#: ../panels/user-accounts/um-user-panel.c:708 -#: ../panels/user-accounts/um-user-panel.c:726 +#: ../panels/user-accounts/um-user-panel.c:705 +#: ../panels/user-accounts/um-user-panel.c:723 msgid "_Cancel" msgstr "_ยกเลิก" #: ../panels/background/cc-background-chooser-dialog.c:581 -#: ../panels/printers/ppd-selection-dialog.ui.h:3 -#: ../panels/user-accounts/um-photo-dialog.c:96 -msgid "Select" -msgstr "เลือก" +msgid "_Select" +msgstr "เ_ลือก" #: ../panels/background/cc-background-item.c:203 msgid "multiple sizes" @@ -160,63 +158,67 @@ msgid "Current background" msgstr "พื้นหลังปัจจุบัน" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" +msgstr "พื้น­หลัง" + +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "เปลี่ยนภาพพื้นหลังของคุณเป็นลวดลายหรือภาพถ่าย" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "ภาพพื้นหลัง;หน้าจอ;พื้นโต๊ะ;" -#: ../panels/bluetooth/cc-bluetooth-panel.c:259 +#: ../panels/bluetooth/cc-bluetooth-panel.c:264 msgid "Turn Off Airplane Mode" msgstr "ปิดโหมดเครื่องบิน" -#: ../panels/bluetooth/cc-bluetooth-panel.c:325 +#: ../panels/bluetooth/cc-bluetooth-panel.c:330 msgid "No Bluetooth Found" msgstr "ไม่พบบลูทูท" -#: ../panels/bluetooth/cc-bluetooth-panel.c:325 +#: ../panels/bluetooth/cc-bluetooth-panel.c:330 msgid "Plug in a dongle to use Bluetooth." msgstr "เสียบ dongle เพื่อใช้บลูทูท" -#: ../panels/bluetooth/cc-bluetooth-panel.c:326 +#: ../panels/bluetooth/cc-bluetooth-panel.c:331 msgid "Bluetooth Turned Off" msgstr "บลูทูทถูกปิดอยู่" -#: ../panels/bluetooth/cc-bluetooth-panel.c:326 +#: ../panels/bluetooth/cc-bluetooth-panel.c:331 msgid "Turn on to connect devices and receive file transfers." msgstr "เปิดเพื่อเชื่อมต่ออุปกรณ์และรับการถ่ายโอนแฟ้ม" -#: ../panels/bluetooth/cc-bluetooth-panel.c:327 +#: ../panels/bluetooth/cc-bluetooth-panel.c:332 msgid "Airplane Mode is on" msgstr "โหมดเครื่องบินเปิดอยู่" -#: ../panels/bluetooth/cc-bluetooth-panel.c:327 +#: ../panels/bluetooth/cc-bluetooth-panel.c:332 msgid "Bluetooth is disabled when airplane mode is on." msgstr "บลูทูทจะถูกปิดใช้งานเมื่อเปิดใช้โหมดเครื่องบิน" -#: ../panels/bluetooth/cc-bluetooth-panel.c:328 +#: ../panels/bluetooth/cc-bluetooth-panel.c:333 msgid "Hardware Airplane Mode is on" msgstr "โหมดเครื่องบินแบบฮาร์ดแวร์เปิดอยู่" -#: ../panels/bluetooth/cc-bluetooth-panel.c:328 +#: ../panels/bluetooth/cc-bluetooth-panel.c:333 msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "ปิดสวิตช์โหมดเครื่องบินหากต้องการเปิดใช้งานบลูทูท" -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "บลูทูท" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "บลู­ทูท" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "เปิด-ปิดบูลทูท และเชื่อมต่ออุปกรณ์ของคุณ" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "แบ่งปัน;ใช้ร่วม;บลูทูท;obex;" @@ -385,7 +387,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "ทุกแฟ้ม" @@ -424,7 +426,7 @@ msgstr "บันทึกโพรไฟล์" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_บันทึก" @@ -530,27 +532,22 @@ msgid "Display Calibration" msgstr "การเทียบมาตรฐานจอแสดงผล" -#: ../panels/color/color-calibrate.ui.h:2 -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -msgid "Cancel" -msgstr "ยกเลิก" - #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -msgid "Start" -msgstr "เริ่ม" +msgid "_Start" +msgstr "เ_ริ่ม" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -msgid "Resume" -msgstr "ทำงานต่อ" +msgid "_Resume" +msgstr "_ทำงานต่อ" #. This button returns the user back to the color control panel #: ../panels/color/color-calibrate.ui.h:8 -msgid "Done" -msgstr "เสร็จสิ้น" +#: ../panels/common/language-chooser.ui.h:2 +#: ../panels/region/format-chooser.ui.h:2 +msgid "_Done" +msgstr "เ_สร็จสิ้น" #. Timeout parameters #. 15000 = 15 sec @@ -679,175 +676,180 @@ "เหล่านี้อาจเป็นประโยชน์สำหรับคุณ" #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "สรุป" #: ../panels/color/color.ui.h:28 -msgid "Import File…" -msgstr "นำเข้าแฟ้ม…" +msgid "Add profile" +msgstr "เพิ่มโพรไฟล์" -#: ../panels/color/color.ui.h:30 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:512 +#: ../panels/color/color.ui.h:29 +msgid "_Import File…" +msgstr "_นำเข้าแฟ้ม…" + +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "เ_พิ่ม" -#: ../panels/color/color.ui.h:31 +#: ../panels/color/color.ui.h:32 msgid "" "Problems detected. The profile may not work correctly. Show " "details." msgstr "พบปัญหา โพรไฟล์นี้อาจทำงานไม่ถูกต้อง แสดงรายละเอียด" -#: ../panels/color/color.ui.h:32 +#: ../panels/color/color.ui.h:33 msgid "Each device needs an up to date color profile to be color managed." msgstr "อุปกรณ์แต่ละชิ้นต้องมีโพรไฟล์สีที่เป็นค่าล่าสุดเพื่อที่จะจัดการสี" -#: ../panels/color/color.ui.h:33 +#: ../panels/color/color.ui.h:34 msgid "Learn more" msgstr "ศึกษาเพิ่มเติม" -#: ../panels/color/color.ui.h:34 +#: ../panels/color/color.ui.h:35 msgid "Learn more about color management" msgstr "ศึกษาเพิ่มเติมเกี่ยวกับการจัดการสี" -#: ../panels/color/color.ui.h:35 -msgid "Set for all users" -msgstr "กำหนดสำหรับผู้ใช้ทุกคน" - #: ../panels/color/color.ui.h:36 -msgid "Set this profile for all users on this computer" -msgstr "กำหนดโพรไฟล์นี้ให้ผู้ใช้ทุกคนในเครื่องนี้ใช้" +msgid "_Set for all users" +msgstr "_กำหนดสำหรับผู้ใช้ทุกคน" #: ../panels/color/color.ui.h:37 -msgid "Enable" -msgstr "เปิดใช้" +msgid "Set this profile for all users on this computer" +msgstr "กำหนดโพรไฟล์นี้ให้ผู้ใช้ทุกคนในเครื่องนี้ใช้" #: ../panels/color/color.ui.h:38 -msgid "Add profile" -msgstr "เพิ่มโพรไฟล์" +msgid "_Enable" +msgstr "_เปิดใช้" -#: ../panels/color/color.ui.h:39 ../panels/wacom/gnome-wacom-properties.ui.h:12 -msgid "Calibrate…" -msgstr "เทียบมาตรฐาน…" +#: ../panels/color/color.ui.h:39 +msgid "_Add profile" +msgstr "เ_พิ่มโพรไฟล์" #: ../panels/color/color.ui.h:40 -msgid "Calibrate the device" -msgstr "เทียบมาตรฐานค่าอุปกรณ์" +msgid "_Calibrate…" +msgstr "เ_ทียบมาตรฐาน…" #: ../panels/color/color.ui.h:41 -msgid "Remove profile" -msgstr "ลบโพรไฟล์ออก" +msgid "Calibrate the device" +msgstr "เทียบมาตรฐานค่าอุปกรณ์" #: ../panels/color/color.ui.h:42 -msgid "View details" -msgstr "ดูรายละเอียด" +msgid "_Remove profile" +msgstr "_ลบโพรไฟล์ออก" #: ../panels/color/color.ui.h:43 +msgid "_View details" +msgstr "ดู_รายละเอียด" + +#: ../panels/color/color.ui.h:44 msgid "Unable to detect any devices that can be color managed" msgstr "ตรวจไม่พบอุปกรณ์ใดที่สามารถจัดการสีได้" -#: ../panels/color/color.ui.h:44 +#: ../panels/color/color.ui.h:45 msgid "LCD" msgstr "LCD" -#: ../panels/color/color.ui.h:45 +#: ../panels/color/color.ui.h:46 msgid "LED" msgstr "LED" -#: ../panels/color/color.ui.h:46 +#: ../panels/color/color.ui.h:47 msgid "CRT" msgstr "CRT" -#: ../panels/color/color.ui.h:47 +#: ../panels/color/color.ui.h:48 msgid "Projector" msgstr "เครื่องฉาย" -#: ../panels/color/color.ui.h:48 +#: ../panels/color/color.ui.h:49 msgid "Plasma" msgstr "พลาสมา" -#: ../panels/color/color.ui.h:49 +#: ../panels/color/color.ui.h:50 msgid "LCD (CCFL backlight)" msgstr "LCD (แสงหลังแบบ CCFL)" -#: ../panels/color/color.ui.h:50 +#: ../panels/color/color.ui.h:51 msgid "LCD (RGB LED backlight)" msgstr "LCD (แสงหลังแบบ LED ชนิด RGB)" -#: ../panels/color/color.ui.h:51 +#: ../panels/color/color.ui.h:52 msgid "LCD (white LED backlight)" msgstr "LCD (แสงหลังแบบ LED ขาว)" -#: ../panels/color/color.ui.h:52 +#: ../panels/color/color.ui.h:53 msgid "Wide gamut LCD (CCFL backlight)" msgstr "LCD ย่านสีกว้าง (แสงหลังแบบ CCFL)" -#: ../panels/color/color.ui.h:53 +#: ../panels/color/color.ui.h:54 msgid "Wide gamut LCD (RGB LED backlight)" msgstr "LCD ย่านสีกว้าง (แสงหลังแบบ LED ชนิด RGB)" -#: ../panels/color/color.ui.h:54 +#: ../panels/color/color.ui.h:55 msgctxt "Calibration quality" msgid "High" msgstr "สูง" -#: ../panels/color/color.ui.h:55 +#: ../panels/color/color.ui.h:56 msgid "40 minutes" msgstr "40 นาที" -#: ../panels/color/color.ui.h:56 +#: ../panels/color/color.ui.h:57 msgctxt "Calibration quality" msgid "Medium" msgstr "ปานกลาง" -#: ../panels/color/color.ui.h:57 ../panels/power/power.ui.h:2 +#: ../panels/color/color.ui.h:58 ../panels/power/power.ui.h:2 #: ../panels/privacy/privacy.ui.h:7 msgid "30 minutes" msgstr "30 นาที" -#: ../panels/color/color.ui.h:58 +#: ../panels/color/color.ui.h:59 msgctxt "Calibration quality" msgid "Low" msgstr "ต่ำ" -#: ../panels/color/color.ui.h:59 ../panels/power/power.ui.h:1 +#: ../panels/color/color.ui.h:60 ../panels/power/power.ui.h:1 msgid "15 minutes" msgstr "15 นาที" -#: ../panels/color/color.ui.h:60 +#: ../panels/color/color.ui.h:61 msgid "Native to display" msgstr "ตามธรรมชาติจอแสดงผล" -#: ../panels/color/color.ui.h:61 +#: ../panels/color/color.ui.h:62 msgid "D50 (Printing and publishing)" msgstr "D50 (การพิมพ์และการจัดพิมพ์)" -#: ../panels/color/color.ui.h:62 +#: ../panels/color/color.ui.h:63 msgid "D55" msgstr "D55" -#: ../panels/color/color.ui.h:63 +#: ../panels/color/color.ui.h:64 msgid "D65 (Photography and graphics)" msgstr "D65 (การถ่ายภาพและกราฟิกส์)" -#: ../panels/color/color.ui.h:64 +#: ../panels/color/color.ui.h:65 msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "สี" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "เทียบมาตรฐานสีอุปกรณ์ของคุณ เช่น จอภาพ กล้องถ่ายรูป หรือเครื่องพิมพ์" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "สี;ICC;โพรไฟล์;เทียบมาตรฐาน;เครื่องพิมพ์;จอภาพ;" @@ -857,7 +859,7 @@ #: ../panels/common/cc-language-chooser.c:124 #: ../panels/region/cc-format-chooser.c:271 -#: ../panels/region/cc-input-chooser.c:168 +#: ../panels/region/cc-input-chooser.c:169 msgid "More…" msgstr "เพิ่มเติม…" @@ -865,15 +867,30 @@ msgid "No languages found" msgstr "ไม่พบภาษา" -#: ../panels/common/language-chooser.ui.h:1 ../panels/region/region.ui.h:1 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 +msgid "Today" +msgstr "วันนี้" + +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 +msgid "Yesterday" +msgstr "เมื่อวาน" + +#. Translators: This is a date format string in the style of "Feb 24". +#: ../panels/common/cc-util.c:138 +msgid "%b %e" +msgstr "%e %b" + +#. Translators: This is a date format string in the style of "Feb 24, 2013". +#: ../panels/common/cc-util.c:143 +msgid "%b %e, %Y" +msgstr "%e %b %Ey" + +#: ../panels/common/language-chooser.ui.h:1 msgid "Language" msgstr "ภาษา" -#: ../panels/common/language-chooser.ui.h:2 -#: ../panels/region/format-chooser.ui.h:2 -msgid "_Done" -msgstr "เ_สร็จสิ้น" - #: ../panels/datetime/big.ui.h:1 ../panels/datetime/little.ui.h:1 #: ../panels/datetime/middle.ui.h:1 ../panels/datetime/ydm.ui.h:1 msgid "Day" @@ -986,8 +1003,9 @@ msgid "December" msgstr "ธันวาคม" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "วันที่ & เวลา" @@ -1029,7 +1047,7 @@ msgstr "วันที่ & เ_วลา" #: ../panels/datetime/datetime.ui.h:24 -msgid "Time _Zone" +msgid "Time Z_one" msgstr "เ_ขตเวลา" #: ../panels/datetime/datetime.ui.h:25 @@ -1044,12 +1062,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "ตั้งวันที่และเวลา รวมถึงเขตเวลา" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "นาฬิกา;เขตเวลา;ตำแหน่งที่ตั้ง;" @@ -1071,20 +1089,20 @@ msgstr "แสดงเหมือนกัน" #: ../panels/display/cc-display-panel.c:578 -#: ../panels/display/cc-display-panel.c:2195 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "จอหลัก" #: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "ปิด" @@ -1099,7 +1117,7 @@ msgstr "จัดเรียงจอแสดงผลประกอบกัน" #: ../panels/display/cc-display-panel.c:1562 -#: ../panels/display/cc-display-panel.c:2024 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" @@ -1109,143 +1127,175 @@ msgid "Drag displays to rearrange them" msgstr "ลากจอแสดงผลเพื่อจัดเรียง" -#: ../panels/display/cc-display-panel.c:2073 +#. translators: example string is "60 Hz (NTSC)" +#. * NTSC is https://en.wikipedia.org/wiki/NTSC +#: ../panels/display/cc-display-panel.c:1793 +#, c-format +msgid "%d Hz (NTSC)" +msgstr "%d Hz (NTSC)" + +#. translators: example string is "60 Hz" +#: ../panels/display/cc-display-panel.c:1799 +#, c-format +msgid "%d Hz" +msgstr "%d Hz" + +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "หมุนทวนเข็มนาฬิกา 90°" -#: ../panels/display/cc-display-panel.c:2091 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "หมุน 180°" -#: ../panels/display/cc-display-panel.c:2109 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "หมุนตามเข็มนาฬิกา 90°" -#: ../panels/display/cc-display-panel.c:2130 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "ขนาด" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2143 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "สัดส่วนจอภาพ" -#: ../panels/display/cc-display-panel.c:2165 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "ความละเอียด" -#: ../panels/display/cc-display-panel.c:2196 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "ปรับสำหรับโทรทัศน์" + +#: ../panels/display/cc-display-panel.c:2398 +msgid "Refresh Rate" +msgstr "อัตราการรีเฟรช" + +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "แสดงแถบด้านบนและภาพรวมกิจกรรมในจอแสดงผลนี้" -#: ../panels/display/cc-display-panel.c:2202 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "จอแสดงผลรอง" -#: ../panels/display/cc-display-panel.c:2203 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "เชื่อมจอแสดงผลนี้กับจออื่นเพื่อสร้างพื้นที่ทำงานเพิ่มพิเศษ" -#: ../panels/display/cc-display-panel.c:2210 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "งานนำเสนอ" -#: ../panels/display/cc-display-panel.c:2211 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "แสดงภาพสไลด์และสื่อเท่านั้น" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2216 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "แสดงเหมือนกัน" -#: ../panels/display/cc-display-panel.c:2217 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "แสดงหน้าจอของคุณออกทางจอแสดงผลทั้งคู่" -#: ../panels/display/cc-display-panel.c:2223 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "ปิด" -#: ../panels/display/cc-display-panel.c:2224 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "ไม่ใช้จอแสดงผลนี้" -#: ../panels/display/cc-display-panel.c:2525 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับหน้าจอ" -#: ../panels/display/cc-display-panel.c:2556 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_จัดเรียงจอแสดงผลประกอบกัน" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "จอแสดงผล" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "จอ­แสดง­ผล" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "เลือกวิธีใช้งานจอภาพและเครื่องฉายที่เชื่อมต่ออยู่" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "แผงควบคุม;เครื่องฉาย;xrandr;หน้าจอ;ความละเอียด;รีเฟรช;จอภาพ;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "ไม่ทราบ" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d บิต (ID ประกอบสร้าง: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d บิต (ID ประกอบสร้าง: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d บิต" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d บิต" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "ถามว่าจะให้ทำอะไร" # probably wrong spelling -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "ไม่ต้องทำอะไร" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "เปิดโฟลเดอร์" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "สื่ออื่นๆ" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "เลือกโปรแกรมสำหรับซีดีเพลง" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "เลือกโปรแกรมสำหรับดีวีดีภาพยนตร์" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "เลือกโปรแกรมที่จะเรียกเมื่อมีการเชื่อมต่อกับเครื่องเล่นเพลง" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "เลือกโปรแกรมที่จะเรียกเมื่อมีการเชื่อมต่อกับกล้องถ่ายรูป" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "เลือกโปรแกรมสำหรับซีดีซอฟต์แวร์" @@ -1254,88 +1304,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "ดีวีดีเพลง" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "แผ่นบลูเรย์เปล่า" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "แผ่นซีดีเปล่า" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "แผ่นดีวีดีเปล่า" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "แผ่นดีวีดีเปล่าความจุสูง" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "แผ่นภาพยนตร์บลูเรย์" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "เครื่องอ่านอีบุ๊ก" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "แผ่นดีวีดีภาพยนตร์ความจุสูง" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "ซีดีรูปภาพ" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "ซูเปอร์วิดีโอซีดี" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "วิดีโอซีดี" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "ซอฟต์แวร์สำหรับวินโดวส์" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "หัวข้อ" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "ทั่วไป" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "โปรแกรมหลัก" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "สื่อถอดเสียบ" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "รุ่น %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "รายละเอียด" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "ราย­ละเอียด" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "ดูข้อมูลเกี่ยวกับระบบของคุณ" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1509,8 +1557,9 @@ msgid "Launch help browser" msgstr "เรียกโปรแกรมแสดงวิธีใช้" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1605 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "ตั้งค่า" @@ -1583,7 +1632,6 @@ msgstr "ล็อคหน้าจอ" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "การเข้าถึงหลากหลาย" @@ -1619,11 +1667,21 @@ msgid "High contrast on or off" msgstr "เปิดหรือปิดการแสดงสีตัดกัน" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "ปุ่มลัดกำหนดเอง" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1650,124 +1708,133 @@ msgid "Modifiers-only switch to next source" msgstr "ปุ่มสลับไปยังช่องทางถัดไปโดยใช้ปุ่มประกอบเท่านั้น" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "แป้นพิมพ์" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "คืนค่าปุ่มลัดกลับเป็นค่าปริยาย" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s ถูกใช้กับ %s ไปแล้ว ถ้าคุณกำหนดทับ %s ก็จะถูกปิดไม่ให้ใช้งาน" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "ตั้งค่าปุ่มลัดที่กำหนดเอง" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "ตั้งค่าปุ่มลัด" +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "กดปุ่มลัดใหม่เพื่อเปลี่ยน %s" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "เพิ่มปุ่มลัดกำหนดเอง" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "แป้น­พิมพ์" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "ดูและตั้งปุ่มลัดและปรับแต่งการป้อนข้อความของคุณ" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "ปุ่มลัด;ซ้ำปุ่ม;กะพริบ;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "ปุ่มลัดกำหนดเอง" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_ชื่อ:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "คำ_สั่ง:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "เพิ่มปุ่มลัด" +msgid "No keyboard shortcut found" +msgstr "ไม่พบปุ่มลัด" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "ลบปุ่มลัด" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "ลองค้นหาด้วยคำอื่น" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"ถ้าต้องการแก้ไขปุ่มลัด คลิกที่รายการที่ต้องการแล้วกดปุ่มลัดชุดใหม่ หรือกดปุ่ม Backspace " -"ถ้าต้องการล้างปุ่มลัด" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "กด Esc เพื่อยกเลิก" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "ปุ่มลัดกำหนดเอง" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "ชื่อ" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<ปฏิบัติการที่ไม่รู้จัก>" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "คำสั่ง" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"ไม่สามารถใช้ปุ่มลัด \"%s\" ได้ เพราะจะทำให้ใช้ปุ่มนี้ป้อนข้อความไม่ได้\n" -"กรุณาใช้ปุ่มอย่าง Control, Alt หรือ Shift ประกอบด้วย" +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "ปุ่มลัด" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"ปุ่มลัด \"%s\" ถูกใช้อยู่แล้วสำหรับ\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "แก้ไข" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "ถ้าคุณกำหนดปุ่มลัดนี้ซ้ำให้เป็น \"%s\" ปุ่มลัด \"%s\" ก็จะถูกปิดไป" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "ไม่ใช้" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_กำหนดซ้ำ" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "ลบออก" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "กดปุ่มลัดอันใหม่" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"ปุ่มลัด \"%s\" มีปุ่มลัด \"%s\" ที่เชื่อมโยงกันอยู่ คุณต้องการกำหนดปุ่มลัดดังกล่าวเป็น \"%s\" " -"โดยอัตโนมัติหรือไม่?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "ยกเลิก" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "ขณะนี้ \"%s\" เชื่อมโยงกับ \"%s\" อยู่ ปุ่มลัดนี้จะถูกปิดถ้าคุณดำเนินการต่อไป" +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "เพิ่ม" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_กำหนด" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "กำหนดทับ" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "กำหนดค่า" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_ทดสอบค่าตั้งของคุณ" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "เมาส์ & ทัชแพด" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "เมาส์ & ทัช­แพด" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "ตั้งความไวของเมาส์หรือทัชแพดของคุณ และเลือกใช้เมาส์มือขวาหรือมือซ้าย" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "ทัชแพด;ตัวชี้;คลิก;แตะ;ดับเบิล;ปุ่ม;แทร็กบอล;เลื่อน;" -#: ../panels/mouse/gnome-mouse-properties.ui.h:1 ../shell/help-overlay.ui.h:1 +#: ../panels/mouse/gnome-mouse-properties.ui.h:1 msgid "General" msgstr "ทั่วไป" @@ -1821,6 +1888,10 @@ msgstr "คลิกด้วยการแตะ" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "เลื่อนหน้าจอด้วยสองนิ้ว" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "เลื่อนหน้าจอที่ขอบ" @@ -1859,11 +1930,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "โหมดเ_ครื่องบิน" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "พร็อกซีเครือข่าย" @@ -1871,17 +1942,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:431 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "มีบางอย่างไม่ถูกต้อง กรุณาติดต่อผู้จำหน่ายซอฟต์แวร์ของคุณ" -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "ต้องมี NetworkManager ทำงานอยู่" @@ -1897,7 +1968,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1914,248 +1985,243 @@ msgid "page 2" msgstr "หน้า 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "การรักษาความปลอดภัย" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "อัตโนมัติ" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "โพรไฟล์ %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "เอนเทอร์ไพรส์" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "ไม่มี" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "ไม่มี" -#: ../panels/network/connection-editor/ce-page-details.c:102 -#: ../panels/user-accounts/um-utils.c:815 -msgid "Today" -msgstr "วันนี้" - #: ../panels/network/connection-editor/ce-page-details.c:104 -#: ../panels/user-accounts/um-utils.c:818 -msgid "Yesterday" -msgstr "เมื่อวาน" - -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i วันก่อน" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "ไม่มี" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "อ่อน" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "พอใช้" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "ดี" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "ดีมาก" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:204 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "รายละเอียด" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "ชื่อ" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "ที่อยู่" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "เน็ตแมสก์" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "เกตเวย์" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "ลบที่อยู่" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "เพิ่ม" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "เซิร์ฟเวอร์" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "ลบเซิร์ฟเวอร์ DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "เมตริก" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "ลบเส้นทาง" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "อัตโนมัติ (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "กำหนดเอง" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "เชื่อมต่อภายในเท่านั้น" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Prefix" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:182 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "อัตโนมัติ" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "อัตโนมัติ ใช้ DHCP เท่านั้น" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "ล้างค่า" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "ไม่ใช้" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/กุญแจ 128 บิต (ฐานสิบหกหรือ ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP วลีรหัสผ่าน 128 บิต" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP แบบผันแปร (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 ส่วนบุคคล" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 เอนเทอร์ไพรส์" @@ -2170,30 +2236,30 @@ msgstr "อัตราเร็วลิงก์" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:693 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "ที่อยู่ IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:694 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "ที่อยู่ IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "ที่อยู่ฮาร์ดแวร์" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2203,7 +2269,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2286,13 +2352,13 @@ msgid "Firewall _Zone" msgstr "เ_ขตไฟร์วอลล์" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "ปริยาย" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "เขตนี้จะกำหนดระดับความเชื่อถือของการเชื่อมต่อ" @@ -2334,45 +2400,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:269 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "ไม่สามารถเปิดเครื่องมือแก้ไขการเชื่อมต่อ" -#: ../panels/network/connection-editor/net-connection-editor.c:287 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "โพรไฟล์ใหม่" -#: ../panels/network/connection-editor/net-connection-editor.c:577 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:578 -msgid "Bond" -msgstr "บอนด์" - -#: ../panels/network/connection-editor/net-connection-editor.c:580 -msgid "Team" -msgstr "ทีม" - -#: ../panels/network/connection-editor/net-connection-editor.c:582 -msgid "Bridge" -msgstr "บริดจ์" - -#: ../panels/network/connection-editor/net-connection-editor.c:583 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:734 -msgid "Could not load VPN plugins" -msgstr "ไม่สามารถโหลดปลั๊กอิน VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:803 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "นำเข้าจากแฟ้ม…" -#: ../panels/network/connection-editor/net-connection-editor.c:874 -msgid "Add Network Connection" -msgstr "เพิ่มการเชื่อมต่อเครือข่าย" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "เพิ่ม VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2380,7 +2426,7 @@ msgstr "_ล้างค่า" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "ล_บทิ้ง" @@ -2402,11 +2448,11 @@ msgid "S_ecurity" msgstr "การ_รักษาความปลอดภัย" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "ไม่สามารถนำเข้าการเชื่อมต่อ VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2418,36 +2464,36 @@ "\n" "ข้อผิดพลาด: %s" -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "เลือกแฟ้มที่จะนำเข้า" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:1932 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_เปิด" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "มีแฟ้มชื่อ \"%s\" อยู่ก่อนแล้ว" -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "แ_ทนที่" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "คุณต้องการจะแทนที่ %s ด้วยการเชื่อมต่อ VPN ที่คุณกำลังจะบันทึกนี้หรือไม่?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "ไม่สามารถส่งออกการเชื่อมต่อ VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2458,7 +2504,7 @@ "\n" "ข้อผิดพลาด: %s" -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "ส่งออกการเชื่อมต่อ VPN" @@ -2485,60 +2531,45 @@ msgid "Make available to _other users" msgstr "เปิดให้ผู้ใ_ช้อื่นใช้ด้วย" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" -msgstr "เครือข่าย" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" +msgstr "เครือ­ข่าย" + +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "ควบคุมวิธีการเชื่อมต่อกับอินเทอร์เน็ตของคุณ" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"เครือข่าย;ไร้สาย;Wi-Fi;Wifi;ไอพี;แลน;พร็อกซี;แวน;บรอดแบนด์;โมเด็ม;บลูทูท;vpn;vlan;บริดจ์;" -"บอนด์;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "หน่วยลูกของบอนด์" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(ไม่มี)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "หน่วยลูกของบริดจ์" +"เครือข่าย;ไร้สาย;Wi-Fi;Wifi;ไอพี;แลน;พร็อกซี;แวน;บรอดแบนด์;โมเด็ม;บลูทูท;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ยังไม่เคยใช้" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "วันนี้" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "เมื่อวาน" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:696 -#: ../panels/network/panel-common.c:698 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "ที่อยู่ไอพี" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "ใช้ครั้งล่าสุด" @@ -2548,34 +2579,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "ใช้สาย" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "ตัวเลือก…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "โพรไฟล์ %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "เพิ่มช่องเชื่อมต่อ" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "หน่วยลูกของทีม" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2583,52 +2605,52 @@ "ถ้าคุณมีการเชื่อมต่อไปยังอินเทอร์เน็ตทางอื่นนอกเหนือจากเครือข่ายไร้สาย " "คุณก็สามารถตั้งค่าจุดแพร่สัญญาณไร้สายเพื่อแบ่งปันการเชื่อมต่ออินเทอร์เน็ตให้ผู้อื่นใช้ได้" -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "การเปิดใช้จุดแพร่สัญญาณไร้สายจะเป็นการตัดการเชื่อมต่อจาก %s" -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "คุณจะไม่สามารถเข้าถึงอินเทอร์เน็ตผ่านเครือข่ายไร้สายได้ในระหว่างเปิดใช้จุดแพร่สัญญาณ" -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "จะปิดจุดแพร่สัญญาณและตัดการเชื่อมต่อกับผู้ใช้ทั้งหมดหรือไม่?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "ปิ_ดจุดแพร่สัญญาณ" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "นโยบายของระบบห้ามใช้เป็นจุดแพร่สัญญาณ" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "อุปกรณ์ไร้สายไม่รองรับโหมดจุดแพร่สัญญาณ" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "รายละเอียดของเครือข่ายที่เลือก รวมถึงรหัสผ่านและค่าปรับแต่งใดๆ จะถูกลบทิ้ง" -#: ../panels/network/net-device-wifi.c:1774 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "ประวัติ" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 +#: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 msgid "_Close" msgstr "ปิ_ด" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_ลบทิ้ง" @@ -2663,6 +2685,10 @@ msgid "Provider" msgstr "ผู้ให้บริการ" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "เครือข่าย" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2768,15 +2794,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_รหัสผ่าน" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "ไม่ใช้" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "แ_สดงรหัสผ่าน" @@ -2887,360 +2910,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/sharing/sharing.ui.h:10 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "รหัสผ่าน" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Infrastructure" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "ไม่ทราบสถานะ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "ไม่มีการจัดการ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "ใช้งานไม่ได้" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "กำลังเชื่อมต่อ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "ต้องยืนยันตัวบุคคล" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "เชื่อมต่อแล้ว" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "กำลังตัดการเชื่อมต่อ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "ไม่ทราบสถานะ (ค่าหายไป)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "ไม่ได้เชื่อมต่อ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "ตั้งค่าไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "ตั้งค่าไอพีไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "ค่าไอพีหมดอายุ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "ต้องการข้อมูลลับ แต่ไม่ได้ป้อนไว้" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x supplicant ถูกตัดการเชื่อมต่อ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "ตั้งค่า 802.1x supplicant ไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x supplicant ล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x supplicant ใช้เวลายืนยันตัวบุคคลนานเกินไป" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "เปิดบริการ PPP ไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "บริการ PPP ถูกตัดการเชื่อมต่อ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP ล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "เปิดใช้ลูกข่าย DHCP ไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "เกิดข้อผิดพลาดที่ลูกข่าย DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "ลูกข่าย DHCP ล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "เปิดบริการแบ่งปันการเชื่อมต่อไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "บริการแบ่งปันการเชื่อมต่อล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "เปิดบริการ AutoIP ไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "เกิดข้อผิดพลาดที่บริการ AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "บริการ AutoIP ล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "สายไม่ว่าง" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "ไม่มีสัญญาณหมุนเลขหมาย" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "ไม่สามารถเชื่อมต่อกับผู้ให้บริการ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "หมดเวลาคอยการหมุนเลขหมาย" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "หมุนเลขหมายไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "ตั้งค่าเริ่มต้นโมเด็มไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "เลือก APN ที่กำหนดไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "ไม่ได้อยู่ระหว่างค้นหาเครือข่าย" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "การลงทะเบียนเครือข่ายถูกปฏิเสธ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "หมดเวลาคอยลงทะเบียนเครือข่าย" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "ลงทะเบียนกับเครือข่ายที่ร้องขอไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "การตรวจสอบ PIN ล้มเหลว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "อาจขาดเฟิร์มแวร์สำหรับอุปกรณ์" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "การเชื่อมต่อหายไป" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "ถือว่ามีการเชื่อมต่ออยู่ก่อนแล้ว" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "ไม่พบโมเด็ม" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "เชื่อมต่อบลูทูทไม่สำเร็จ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "ไม่ได้ใส่ SIM card" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "ต้องการรหัส PIN ของ SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "ต้องการรหัส PUK ของ SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM ผิด" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "อุปกรณ์ InfiniBand ไม่รองรับโหมดเชื่อมต่อ" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "สิ่งที่ต้องใช้สำหรับการเชื่อมต่อล้มเหลว" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "ขาดเฟิร์มแวร์" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "สายเคเบิลถูกถอดออก" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "ไม่ได้เลือกใบรับรองจากองค์กรออกใบรับรอง" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "เกิดข้อผิดพลาดที่ไม่ได้บัญญัติไว้ในความปลอดภัย 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "ไม่ได้เลือกแฟ้ม" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"การไม่ใช้ใบรับรองจากองค์กรออกใบรับรอง (CA) อาจทำให้การเชื่อมต่อไม่นิรภัย " -"หรือได้พบกับเครือข่าย Wi-Fi ที่ไม่ประสงค์ดี คุณต้องการเลือกใบรับรองจากองค์กรออกใบรับรองหรือไม่?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "ไม่สนใจ" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "เลือกใบรับรอง CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "กุญแจส่วนตัวแบบ DER, PEM, หรือ PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "เกิดข้อผิดพลาดที่ไม่ได้บัญญัติไว้ขณะตรวจความถูกต้องของแฟ้ม eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "กุญแจส่วนตัวแบบ DER, PEM, หรือ PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "ใบรับรองแบบ DER หรือ PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "ไม่มีแฟ้ม PAC สำหรับ EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "เลือกแฟ้ม PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "แฟ้ม PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "แ_ฟ้ม PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "การยืนยันตัวบุคคลชั้นใ_น" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "การ_จัดเตรียม PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3249,41 +3248,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "นิรนาม" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "ผ่านการยืนยันตัวบุคคล" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "ทั้งสองอย่าง" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "แ_ฟ้ม PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "การยืนยันตัวบุคคลชั้นใ_น" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "อนุญาตให้_จัดเตรียม PAC อัตโนมัติ" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "ขาดชื่อผู้ใช้ EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "ขาดรหัสผ่าน EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "ชื่อ_ผู้ใช้" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "แ_สดงรหัสผ่าน" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "ใบรับรอง EAP-PEAP CA ไม่ถูกต้อง: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "ใบรับรอง EAP-PEAP CA ไม่ถูกต้อง: ไม่ได้ระบุใบรับรอง" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "เลือกใบรับรองจากองค์กรออกใบรับรอง" @@ -3301,19 +3332,56 @@ msgid "C_A certificate" msgstr "ใ_บรับรอง CA" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "ไ_ม่ต้องใช้ใบรับรอง CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "รุ่_นของ PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_ถามรหัสผ่านทุกครั้ง" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "ขาดชื่อผู้ใช้ EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "ขาดรหัสผ่าน EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "ขาดเอกลักษณ์ EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "ใบรับรอง EAP-TLS CA ไม่ถูกต้อง: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "ใบรับรอง EAP-TLS CA ไม่ถูกต้อง: ไม่ได้ระบุใบรับรอง" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "รหัสผ่าน EAP-TLS ไม่ถูกต้อง: ไม่มีรหัสผ่าน" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "กุญแจส่วนตัว EAP-TLS ไม่ถูกต้อง: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "ใบรับรองผู้ใช้ EAP-TLS ไม่ถูกต้อง: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "กุญแจส่วนตัวที่ไม่เข้ารหัสลับนั้นไม่มีความปลอดภัย" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3327,11 +3395,11 @@ "\n" "(คุณสามารถปกป้องกุญแจส่วนตัวของคุณด้วยรหัสผ่านได้ โดยใช้ openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "เลือกใบรับรองส่วนตัวของคุณ" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "เลือกกุญแจส่วนตัวของคุณ" @@ -3343,51 +3411,56 @@ msgid "_User certificate" msgstr "ใ_บรับรองของผู้ใช้" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "กุญแจ_ส่วนตัว" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "_รหัสผ่านกุญแจส่วนตัว" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "ใบรับรอง EAP-TTLS CA ไม่ถูกต้อง: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "ใบรับรอง EAP-TTLS CA ไม่ถูกต้อง: ไม่ได้ระบุใบรับรอง" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "ไ_ม่ต้องเตือนฉันอีก" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "ไม่" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "ใช่" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะตรวจสอบความปลอดภัย 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS ผ่านทันเนล" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP ที่มีการปกป้อง (PEAP)" @@ -3397,6 +3470,46 @@ msgid "Au_thentication" msgstr "การ_ยืนยันตัวบุคคล" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "ขาดชื่อผู้ใช้ leap" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "ขาดรหัสผ่าน leap" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "ขาด wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "wep-key ไม่ถูกต้อง: คีย์ความยาว %zu ต้องมีเฉพาะตัวเลขฐานสิบหกเท่านั้น" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "wep-key ไม่ถูกต้อง: คีย์ความยาว %zu ต้องมีเฉพาะอักขระแอสกี้เท่านั้น" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"wep-key ไม่ถูกต้อง: ความยาวคีย์ %zu ไม่ถูกต้อง คีย์ต้องยาว 5/13 (แอสกี) หรือ 10/26 " +"(ฐานสิบหก) อย่างใดอย่างหนึ่ง" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "wep-key ไม่ถูกต้อง: วลีรหัสผ่านต้องไม่ว่างเปล่า" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "wep-key ไม่ถูกต้อง: วลีรหัสผ่านต้องสั้นกว่า 64 อักขระ" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (ปริยาย)" @@ -3433,155 +3546,158 @@ msgid "WEP inde_x" msgstr "_ดัชนี WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk ไม่ถูกต้อง: ความยาวคีย์ %zu ไม่ถูกต้อง ต้องยาวตั้งแต่ 8 ถึง 63 ไบต์ " +"หรือเป็นเลขฐานสิบหก 64 หลักเท่านั้น" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "wpa-psk ไม่ถูกต้อง: ไม่สามารถอ่านค่าคีย์ความยาว 64 ไบต์เป็นเลขฐานสิบหกได้" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_ชนิด" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:155 -#: ../panels/privacy/cc-privacy-panel.c:222 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "เปิด" #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 msgctxt "notifications" -msgid "Notifications" -msgstr "การแจ้งเหตุ" +msgid "_Notifications" +msgstr "_การแจ้งเหตุ" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 msgctxt "notifications" -msgid "Sound Alerts" -msgstr "เสียงแจ้งเตือน" +msgid "Sound _Alerts" +msgstr "เสียงแจ้งเ_ตือน" #: ../panels/notifications/edit-dialog.ui.h:5 msgctxt "notifications" -msgid "Notification Banners" -msgstr "พาดหัวการแจ้งเหตุ" +msgid "Notification _Banners" +msgstr "_พาดหัวการแจ้งเหตุ" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 msgctxt "notifications" -msgid "Show Message Content in Banners" -msgstr "แสดงเนื้อหาข้อความในพาดหัว" +msgid "Show Message _Content in Banners" +msgstr "แสดงเ_นื้อหาข้อความในพาดหัว" #: ../panels/notifications/edit-dialog.ui.h:8 msgctxt "notifications" -msgid "Lock Screen Notifications" -msgstr "การแจ้งเหตุการล็อคหน้าจอ" +msgid "_Lock Screen Notifications" +msgstr "การแจ้งเหตุการ_ล็อคหน้าจอ" #: ../panels/notifications/edit-dialog.ui.h:9 msgctxt "notifications" -msgid "Show Message Content on Lock Screen" -msgstr "แสดงเนื้อหาข้อความในหน้าล็อคหน้าจอ" - -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" -msgstr "การแจ้งเหตุ" +msgid "Show Message C_ontent on Lock Screen" +msgstr "แสดงเนื้อ_หาข้อความในหน้าล็อคหน้าจอ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" +msgstr "การ­แจ้ง­เหตุ" + +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "ควบคุมการแจ้งเหตุว่าจะแสดงรายการใดหรือสิ่งใดบ้าง" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "การแจ้งเหตุ;พาดหัว;ข้อความ;ถาด;กล่องผุดขึ้น;" #: ../panels/notifications/notifications.ui.h:1 -msgid "Notification Banners" -msgstr "พาดหัวการแจ้งเหตุ" +msgid "Notification _Banners" +msgstr "_พาดหัวการแจ้งเหตุ" #: ../panels/notifications/notifications.ui.h:2 -msgid "Lock Screen Notifications" -msgstr "การแจ้งเหตุการล็อคหน้าจอ" +msgid "_Lock Screen Notifications" +msgstr "การแจ้งเหตุการ_ล็อคหน้าจอ" #. List of applications. #: ../panels/notifications/notifications.ui.h:4 -#: ../panels/sound/gvc-mixer-dialog.c:1781 +#: ../panels/privacy/privacy.ui.h:45 ../panels/sound/gvc-mixer-dialog.c:1781 msgid "Applications" msgstr "โปรแกรม" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "อื่นๆ" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "เพิ่มบัญชี" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "เมล" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "ปฏิทิน" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "ผู้ติดต่อ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "สนทนา" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "ทรัพยากร" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "เกิดข้อผิดพลาดขณะเข้าระบบด้วยบัญชีนี้" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "ข้อมูลลับหมดอายุแล้ว" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "เข้าระบบเพื่อเปิดใช้บัญชีนี้" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "เ_ข้าระบบ" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "เกิดข้อผิดพลาดขณะสร้างบัญชี" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "เกิดข้อผิดพลาดขณะลบบัญชี" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "ยืนยันที่จะลบบัญชีหรือไม่?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "การลบนี้จะไม่มีการลบบัญชีที่เซิร์ฟเวอร์" -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_ลบออก" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" -msgstr "บัญชีออนไลน์" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" +msgstr "บัญชี­ออน­ไลน์" + +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "เชื่อมต่อไปยังบัญชีออนไลน์ของคุณและตัดสินใจว่าจะใช้เพื่อทำอะไร" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3594,6 +3710,7 @@ msgstr "ไม่ได้ตั้งค่าบัญชีออนไลน์ใดไว้" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "ลบบัญชี" @@ -3732,7 +3849,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "แบตเตอรี่" @@ -3780,102 +3897,103 @@ msgid "When _idle" msgstr "เมื่อไ_ม่ใช้งาน" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "การประหยัดพลังงาน" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "ความสว่าง_หน้าจอ" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "ความสว่างอัตโนมัติ" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "ความสว่างแ_ป้นพิมพ์" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_หรี่หน้าจอเมื่อไม่มีการใช้งาน" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "หน้าจอ_ว่าง" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "ปิด Wi-Fi เพื่อประหยัดพลังงาน" -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "บรอดแบนด์_มือถือ" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "ปิดอุปกรณ์บรอดแบนด์มือถือ (3G, 4G, LTE ฯลฯ) เพื่อประหยัดพลังงาน" -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_บลูทูท" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "เมื่อใช้ไฟจากแบตเตอรี่" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "เมื่อเสียบปลั๊กไฟ" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "พักเครื่อง" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "จำศีลเครื่อง" # probably wrong spelling -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "ไม่ต้องทำอะไร" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "ปุ่มพัก & เปิด/ปิดเครื่อง" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "พักเครื่องโดย_อัตโนมัติ" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "พักเครื่องโดยอัตโนมัติ" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "เมื่อกดปุ่มเปิ_ด/ปิดเครื่อง" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "อุปกรณ์" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" -msgstr "พลังงาน" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" +msgstr "พลัง­งาน" + +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "ดูสถานะแบตเตอรี่และตั้งค่าการประหยัดพลังงาน" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -3962,225 +4080,210 @@ msgstr "ต้องยืนยันตัวบุคคล" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:588 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "ผงหมึกใกล้หมด" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:590 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "ผงหมึกหมด" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:593 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "น้ำยาใกล้หมด" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:596 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "น้ำยาหมด" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:598 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "ตลับสีหมึกใกล้หมด" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:600 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "ตลับสีหมึกหมด" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:602 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "ฝาครอบเปิด" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:604 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "ประตูเปิด" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:606 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "กระดาษใกล้หมด" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:608 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "กระดาษหมด" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:610 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "ออฟไลน์" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:612 -#: ../panels/printers/cc-printers-panel.c:803 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "หยุด" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:614 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "ที่เก็บของเสียใกล้เต็ม" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:616 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "ที่เก็บของเสียเต็ม" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:618 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "ลูกกลิ้งไวแสงใกล้หมดอายุ" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:620 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "ลูกกลิ้งไวแสงไม่ทำงานแล้ว" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:730 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "กำลังตั้งค่า" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:789 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "พร้อม" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:794 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "ไม่รับงานพิมพ์" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:799 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "กำลังดำเนินการ" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:919 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "ระดับผงหมึก" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:922 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "ระดับน้ำหมึก" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:925 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "ระดับแหล่งจ่าย" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:943 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "กำลังติดตั้ง" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1420 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "ทำงานอยู่ %u" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1761 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "เพิ่มเครื่องพิมพ์เครื่องใหม่ไม่สำเร็จ" -#: ../panels/printers/cc-printers-panel.c:1928 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "เลือกแฟ้ม PPD" -#: ../panels/printers/cc-printers-panel.c:1937 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "แฟ้มบรรยายเครื่องพิมพ์โพสต์สคริปต์ (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2244 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "ไม่พบไดรเวอร์ที่เหมาะสม" -#: ../panels/printers/cc-printers-panel.c:2315 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "กำลังค้นหาไดรเวอร์สำหรับเครื่องพิมพ์…" -#: ../panels/printers/cc-printers-panel.c:2336 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "เลือกจากฐานข้อมูล…" -#: ../panels/printers/cc-printers-panel.c:2345 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "ป้อนแฟ้ม PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2496 -#: ../panels/printers/cc-printers-panel.c:2519 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "หน้าทดสอบ" -#: ../panels/printers/cc-printers-panel.c:2632 -msgid "No printers" -msgstr "ไม่มีเครื่องพิมพ์" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:2939 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "อ่านส่วนติดต่อผู้ใช้ไม่สำเร็จ: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" -msgstr "เครื่องพิมพ์" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" +msgstr "เครื่อง­พิมพ์" + +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "เพิ่มเครื่องพิมพ์, ดูงานพิมพ์ที่เครื่องพิมพ์ และเลือกวิธีการพิมพ์" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "เครื่องพิมพ์;คิว;พิมพ์;กระดาษ;หมึก;ผงหมึก;" -#. Translators: This dialog contains list of active print jobs of the selected printer +#. Translators: this action removes (purges) all the listed jobs from the list. #: ../panels/printers/jobs-dialog.ui.h:2 -msgid "Active Jobs" -msgstr "งานพิมพ์ที่ทำงานอยู่" - -#: ../panels/printers/jobs-dialog.ui.h:3 -#: ../panels/printers/options-dialog.ui.h:2 -msgid "Close" -msgstr "ปิด" +msgid "Clear All" +msgstr "ลบทั้งหมด" +#. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -msgid "Resume Printing" -msgstr "พิมพ์ต่อ" - -#: ../panels/printers/jobs-dialog.ui.h:5 -msgid "Pause Printing" -msgstr "พักการพิมพ์" - -#: ../panels/printers/jobs-dialog.ui.h:6 -msgid "Cancel Print Job" -msgstr "ยกเลิกงานพิมพ์" +msgid "No Active Printer Jobs" +msgstr "ไม่มีงานพิมพ์ที่ดำเนินการอยู่" #: ../panels/printers/new-printer-dialog.ui.h:1 msgid "Add a New Printer" @@ -4209,6 +4312,11 @@ msgid "Select Printer Driver" msgstr "เลือกไดรเวอร์เครื่องพิมพ์" +#: ../panels/printers/ppd-selection-dialog.ui.h:3 +#: ../panels/user-accounts/um-photo-dialog.c:96 +msgid "Select" +msgstr "เลือก" + #: ../panels/printers/ppd-selection-dialog.ui.h:4 msgid "Loading drivers database..." msgstr "กำลังโหลดฐานข้อมูลไดรเวอร์..." @@ -4262,66 +4370,53 @@ msgstr "แนวตั้งกลับด้าน" #. Translators: Job's state (job is waiting to be printed) -#: ../panels/printers/pp-jobs-dialog.c:142 +#: ../panels/printers/pp-jobs-dialog.c:103 msgctxt "print job" msgid "Pending" msgstr "รอดำเนินการ" #. Translators: Job's state (job is held for printing) -#: ../panels/printers/pp-jobs-dialog.c:146 +#: ../panels/printers/pp-jobs-dialog.c:107 msgctxt "print job" -msgid "Held" -msgstr "เข้าแถวคอย" +msgid "Paused" +msgstr "พักพิมพ์" #. Translators: Job's state (job is currently printing) -#: ../panels/printers/pp-jobs-dialog.c:150 +#: ../panels/printers/pp-jobs-dialog.c:111 msgctxt "print job" msgid "Processing" msgstr "กำลังดำเนินการ" #. Translators: Job's state (job has been stopped) -#: ../panels/printers/pp-jobs-dialog.c:154 +#: ../panels/printers/pp-jobs-dialog.c:115 msgctxt "print job" msgid "Stopped" msgstr "หยุด" #. Translators: Job's state (job has been canceled) -#: ../panels/printers/pp-jobs-dialog.c:158 +#: ../panels/printers/pp-jobs-dialog.c:119 msgctxt "print job" msgid "Canceled" msgstr "ยกเลิก" #. Translators: Job's state (job has aborted due to error) -#: ../panels/printers/pp-jobs-dialog.c:162 +#: ../panels/printers/pp-jobs-dialog.c:123 msgctxt "print job" msgid "Aborted" msgstr "เลิกพิมพ์" #. Translators: Job's state (job has completed successfully) -#: ../panels/printers/pp-jobs-dialog.c:166 +#: ../panels/printers/pp-jobs-dialog.c:127 msgctxt "print job" msgid "Completed" msgstr "เสร็จแล้ว" -#. Translators: Name of column showing titles of print jobs -#: ../panels/printers/pp-jobs-dialog.c:288 -msgid "Job Title" -msgstr "ชื่องานพิมพ์" - -#. Translators: Name of column showing statuses of print jobs -#: ../panels/printers/pp-jobs-dialog.c:297 -msgid "Job State" -msgstr "สถานะงานพิมพ์" - -#. Translators: Name of column showing times of creation of print jobs -#: ../panels/printers/pp-jobs-dialog.c:303 -msgid "Time" -msgstr "เวลา" - -#: ../panels/printers/pp-jobs-dialog.c:451 +#. Translators: This is the printer name for which we are showing the active jobs +#: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -msgid "%s Active Jobs" -msgstr "งานที่พิมพ์อยู่ของ %s" +msgctxt "Printer jobs dialog title" +msgid "%s - Active Jobs" +msgstr "%s - งานที่พิมพ์อยู่" #. Translators: The found device is a printer connected via USB #: ../panels/printers/pp-new-printer-dialog.c:1659 @@ -4338,6 +4433,11 @@ msgid "Parallel Port" msgstr "พอร์ตขนาน" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "บลูทูท" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4544,17 +4644,21 @@ msgstr "พิมพ์หน้า_ทดสอบ" #. Translators: This button opens printer -#: ../panels/printers/printers.ui.h:22 +#: ../panels/printers/printers.ui.h:22 ../panels/region/region.ui.h:6 msgid "_Options" msgstr "_ตัวเลือก" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "ไม่มีเครื่องพิมพ์" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "เพิ่มเครื่องพิมพ์" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4562,52 +4666,70 @@ "ขออภัย! ดูเหมือนไม่มีบริการจัดพิมพ์ของระบบ\n" "เปิดอยู่" -#: ../panels/privacy/cc-privacy-panel.c:352 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "การล็อคหน้าจอ" -#: ../panels/privacy/cc-privacy-panel.c:462 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:438 +msgid "In use" +msgstr "ใช้งานอยู่" + +#: ../panels/privacy/cc-privacy-panel.c:443 +msgctxt "Location services status" +msgid "On" +msgstr "เปิด" + +#: ../panels/privacy/cc-privacy-panel.c:444 +msgctxt "Location services status" +msgid "Off" +msgstr "ปิด" + +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 +msgid "Location Services" +msgstr "บริการตำแหน่งที่ตั้ง" + +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "การใช้งาน & ประวัติ" -#: ../panels/privacy/cc-privacy-panel.c:587 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "แน่ใจหรือไม่ว่าต้องการลบทุกอย่างในถังขยะอย่างถาวร?" -#: ../panels/privacy/cc-privacy-panel.c:588 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "ทุกรายการในถังขยะจะถูกลบทิ้งอย่างถาวร" -#: ../panels/privacy/cc-privacy-panel.c:589 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "เ_ทขยะ" -#: ../panels/privacy/cc-privacy-panel.c:612 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "ลบแฟ้มชั่วคราวทั้งหมดหรือไม่?" -#: ../panels/privacy/cc-privacy-panel.c:613 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "แฟ้มชั่วคราวทั้งหมดจะถูกลบทิ้งอย่างถาวร" -#: ../panels/privacy/cc-privacy-panel.c:614 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_ล้างแฟ้มชั่วคราวต่างๆ" -#: ../panels/privacy/cc-privacy-panel.c:636 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "ล้างขยะ & แฟ้มชั่วคราว" -#: ../panels/privacy/cc-privacy-panel.c:676 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "การใช้ซอฟต์แวร์" -#: ../panels/privacy/cc-privacy-panel.c:717 ../panels/privacy/privacy.ui.h:44 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "การรายงานปัญหา" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:731 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4616,20 +4738,21 @@ "การส่งรายงานปัญหาทางเทคนิคเป็นการช่วยเราปรับปรุง %s ให้ดีขึ้น รายงานจะถูกส่งโดยไม่ระบุชื่อ " "และปราศจากข้อมูลส่วนบุคคล" -#: ../panels/privacy/cc-privacy-panel.c:743 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "นโยบายความเป็นส่วนตัว" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "ความเป็นส่วนตัว" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "ความ­เป็น­ส่วน­ตัว" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "ปกป้องข้อมูลส่วนตัวของคุณและควบคุมสิ่งที่จะให้คนอื่นเห็น" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4756,15 +4879,19 @@ msgid "_Send software usage statistics" msgstr "_ส่งสถิติการใช้ซอฟต์แวร์" -#: ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/privacy.ui.h:43 +msgid "" +"Location services allow applications to know your location. Using Wi-Fi and " +"mobile broadband increases accuracy." +msgstr "" +"บริการตำแหน่งที่ตั้งจะทำให้โปรแกรมต่างๆ รู้ตำแหน่งภูมิศาสตร์ที่คุณอยู่ การใช้ Wi-Fi " +"และบรอดแบนด์มือถือจะช่วยเพิ่มความแม่นยำได้" + +#: ../panels/privacy/privacy.ui.h:44 msgid "_Location Services" msgstr "บริการ_ตำแหน่งที่ตั้ง" -#: ../panels/privacy/privacy.ui.h:43 -msgid "Used to determine your geographical location" -msgstr "ใช้กำหนดตำแหน่งที่ตั้งทางภูมิศาสตร์ของคุณ" - -#: ../panels/privacy/privacy.ui.h:45 +#: ../panels/privacy/privacy.ui.h:47 msgid "_Automatic Problem Reporting" msgstr "การรายงานปัญหาโดย_อัตโนมัติ" @@ -4782,34 +4909,34 @@ msgid "No regions found" msgstr "ไม่พบภูมิภาค" -#: ../panels/region/cc-input-chooser.c:181 +#: ../panels/region/cc-input-chooser.c:182 msgid "No input sources found" msgstr "ไม่พบช่องทางป้อนข้อความ" -#: ../panels/region/cc-input-chooser.c:1015 +#: ../panels/region/cc-input-chooser.c:992 msgctxt "Input Source" msgid "Other" msgstr "อื่นๆ" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1072 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "คุณต้องตั้งต้นวาระใหม่เพื่อให้การเปลี่ยนแปลงมีผล" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1076 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "ตั้งต้นใหม่เดี๋ยวนี้" -#: ../panels/region/cc-region-panel.c:878 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "ไม่ได้เลือกช่องทางป้อนข้อความใด" -#: ../panels/region/cc-region-panel.c:1798 -msgid "Login Screen" -msgstr "หน้าจอเข้าระบบ" +#: ../panels/region/cc-region-panel.c:1779 +msgid "Login _Screen" +msgstr "_หน้าจอเข้าระบบ" -#: ../panels/region/format-chooser.ui.h:1 ../panels/region/region.ui.h:3 +#: ../panels/region/format-chooser.ui.h:1 msgid "Formats" msgstr "รูปแบบ" @@ -4837,17 +4964,18 @@ msgid "Paper" msgstr "กระดาษ" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "ภูมิภาค & ภาษา" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "ภูมิ­ภาค & ภา­ษา" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "เลือกภาษาที่แสดง, รูปแบบ, ผังแป้นพิมพ์ และช่องทางป้อนข้อความของคุณ" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "ภาษา;ผังแป้นพิมพ์;แป้นพิมพ์;ป้อนข้อความ;" @@ -4903,10 +5031,19 @@ msgid "Left+Right Alt" msgstr "Alt ซ้าย+ขวา" +#: ../panels/region/region.ui.h:1 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +msgid "_Language" +msgstr "_ภาษา" + #: ../panels/region/region.ui.h:2 msgid "English (United Kingdom)" msgstr "อังกฤษ (สหราชอาณาจักร)" +#: ../panels/region/region.ui.h:3 +msgid "_Formats" +msgstr "รูปแ_บบ" + #: ../panels/region/region.ui.h:4 msgid "United Kingdom" msgstr "สหราชอาณาจักร" @@ -4915,10 +5052,6 @@ msgid "Input Sources" msgstr "ช่องทางป้อนข้อความ" -#: ../panels/region/region.ui.h:6 -msgid "Options" -msgstr "ตัวเลือก" - #: ../panels/region/region.ui.h:7 msgid "Add input source" msgstr "เพิ่มช่องทางป้อนข้อความ" @@ -4947,26 +5080,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "การตั้งค่าการเข้าระบบใช้จะใช้กับผู้ใช้ทั้งหมดขณะเข้าสู่ระบบ" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "ที่หลักๆ" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "ที่คั่นหน้า" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "อื่นๆ" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "เลือกสถานที่" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_ตกลง" @@ -4974,18 +5092,18 @@ msgid "No applications found" msgstr "ไม่พบโปรแกรม" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 -#: ../shell/help-overlay.ui.h:3 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "ค้นหา" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "กำหนดโปรแกรมที่จะแสดงผลการค้นหาในหน้าภาพรวมกิจกรรม" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "ค้นหา;หา;ดัชนี;ซ่อน;ความเป็นส่วนตัว;ผล;" @@ -4993,6 +5111,18 @@ msgid "Search Locations" msgstr "ค้นหาตำแหน่งที่ตั้ง" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "ที่หลักๆ" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "ที่คั่นหน้า" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "อื่นๆ" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "เลื่อนขึ้น" @@ -5005,6 +5135,11 @@ msgid "Preferences" msgstr "ปรับแต่ง" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "ไม่มีเครือข่ายที่เลือกเพื่อใช้ร่วม" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5030,21 +5165,53 @@ msgid "Choose a Folder" msgstr "เลือกโฟลเดอร์" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"การแบ่งปันแฟ้มส่วนตัว ช่วยคุณแบ่งปันโฟลเดอร์ \"สาธารณะ\" ของคุณกับผู้อื่นในเครือข่ายปัจจุบันของคุณ " +"โดยใช้: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"เมื่อเปิดใช้การเข้าระบบผ่านเครือข่าย ผู้ใช้จากเครื่องอื่นจะสามารถเชื่อมต่อ โดยใช้คำสั่งเชลล์นิรภัย:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"การแบ่งปันหน้าจอจะเปิดให้ผู้ใช้จากเครื่องอื่นดูหรือควบคุมหน้าจอของคุณ ด้วยการเชื่อมต่อไปยัง: vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "คัดลอก" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "การแบ่งปัน" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "การ­แบ่ง­ปัน" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "ควบคุมสิ่งที่คุณต้องการแบ่งปันกับผู้อื่น" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5052,6 +5219,10 @@ "แบ่งปัน;ใช้ร่วม;ssh;โฮสต์;ชื่อ;แม่ข่าย;เดสก์ท็อป;สื่อ;เสียง;วีดิทัศน์;ภาพ;ภาพถ่าย;ภาพยนตร์;" "เซิร์ฟเวอร์;โปรแกรมวาดแสดง;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "เครือข่าย" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "เปิดหรือปิดการเข้าระบบผ่านเครือข่าย" @@ -5060,103 +5231,79 @@ msgid "Authentication is required to enable or disable remote login" msgstr "ต้องยืนยันตัวบุคคลเพื่อจะเปิดหรือปิดการเข้าระบบผ่านเครือข่าย" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "ไม่มีเครือข่ายที่เลือกเพื่อใช้ร่วม" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "เครือข่าย" - #: ../panels/sharing/sharing.ui.h:1 -msgid "Computer Name" -msgstr "ชื่อเครื่อง" +msgid "_Computer Name" +msgstr "_ชื่อเครื่อง" #: ../panels/sharing/sharing.ui.h:2 -msgid "Personal File Sharing" -msgstr "การแบ่งปันแฟ้มส่วนตัว" +msgid "_File Sharing" +msgstr "การแบ่งปันแ_ฟ้ม" #: ../panels/sharing/sharing.ui.h:3 -msgid "Screen Sharing" -msgstr "การแบ่งปันหน้าจอ" +msgid "_Screen Sharing" +msgstr "การแบ่งปันหน้า_จอ" #: ../panels/sharing/sharing.ui.h:4 -msgid "Media Sharing" -msgstr "การแบ่งปันสื่อ" +msgid "_Media Sharing" +msgstr "การแบ่งปัน_สื่อ" #: ../panels/sharing/sharing.ui.h:5 -msgid "Remote Login" -msgstr "การเข้าระบบผ่านเครือข่าย" +msgid "_Remote Login" +msgstr "การเข้าระบบผ่านเ_ครือข่าย" #: ../panels/sharing/sharing.ui.h:6 msgid "Some services are disabled because of no network access." msgstr "บางบริการถูกปิดใช้เพราะเข้าถึงเครือข่ายไม่ได้" +#: ../panels/sharing/sharing.ui.h:7 +msgid "File Sharing" +msgstr "การแบ่งปันแฟ้ม" + #: ../panels/sharing/sharing.ui.h:8 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"การแบ่งปันแฟ้มส่วนตัว ช่วยคุณแบ่งปันโฟลเดอร์ \"สาธารณะ\" ของคุณกับผู้อื่นในเครือข่ายปัจจุบันของคุณ " -"โดยใช้: dav://%s" +msgid "_Require Password" +msgstr "_ต้องใช้รหัสผ่าน" -#: ../panels/sharing/sharing.ui.h:9 -msgid "Require Password" -msgstr "ต้องใช้รหัสผ่าน" +#: ../panels/sharing/sharing.ui.h:10 +msgid "Remote Login" +msgstr "การเข้าระบบผ่านเครือข่าย" + +#: ../panels/sharing/sharing.ui.h:11 +msgid "Screen Sharing" +msgstr "การแบ่งปันหน้าจอ" #: ../panels/sharing/sharing.ui.h:12 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"อนุญาตให้ผู้ใช้จากเครื่องอื่นเชื่อมต่อ โดยใช้คำสั่งเชลล์นิรภัย:\n" -"ssh %s" +msgid "_Allow connections to control the screen" +msgstr "_อนุญาตให้คู่เชื่อมต่อควบคุมหน้าจอ" + +#: ../panels/sharing/sharing.ui.h:13 +msgid "_Password:" +msgstr "_รหัสผ่าน:" + +#: ../panels/sharing/sharing.ui.h:14 +msgid "_Show Password" +msgstr "แ_สดงรหัสผ่าน" #: ../panels/sharing/sharing.ui.h:15 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"อนุญาตให้ผู้ใช้จากเครื่องอื่นดูหรือควบคุมหน้าจอของคุณ ด้วยการเชื่อมต่อไปยัง: vnc://%s" +msgid "Access Options" +msgstr "ตัวเลือกของการเข้าถึง" #: ../panels/sharing/sharing.ui.h:16 -msgid "Allow Remote Control" -msgstr "อนุญาตให้ควบคุมหน้าจอผ่านเครือข่าย" +msgid "_New connections must ask for access" +msgstr "การเชื่อมต่อใ_หม่ต้องร้องขอการเข้าถึง" #: ../panels/sharing/sharing.ui.h:17 -msgid "Password:" -msgstr "รหัสผ่าน:" +msgid "_Require a password" +msgstr "_ต้องใช้รหัสผ่าน" #: ../panels/sharing/sharing.ui.h:18 -msgid "Show Password" -msgstr "แสดงรหัสผ่าน" +msgid "Media Sharing" +msgstr "การแบ่งปันสื่อ" #: ../panels/sharing/sharing.ui.h:19 -msgid "Access Options" -msgstr "ตัวเลือกของการเข้าถึง" +msgid "Share music, photos and videos over the network." +msgstr "แบ่งปันดนตรี, ภาพถ่าย และวีดิทัศน์ผ่านทางเครือข่าย" #: ../panels/sharing/sharing.ui.h:20 -msgid "New connections must ask for access" -msgstr "การเชื่อมต่อใหม่ต้องถามเพื่อเข้าถึง" - -#: ../panels/sharing/sharing.ui.h:21 -msgid "Require a password" -msgstr "ต้องใช้รหัสผ่าน" - -#: ../panels/sharing/sharing.ui.h:22 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "การแบ่งปันสื่อ ช่วยคุณแบ่งปันดนตรี, ภาพถ่าย และวีดิทัศน์ผ่านทางเครือข่าย" - -#: ../panels/sharing/sharing.ui.h:23 msgid "Folders" msgstr "โฟลเดอร์" @@ -5282,11 +5429,6 @@ msgid "Peak detect" msgstr "ตรวจหายอดคลื่น" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "ชื่อ" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "อุปกรณ์" @@ -5381,16 +5523,21 @@ msgid "Subwoofer" msgstr "ซับวูฟเฟอร์" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "กำหนดเอง" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "การ­เข้า­ถึง­หลาก­หลาย" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "ทำให้ง่ายต่อการเห็น, ได้ยิน, พิมพ์, ชี้ และคลิก" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5415,6 +5562,7 @@ msgstr "อักษร_ขนาดใหญ่" #: ../panels/universal-access/uap.ui.h:5 +#: ../panels/universal-access/zoom-options.ui.h:7 msgid "_Zoom" msgstr "_ขยาย" @@ -5439,12 +5587,12 @@ msgstr "แ_ป้นพิมพ์บนจอ" #: ../panels/universal-access/uap.ui.h:13 -msgid "_Repeat Keys" -msgstr "การซ้ำปุ่_มกด" +msgid "R_epeat Keys" +msgstr "การซ้ำ_ตัวอักษร" #: ../panels/universal-access/uap.ui.h:14 -msgid "_Cursor Blinking" -msgstr "การกะพริบเ_คอร์เซอร์" +msgid "Cursor _Blinking" +msgstr "การ_กะพริบของเคอร์เซอร์" #: ../panels/universal-access/uap.ui.h:15 msgid "_Typing Assist (AccessX)" @@ -5487,8 +5635,8 @@ msgstr "ส่งเสียงปุ่มกด" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "ส่งเสียงบี๊บเมื่อ Num Lock หรือ Caps Lock เปิด" +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "ส่งเสียงบี๊บเมื่อ Num Lock หรือ Caps Lock เปิดหรือปิด" #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5741,37 +5889,33 @@ msgid "Zoom Options" msgstr "ตัวเลือกของการซูม" -#: ../panels/universal-access/zoom-options.ui.h:7 -msgid "Zoom" -msgstr "ซูม" - #: ../panels/universal-access/zoom-options.ui.h:8 -msgid "Magnification:" -msgstr "อัตราขยาย:" +msgid "_Magnification:" +msgstr "_อัตราขยาย:" #: ../panels/universal-access/zoom-options.ui.h:9 -msgid "Follow mouse cursor" -msgstr "ติดตามตัวชี้เมาส์" +msgid "_Follow mouse cursor" +msgstr "_ติดตามตัวชี้เมาส์" #: ../panels/universal-access/zoom-options.ui.h:10 -msgid "Screen part:" -msgstr "ส่วนของหน้าจอ:" +msgid "_Screen part:" +msgstr "_ส่วนของหน้าจอ:" #: ../panels/universal-access/zoom-options.ui.h:11 -msgid "Magnifier extends outside of screen" -msgstr "แว่นขยายขยายขอบเขตออกไปนอกหน้าจอ" +msgid "Magnifier _extends outside of screen" +msgstr "แว่นขยาย_ขยายขอบเขตออกไปนอกหน้าจอ" #: ../panels/universal-access/zoom-options.ui.h:12 -msgid "Keep magnifier cursor centered" -msgstr "รักษาตำแหน่งตัวชี้ของแว่นขยายไว้ตรงกลาง" +msgid "_Keep magnifier cursor centered" +msgstr "_รักษาตำแหน่งตัวชี้ของแว่นขยายไว้ตรงกลาง" #: ../panels/universal-access/zoom-options.ui.h:13 -msgid "Magnifier cursor pushes contents around" -msgstr "ตัวชี้ของแว่นขยายผลักเนื้อหาตามไปด้วย" +msgid "Magnifier cursor _pushes contents around" +msgstr "ตัวชี้ของแว่นขยาย_ผลักเนื้อหาตามไปด้วย" #: ../panels/universal-access/zoom-options.ui.h:14 -msgid "Magnifier cursor moves with contents" -msgstr "ตัวชี้ของแว่นขยายเลื่อนไปตามเนื้อหา" +msgid "Magnifier cursor moves with _contents" +msgstr "ตัวชี้ของแว่นขยายเลื่อนไปตามเ_นื้อหา" #: ../panels/universal-access/zoom-options.ui.h:15 msgid "Magnifier Position:" @@ -5782,8 +5926,8 @@ msgstr "แว่นขยาย" #: ../panels/universal-access/zoom-options.ui.h:17 -msgid "Thickness:" -msgstr "ความหนา:" +msgid "_Thickness:" +msgstr "ความ_หนา:" #: ../panels/universal-access/zoom-options.ui.h:18 msgctxt "universal access, thickness" @@ -5796,43 +5940,43 @@ msgstr "หนา" #: ../panels/universal-access/zoom-options.ui.h:20 -msgid "Length:" -msgstr "ความยาว:" +msgid "_Length:" +msgstr "ความ_ยาว:" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -msgid "Color:" -msgstr "สี:" +msgid "Co_lor:" +msgstr "_สี:" #: ../panels/universal-access/zoom-options.ui.h:23 -msgid "Crosshairs:" -msgstr "เส้นพิกัด:" +msgid "_Crosshairs:" +msgstr "เส้น_พิกัด:" #: ../panels/universal-access/zoom-options.ui.h:24 -msgid "Overlaps mouse cursor" -msgstr "ซ้อนทับกับตัวชี้เมาส์" +msgid "_Overlaps mouse cursor" +msgstr "ซ้อน_ทับกับตัวชี้เมาส์" #: ../panels/universal-access/zoom-options.ui.h:25 msgid "Crosshairs" msgstr "เส้นพิกัด" #: ../panels/universal-access/zoom-options.ui.h:26 -msgid "White on black:" -msgstr "ขาวบนพื้นดำ:" +msgid "_White on black:" +msgstr "_ขาวบนพื้นดำ:" #: ../panels/universal-access/zoom-options.ui.h:27 -msgid "Brightness:" -msgstr "ความสว่าง:" +msgid "_Brightness:" +msgstr "ความส_ว่าง:" #: ../panels/universal-access/zoom-options.ui.h:28 -msgid "Contrast:" -msgstr "ความต่างระดับสี:" +msgid "_Contrast:" +msgstr "ความ_ต่างระดับสี:" #. The contrast scale goes from Color to None (grayscale) #: ../panels/universal-access/zoom-options.ui.h:30 msgctxt "universal access, contrast" -msgid "Color" -msgstr "สี" +msgid "Co_lor" +msgstr "_สี" #: ../panels/universal-access/zoom-options.ui.h:31 msgctxt "universal access, color" @@ -5870,97 +6014,69 @@ #: ../panels/universal-access/zoom-options.ui.h:38 msgid "Color Effects" -msgstr "เอฟเฟ็กต์สี" - -#: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" -msgid "Standard" -msgstr "มาตรฐาน" +msgstr "เอฟเฟ็กต์สี" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" -msgid "Administrator" -msgstr "ผู้ดูแลระบบ" +#: ../panels/user-accounts/data/account-dialog.ui.h:1 +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "เพิ่มผู้ใช้" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 +#: ../panels/user-accounts/data/account-dialog.ui.h:5 msgid "_Full Name" msgstr "ชื่_อเต็ม" -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 -msgid "Account _Type" -msgstr "_ชนิดของบัญชี:" +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +msgid "Standard" +msgstr "มาตรฐาน" #: ../panels/user-accounts/data/account-dialog.ui.h:7 -#: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "อนุญาตให้ผู้ใช้ตั้งรหัสผ่านในครั้งต่อไปที่เข้าระบบ" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +msgid "Administrator" +msgstr "ผู้ดูแลระบบ" #: ../panels/user-accounts/data/account-dialog.ui.h:8 -#: ../panels/user-accounts/data/password-dialog.ui.h:8 -msgid "Set a password now" -msgstr "ตั้งรหัสผ่านเดี๋ยวนี้" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 +msgid "Account _Type" +msgstr "_ชนิดของบัญชี:" #: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_ตรวจสอบ" +msgid "Allow user to set a password when they next _login" +msgstr "อนุญาตให้ผู้ใช้ตั้งรหัสผ่านในครั้งต่อไปที่เ_ข้าระบบ" #: ../panels/user-accounts/data/account-dialog.ui.h:11 -msgid "" -"Enterprise login allows an existing centrally managed user account to be " -"used on this device." -msgstr "บัญชีเข้าระบบองค์กร อนุญาตให้ใช้บัญชีผู้ใช้ที่มีการจัดการแบบรวมศูนย์ที่มีอยู่กับอุปกรณ์นี้" - -#: ../panels/user-accounts/data/account-dialog.ui.h:12 -msgid "_Domain" -msgstr "โ_ดเมน" +msgid "Set a password _now" +msgstr "ตั้งรหัสผ่านเ_ดี๋ยวนี้" #: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "_ยืนยัน" + +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" -"Go online to add\n" -"enterprise login accounts." +"Enterprise login allows an existing centrally managed user account to be " +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"ออนไลน์เพื่อเพิ่ม\n" -"บัญชีเข้าระบบองค์กร" +"บัญชีเข้าระบบองค์กร อนุญาตให้ใช้บัญชีผู้ใช้ที่มีการจัดการแบบรวมศูนย์ที่มีอยู่กับอุปกรณ์นี้ " +"คุณสามารถใช้บัญชีนี้ในการเข้าถึงทรัพยากรของบริษัทในอินเทอร์เน็ตด้วย" #: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "บัญชีเข้าระบบ_องค์กร" +#: ../panels/user-accounts/data/join-dialog.ui.h:9 +msgid "_Domain" +msgstr "โ_ดเมน" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "เพิ่มผู้ใช้" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_ลงทะเบียน" +msgid "You are Offline" +msgstr "คุณออฟไลน์อยู่" -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "การเข้าระบบสำหรับผู้ดูแลโดเมน" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"ในการใช้การเข้าระบบขององค์กร คอมพิวเตอร์นี้จำเป็นต้องลงทะเบียนในโดเมน\n" -"กรุณาขอให้ผู้ดูแลเครือข่ายของคุณป้อนรหัสผ่านโดเมนที่นี่" - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_ชื่อผู้ดูแลระบบ" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "คุณต้องออนไลน์เพื่อเพิ่มผู้ใช้องค์กร" -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "รหัสผ่านผู้ดูแลระบบ" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "บัญชีเข้าระบบ_องค์กร" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -5995,7 +6111,7 @@ msgstr "นิ้วก้อยขวา" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "เปิดใช้การเข้าระบบด้วยลายนิ้วมือ" @@ -6030,9 +6146,31 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "เข้าระบบ;ชื่อ;ลายนิ้วมือ;รูปแทนตัว;โลโก้;รูปหน้า;รหัสผ่าน;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "ประวัติการเข้าระบบ" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_ลงทะเบียน" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "การเข้าระบบสำหรับผู้ดูแลโดเมน" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"ในการใช้การเข้าระบบขององค์กร คอมพิวเตอร์นี้จำเป็นต้องลงทะเบียนในโดเมน\n" +"กรุณาขอให้ผู้ดูแลเครือข่ายของคุณป้อนรหัสผ่านโดเมนที่นี่" + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_ชื่อผู้ดูแลระบบ" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "รหัสผ่านผู้ดูแลระบบ" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6054,35 +6192,31 @@ msgid "Current _Password" msgstr "รหัสผ่าน_ปัจจุบัน" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "เพิ่มบัญชีผู้ใช้" +#: ../panels/user-accounts/data/password-dialog.ui.h:7 +msgid "Allow user to change their password on next login" +msgstr "อนุญาตให้ผู้ใช้เปลี่ยนรหัสผ่านในครั้งต่อไปที่เข้าระบบ" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "ลบบัญชีผู้ใช้" +#: ../panels/user-accounts/data/password-dialog.ui.h:8 +msgid "Set a password now" +msgstr "ตั้งรหัสผ่านเดี๋ยวนี้" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "ตัวเลือกของการเข้าระบบ" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "เ_พิ่มผู้ใช้…" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 msgid "A_utomatic Login" msgstr "การเข้าระบบ_อัตโนมัติ" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "การเข้าระบบด้วย_ลายนิ้วมือ" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "ไอคอนบัญชีผู้ใช้" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 -msgid "_Language" -msgstr "_ภาษา" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "เข้าระบบล่าสุด" @@ -6184,8 +6318,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "ผสมตัวพิมพ์ใหญ่และตัวพิมพ์เล็ก และใช้ตัวเลขสักตัวสองตัว" +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "ผสมตัวพิมพ์ใหญ่และตัวพิมพ์เล็ก และพยายามใช้ตัวเลขสักตัวสองตัว" #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6274,32 +6408,32 @@ msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "ควรจะตรงกับที่อยู่เว็บของผู้ให้บริการบัญชีของคุณ" +msgid "Should match the web address of your login provider." +msgstr "ควรจะตรงกับที่อยู่เว็บของผู้ให้บริการบัญชีเข้าระบบของคุณ" #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "เพิ่มบัญชีไม่สำเร็จ" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "รหัสผ่านไม่ตรงกัน" -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "ลงทะเบียนบัญชีไม่สำเร็จ" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "ไม่มีวิธีการยืนยันตัวบุคคลที่รองรับสำหรับโดเมนนี้" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "เข้าร่วมในโดเมนไม่สำเร็จ" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6307,7 +6441,7 @@ "ชื่อสำหรับเข้าระบบไม่ถูกต้อง\n" "กรุณาลองใหม่" -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6315,14 +6449,24 @@ "รหัสผ่านสำหรับเข้าระบบไม่ถูกต้อง\n" "กรุณาลองใหม่" -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "เข้าระบบในโดเมนไม่สำเร็จ" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "หาโดเมนไม่พบ คุณอาจสะกดผิดหรือไม่?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "มาตรฐาน" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "ผู้ดูแลระบบ" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6340,29 +6484,29 @@ msgid "Enabled" msgstr "เปิดใช้" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "จะลบลายนิ้วมือที่ลงทะเบียนไว้หรือไม่?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_ลบลายนิ้วมือ" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "คุณต้องการลบลายนิ้วมือของคุณเองที่ได้ลงทะเบียนไว้ เพื่อปิดการเข้าระบบด้วยลายนิ้วมือหรือไม่?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "เสร็จแล้ว!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "ไม่สามารถเข้าใช้อุปกรณ์ '%s'" @@ -6370,16 +6514,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "ไม่สามารถเริ่มอ่านลายนิ้วมือที่อุปกรณ์ '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "ไม่สามารถเข้าใช้เครื่องอ่านลายนิ้วมือใดๆ ได้เลย" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อขอความช่วยเหลือ" @@ -6388,7 +6532,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6396,19 +6540,19 @@ msgstr "" "ในการเปิดใช้การเข้าระบบด้วยลายนิ้วมือ คุณต้องบันทึกลายนิ้วมือของคุณก่อน โดยใช้อุปกรณ์ '%s'" -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "เลือกนิ้ว" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "เก็บลายนิ้วมือ" -#: ../panels/user-accounts/um-history-dialog.c:68 +#: ../panels/user-accounts/um-history-dialog.c:70 msgid "This Week" msgstr "สัปดาห์นี้" -#: ../panels/user-accounts/um-history-dialog.c:71 +#: ../panels/user-accounts/um-history-dialog.c:73 msgid "Last Week" msgstr "สัปดาห์ที่แล้ว" @@ -6416,22 +6560,22 @@ #. shown as the first day of a week on login history dialog. #. Translators: This is a date format string in the style of "Feb 24", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:77 -#: ../panels/user-accounts/um-history-dialog.c:81 +#: ../panels/user-accounts/um-history-dialog.c:79 +#: ../panels/user-accounts/um-history-dialog.c:83 msgctxt "login history week label" msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013", #. shown as the last day of a week on login history dialog. -#: ../panels/user-accounts/um-history-dialog.c:86 +#: ../panels/user-accounts/um-history-dialog.c:88 msgctxt "login history week label" msgid "%b %e, %Y" msgstr "%e %b %Ey" #. Translators: This indicates a week label on a login history. #. The first %s is the first day of a week, and the second %s the last day. -#: ../panels/user-accounts/um-history-dialog.c:91 +#: ../panels/user-accounts/um-history-dialog.c:93 #, c-format msgctxt "login history week label" msgid "%s - %s" @@ -6439,29 +6583,36 @@ #. Translators: This is a time format string in the style of "22:58". #. It indicates a login time which follows a date. -#: ../panels/user-accounts/um-history-dialog.c:175 -#: ../panels/user-accounts/um-user-panel.c:844 +#: ../panels/user-accounts/um-history-dialog.c:177 +#: ../panels/user-accounts/um-user-panel.c:841 msgctxt "login date-time" msgid "%k:%M" msgstr "%k:%M" #. Translators: This indicates a login date-time. #. The first %s is a date, and the second %s a time. -#: ../panels/user-accounts/um-history-dialog.c:178 -#: ../panels/user-accounts/um-user-panel.c:848 +#: ../panels/user-accounts/um-history-dialog.c:180 +#: ../panels/user-accounts/um-user-panel.c:845 #, c-format msgctxt "login date-time" msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:247 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "วาระสิ้นสุด" -#: ../panels/user-accounts/um-history-dialog.c:253 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "วาระเริ่มต้น" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - ความเคลื่อนไหวของบัญชี" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "กรุณาตั้งรหัสผ่านใหม่" @@ -6523,91 +6674,91 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "ไม่สามารถเชื่อมต่อกับโดเมน %s: %s" -#: ../panels/user-accounts/um-user-panel.c:240 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "บัญชีอื่นๆ" -#: ../panels/user-accounts/um-user-panel.c:450 +#: ../panels/user-accounts/um-user-panel.c:447 msgid "Failed to delete user" msgstr "ลบผู้ใช้ไม่สำเร็จ" -#: ../panels/user-accounts/um-user-panel.c:510 -#: ../panels/user-accounts/um-user-panel.c:569 -#: ../panels/user-accounts/um-user-panel.c:621 +#: ../panels/user-accounts/um-user-panel.c:507 +#: ../panels/user-accounts/um-user-panel.c:566 +#: ../panels/user-accounts/um-user-panel.c:618 msgid "Failed to revoke remotely managed user" msgstr "เพิกถอนผู้ใช้ที่จัดการผ่านเครือข่ายไม่สำเร็จ" -#: ../panels/user-accounts/um-user-panel.c:677 +#: ../panels/user-accounts/um-user-panel.c:674 msgid "You cannot delete your own account." msgstr "คุณจะลบบัญชีของคุณเองไม่ได้" -#: ../panels/user-accounts/um-user-panel.c:686 +#: ../panels/user-accounts/um-user-panel.c:683 #, c-format msgid "%s is still logged in" msgstr "%s ยังคงเข้าระบบอยู่" -#: ../panels/user-accounts/um-user-panel.c:690 +#: ../panels/user-accounts/um-user-panel.c:687 msgid "" "Deleting a user while they are logged in can leave the system in an " "inconsistent state." msgstr "การลบบัญชีผู้ใช้ในระหว่างที่ผู้ใช้นั้นกำลังเข้าระบบอยู่ จะทำให้ระบบอยู่ในสถานะที่สับสน" -#: ../panels/user-accounts/um-user-panel.c:699 +#: ../panels/user-accounts/um-user-panel.c:696 #, c-format msgid "Do you want to keep %s's files?" msgstr "คุณต้องการเก็บรักษาแฟ้มต่างๆ ของ %s ไว้หรือไม่?" -#: ../panels/user-accounts/um-user-panel.c:703 +#: ../panels/user-accounts/um-user-panel.c:700 msgid "" "It is possible to keep the home directory, mail spool and temporary files " "around when deleting a user account." msgstr "ในการลบบัญชีผู้ใช้ คุณสามารถเก็บรักษาไดเรกทอรีบ้าน, ถุงเมล และแฟ้มชั่วคราวของผู้ใช้ไว้ได้" -#: ../panels/user-accounts/um-user-panel.c:706 +#: ../panels/user-accounts/um-user-panel.c:703 msgid "_Delete Files" msgstr "_ลบแฟ้ม" -#: ../panels/user-accounts/um-user-panel.c:707 +#: ../panels/user-accounts/um-user-panel.c:704 msgid "_Keep Files" msgstr "เ_ก็บรักษาแฟ้ม" -#: ../panels/user-accounts/um-user-panel.c:721 +#: ../panels/user-accounts/um-user-panel.c:718 #, c-format msgid "Are you sure you want to revoke remotely managed %s's account?" msgstr "ยืนยันที่จะเพิกถอนบัญชีของ %s ที่จัดการผ่านเครือข่ายหรือไม่?" -#: ../panels/user-accounts/um-user-panel.c:725 +#: ../panels/user-accounts/um-user-panel.c:722 msgid "_Delete" msgstr "_ลบ" -#: ../panels/user-accounts/um-user-panel.c:777 +#: ../panels/user-accounts/um-user-panel.c:774 msgctxt "Password mode" msgid "Account disabled" msgstr "บัญชีถูกระงับ" -#: ../panels/user-accounts/um-user-panel.c:785 +#: ../panels/user-accounts/um-user-panel.c:782 msgctxt "Password mode" msgid "To be set at next login" msgstr "รอตั้งรหัสผ่านในครั้งต่อไปที่เข้าระบบ" -#: ../panels/user-accounts/um-user-panel.c:788 +#: ../panels/user-accounts/um-user-panel.c:785 msgctxt "Password mode" msgid "None" msgstr "ไม่มีรหัสผ่าน" -#: ../panels/user-accounts/um-user-panel.c:837 +#: ../panels/user-accounts/um-user-panel.c:834 msgid "Logged in" msgstr "เข้าระบบ" -#: ../panels/user-accounts/um-user-panel.c:1275 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "ติดต่อบริการบัญชีผู้ใช้ไม่สำเร็จ" -#: ../panels/user-accounts/um-user-panel.c:1277 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "กรุณาตรวจสอบให้แน่ใจว่าได้ติดตั้งและเปิดใช้งาน AccountService" -#: ../panels/user-accounts/um-user-panel.c:1318 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6615,12 +6766,12 @@ "หากต้องการเปลี่ยนแปลง\n" "ให้คลิกที่ไอคอน * ก่อน" -#: ../panels/user-accounts/um-user-panel.c:1356 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "สร้างบัญชีผู้ใช้" -#: ../panels/user-accounts/um-user-panel.c:1367 -#: ../panels/user-accounts/um-user-panel.c:1679 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6628,12 +6779,12 @@ "หากต้องการสร้างบัญชีผู้ใช้\n" "ให้คลิกที่ไอคอน * ก่อน" -#: ../panels/user-accounts/um-user-panel.c:1377 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "ลบบัญชีผู้ใช้ที่เลือก" -#: ../panels/user-accounts/um-user-panel.c:1389 -#: ../panels/user-accounts/um-user-panel.c:1684 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6641,46 +6792,34 @@ "หากต้องการลบบัญชีผู้ใช้ที่เลือก\n" "ให้คลิกที่ไอคอน * ก่อน" -#: ../panels/user-accounts/um-user-panel.c:1593 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "บัญชีของฉัน" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "มีผู้ใช้ชื่อ '%s' อยู่ก่อนแล้ว" +msgid "Sorry, that user name isn't available. Please try another." +msgstr "ขออภัย ชื่อผู้ใช้นี้ถูกใช้ไปแล้ว กรุณาลองหาชื่ออื่น" -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "ชื่อผู้ใช้ยาวเกินไป" -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "ชื่อผู้ใช้ขึ้นต้นด้วย '-' ไม่ได้" -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"ชื่อผู้ใช้ควรประกอบด้วยตัวพิมพ์เล็กและตัวพิมพ์ใหญ่ตั้งแต่ a-z, ตัวเลข และอักขระ '.', '-' และ " -"'_' เท่านั้น" +"ชื่อผู้ใช้ควรประกอบด้วยตัวพิมพ์ใหญ่และตัวพิมพ์เล็กตั้งแต่ a-z, ตัวเลข และอักขระต่อไปนี้เท่านั้น: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "ชื่อนี้จะนำมาใช้เป็นชื่อโฟลเดอร์บ้านของคุณ และไม่สามารถเปลี่ยนแปลงได้" -#. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/user-accounts/um-utils.c:823 -msgid "%b %e" -msgstr "%e %b" - -#. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/user-accounts/um-utils.c:827 -msgid "%b %e, %Y" -msgstr "%e %b %Ey" - #: ../panels/wacom/button-mapping.ui.h:1 msgid "Map Buttons" msgstr "กำหนดปุ่ม" @@ -6764,17 +6903,17 @@ msgid "Button" msgstr "ปุ่ม" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "แท็บเล็ต Wacom" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "แท็บ­เล็ต Wa­com" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "ตั้งผังปุ่มและปรับความไวของสไตลัสสำหรับแท็บเล็ตกราฟิก" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "แท็บเล็ต;Wacom;ปากกา;สไตลัส;ยางลบ;เมาส์;" @@ -6806,6 +6945,10 @@ msgid "Bluetooth Settings" msgstr "ตั้งค่าบลูทูท" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "แท็บเล็ต Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "ปรับตำแหน่งกับจอภาพ…" @@ -6814,6 +6957,10 @@ msgid "Map Buttons…" msgstr "กำหนดปุ่ม…" +#: ../panels/wacom/gnome-wacom-properties.ui.h:12 +msgid "Calibrate…" +msgstr "เทียบมาตรฐาน…" + #: ../panels/wacom/gnome-wacom-properties.ui.h:13 msgid "Adjust display resolution" msgstr "ปรับความละเอียดการแสดงผล" @@ -6895,22 +7042,22 @@ msgid "Mode Switch #%d" msgstr "ปุ่มเปลี่ยนโหมด #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "ปุ่มซ้าย #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "ปุ่มขวา #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "ปุ่มบน #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "ปุ่มล่าง #%d" @@ -6987,6 +7134,11 @@ msgid "Tip Pressure Feel" msgstr "การรับแรงกดของปลายปากกา" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "ค่าตั้งทั้งหมด" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "ศูนย์ควบคุมของ GNOME" @@ -7037,26 +7189,22 @@ msgid "Help" msgstr "วิธีใช้" -#: ../shell/cc-application.c:253 ../shell/help-overlay.ui.h:2 +#: ../shell/cc-application.c:253 msgid "Quit" msgstr "ออก" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1494 -msgid "All Settings" -msgstr "ค่าตั้งทั้งหมด" - #. Add categories -#: ../shell/cc-window.c:880 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "ส่วนบุคคล" -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "ฮาร์ดแวร์" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "ระบบ" @@ -7065,20 +7213,263 @@ msgid "Preferences;Settings;" msgstr "ปรับแต่ง;ตั้งค่า;" +#: ../shell/help-overlay.ui.h:1 +msgctxt "shortcut window" +msgid "General" +msgstr "ทั่วไป" + +#: ../shell/help-overlay.ui.h:2 +msgctxt "shortcut window" +msgid "Quit" +msgstr "ออก" + +#: ../shell/help-overlay.ui.h:3 +msgctxt "shortcut window" +msgid "Search" +msgstr "ค้นหา" + #: ../shell/help-overlay.ui.h:4 +msgctxt "shortcut window" msgid "Panels" msgstr "พาเนล" #: ../shell/help-overlay.ui.h:5 +msgctxt "shortcut window" msgid "Go back to the overview" msgstr "ย้อนกลับไปยังภาพรวม" #: ../shell/help-overlay.ui.h:6 +msgctxt "shortcut window" msgid "Cancel search" msgstr "ยกเลิกการค้นหา" -#~ msgid "Two Finger Scrolling" -#~ msgstr "เลื่อนหน้าจอด้วยสองนิ้ว" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "จุดแพร่สัญญาณ" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "ปุ่มลัดสำหรับ %s กดปุ่มลัดใหม่เพื่อเปลี่ยนแปลง" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "ถ้าต้องการแก้ไขปุ่มลัด คลิกที่รายการที่ต้องการแล้วกดปุ่มลัดชุดใหม่ หรือกดปุ่ม Backspace " +#~ "ถ้าต้องการล้างปุ่มลัด" + +#~ msgid "Done" +#~ msgstr "เสร็จสิ้น" + +#~ msgid "Color" +#~ msgstr "สี" + +#~ msgid "Time _Zone" +#~ msgstr "เ_ขตเวลา" + +#~ msgid "_Name:" +#~ msgstr "_ชื่อ:" + +#~ msgid "Add Shortcut" +#~ msgstr "เพิ่มปุ่มลัด" + +#~ msgid "Remove Shortcut" +#~ msgstr "ลบปุ่มลัด" + +#~ msgid "" +#~ msgstr "<ปฏิบัติการที่ไม่รู้จัก>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "ไม่สามารถใช้ปุ่มลัด \"%s\" ได้ เพราะจะทำให้ใช้ปุ่มนี้ป้อนข้อความไม่ได้\n" +#~ "กรุณาใช้ปุ่มอย่าง Control, Alt หรือ Shift ประกอบด้วย" + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "ปุ่มลัด \"%s\" ถูกใช้อยู่แล้วสำหรับ\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "ถ้าคุณกำหนดปุ่มลัดนี้ซ้ำให้เป็น \"%s\" ปุ่มลัด \"%s\" ก็จะถูกปิดไป" + +#~ msgid "_Reassign" +#~ msgstr "_กำหนดซ้ำ" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "ปุ่มลัด \"%s\" มีปุ่มลัด \"%s\" ที่เชื่อมโยงกันอยู่ คุณต้องการกำหนดปุ่มลัดดังกล่าวเป็น \"%s\" " +#~ "โดยอัตโนมัติหรือไม่?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "ขณะนี้ \"%s\" เชื่อมโยงกับ \"%s\" อยู่ ปุ่มลัดนี้จะถูกปิดถ้าคุณดำเนินการต่อไป" + +#~ msgid "_Assign" +#~ msgstr "_กำหนด" + +#~ msgid "Bond" +#~ msgstr "บอนด์" + +#~ msgid "Team" +#~ msgstr "ทีม" + +#~ msgid "Bridge" +#~ msgstr "บริดจ์" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "ไม่สามารถโหลดปลั๊กอิน VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "เพิ่มการเชื่อมต่อเครือข่าย" + +#~ msgid "Bond slaves" +#~ msgstr "หน่วยลูกของบอนด์" + +#~ msgid "(none)" +#~ msgstr "(ไม่มี)" + +#~ msgid "Bridge slaves" +#~ msgstr "หน่วยลูกของบริดจ์" + +#~ msgid "Team slaves" +#~ msgstr "หน่วยลูกของทีม" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "อุปกรณ์ InfiniBand ไม่รองรับโหมดเชื่อมต่อ" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "ไม่ได้เลือกใบรับรองจากองค์กรออกใบรับรอง" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "การไม่ใช้ใบรับรองจากองค์กรออกใบรับรอง (CA) อาจทำให้การเชื่อมต่อไม่นิรภัย " +#~ "หรือได้พบกับเครือข่าย Wi-Fi ที่ไม่ประสงค์ดี " +#~ "คุณต้องการเลือกใบรับรองจากองค์กรออกใบรับรองหรือไม่?" + +#~ msgid "Ignore" +#~ msgstr "ไม่สนใจ" + +#~ msgid "Choose CA Certificate" +#~ msgstr "เลือกใบรับรอง CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "_ถามรหัสผ่านทุกครั้ง" + +#~ msgid "Don't _warn me again" +#~ msgstr "ไ_ม่ต้องเตือนฉันอีก" + +#~ msgid "No" +#~ msgstr "ไม่" + +#~ msgid "Yes" +#~ msgstr "ใช่" + +#~ msgid "Error logging into the account" +#~ msgstr "เกิดข้อผิดพลาดขณะเข้าระบบด้วยบัญชีนี้" + +#~ msgid "Credentials have expired." +#~ msgstr "ข้อมูลลับหมดอายุแล้ว" + +#~ msgid "Sign in to enable this account." +#~ msgstr "เข้าระบบเพื่อเปิดใช้บัญชีนี้" + +#~ msgid "_Sign In" +#~ msgstr "เ_ข้าระบบ" + +#~ msgid "Power" +#~ msgstr "พลังงาน" + +#~ msgid "Active Jobs" +#~ msgstr "งานพิมพ์ที่ทำงานอยู่" + +#~ msgid "Close" +#~ msgstr "ปิด" + +#~ msgid "Resume Printing" +#~ msgstr "พิมพ์ต่อ" + +#~ msgid "Pause Printing" +#~ msgstr "พักการพิมพ์" + +#~ msgid "Cancel Print Job" +#~ msgstr "ยกเลิกงานพิมพ์" + +#~ msgctxt "print job" +#~ msgid "Held" +#~ msgstr "เข้าแถวคอย" + +#~ msgid "Job Title" +#~ msgstr "ชื่องานพิมพ์" + +#~ msgid "Job State" +#~ msgstr "สถานะงานพิมพ์" + +#~ msgid "Time" +#~ msgstr "เวลา" + +#~ msgid "Privacy" +#~ msgstr "ความเป็นส่วนตัว" + +#~ msgid "Used to determine your geographical location" +#~ msgstr "ใช้กำหนดตำแหน่งที่ตั้งทางภูมิศาสตร์ของคุณ" + +#~ msgid "Options" +#~ msgstr "ตัวเลือก" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "อื่นๆ" + +#~ msgid "Allow Remote Control" +#~ msgstr "อนุญาตให้ควบคุมหน้าจอผ่านเครือข่าย" + +#~ msgid "Password:" +#~ msgstr "รหัสผ่าน:" + +#~ msgid "_Repeat Keys" +#~ msgstr "การซ้ำปุ่_มกด" + +#~ msgid "_Cursor Blinking" +#~ msgstr "การกะพริบเ_คอร์เซอร์" + +#~ msgid "Zoom" +#~ msgstr "ซูม" + +#~ msgctxt "universal access, contrast" +#~ msgid "Color" +#~ msgstr "สี" + +#~ msgid "_Verify" +#~ msgstr "_ตรวจสอบ" + +#~ msgid "Login History" +#~ msgstr "ประวัติการเข้าระบบ" + +#~ msgid "Add User Account" +#~ msgstr "เพิ่มบัญชีผู้ใช้" + +#~ msgid "Remove User Account" +#~ msgstr "ลบบัญชีผู้ใช้" + +#~ msgid "Login Options" +#~ msgstr "ตัวเลือกของการเข้าระบบ" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "มีผู้ใช้ชื่อ '%s' อยู่ก่อนแล้ว" #~ msgid "_Delay:" #~ msgstr "ร_อ:" @@ -7197,9 +7588,6 @@ #~ msgid "Power off" #~ msgstr "ปิดเครื่อง" -#~ msgid "Flickr" -#~ msgstr "Flickr" - #~ msgid "Set Up New Device" #~ msgstr "ตั้งค่าอุปกรณ์ชิ้นใหม่" @@ -7676,9 +8064,6 @@ #~ msgid "The current password is not correct" #~ msgstr "รหัสผ่านปัจจุบันที่ป้อนไม่ถูกต้อง" -#~ msgid "Wrong password" -#~ msgstr "รหัสผ่านไม่ถูกต้อง" - #~ msgid "Switch Modes" #~ msgstr "สลับโหมด" @@ -7805,9 +8190,6 @@ #~ msgid "Select a language" #~ msgstr "เลือกภาษา" -#~ msgid "_Select" -#~ msgstr "เ_ลือก" - #~ msgid "Date and Time preferences panel" #~ msgstr "แผงปรับแต่งวันที่และเวลา" @@ -7862,9 +8244,6 @@ #~ msgid "C_reate..." #~ msgstr "_สร้าง..." -#~ msgid "_Configure..." -#~ msgstr "_ตั้งค่า..." - #~ msgid "Wireless Hotspot" #~ msgstr "จุดแพร่_สัญญาณไร้สาย" @@ -7937,10 +8316,6 @@ #~ msgid "Suspend when inactive for" #~ msgstr "พักเครื่องเมื่อไม่มีการใช้งานเป็นเวลา" -#~ msgctxt "printer state" -#~ msgid "Paused" -#~ msgstr "พักพิมพ์" - #~ msgid "Change printer settings" #~ msgstr "ตั้งค่าเครื่องพิมพ์" @@ -8159,9 +8534,6 @@ #~ msgid "Take a screenshot" #~ msgstr "จับภาพหน้าจอ" -#~ msgid "Shortcut" -#~ msgstr "ปุ่มลัด" - #~ msgid "A_cceleration:" #~ msgstr "ความเร่_ง:" @@ -8400,9 +8772,6 @@ #~ msgid "The type of accelerator." #~ msgstr "ชนิดของปุ่มลัด" -#~ msgid "Error saving the new shortcut" -#~ msgstr "เกิดข้อผิดพลาดขณะบันทึกปุ่มลัด" - #~ msgid "Too many custom shortcuts" #~ msgstr "ปุ่มลัดที่กำหนดเองมีมากเกินไป" diff -Nru gnome-control-center-3.20.2/po/tr.po gnome-control-center-3.22.1/po/tr.po --- gnome-control-center-3.20.2/po/tr.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/tr.po 2016-09-08 11:48:12.000000000 +0000 @@ -15,19 +15,18 @@ "Project-Id-Version: gnome-control-center\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-19 08:45+0000\n" -"PO-Revision-Date: 2016-03-19 21:45+0200\n" +"POT-Creation-Date: 2016-08-30 15:17+0000\n" +"PO-Revision-Date: 2016-09-04 22:07+0300\n" "Last-Translator: Muhammet Kara \n" -"Language-Team: Turkish \n" -"Language: tr_TR\n" +"Language-Team: Türkçe \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../panels/background/background.ui.h:1 -#| msgid "Background" msgid "_Background" msgstr "_Arka Plan" @@ -38,7 +37,6 @@ #. To translators: This is a noun, not a verb #: ../panels/background/background.ui.h:5 -#| msgid "Lock Screen" msgid "_Lock Screen" msgstr "Ki_lit Ekranı" @@ -98,7 +96,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Ev" @@ -115,26 +113,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 -#: ../panels/region/format-chooser.ui.h:3 -#: ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/privacy/cc-privacy-panel.c:1048 +#: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -143,7 +139,6 @@ msgstr "_İptal" #: ../panels/background/cc-background-chooser-dialog.c:581 -#| msgid "Select" msgid "_Select" msgstr "_Seç" @@ -166,16 +161,17 @@ msgid "Current background" msgstr "Geçerli arkaplan" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Arkaplan" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Arkaplan resminizi duvar kağıdıyla veya fotoğrafla değiştirin" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Duvar kağıdı;Ekran;Masaüstü;" @@ -215,18 +211,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Bluetooth'u etkinleştirmek için Uçak kipini kapatın." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Bluetooth'u açıp kapatın ve aygıtlarınızı bağlayın" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "paylaş;paylaşım;bluetooth;obex;" @@ -400,7 +395,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Tüm dosyalar" @@ -440,7 +435,7 @@ msgstr "Profili Kaydet" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Kaydet" @@ -550,13 +545,11 @@ #. This starts the calibration process #: ../panels/color/color-calibrate.ui.h:4 -#| msgid "Start" msgid "_Start" msgstr "_Başlat" #. This resumes the calibration process #: ../panels/color/color-calibrate.ui.h:6 -#| msgid "Resume" msgid "_Resume" msgstr "_Sürdür" @@ -699,7 +692,7 @@ "kullanacağınıza dair bu yönergeleri faydalı bulabilirsiniz." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Özet" @@ -708,16 +701,14 @@ msgstr "Profil ekle" #: ../panels/color/color.ui.h:29 -#| msgid "Import File…" msgid "_Import File…" msgstr "Dosyayı _İçe Aktar…" #: ../panels/color/color.ui.h:31 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Ekle" @@ -743,7 +734,6 @@ msgstr "Renk yönetimi hakkında daha fazla bilgi edinin" #: ../panels/color/color.ui.h:36 -#| msgid "Set for all users" msgid "_Set for all users" msgstr "Tüm kullanıcılar için _ayarla" @@ -752,17 +742,14 @@ msgstr "Bu profili bilgisayardaki tüm kullanıcılar için geçerli yap" #: ../panels/color/color.ui.h:38 -#| msgid "Enable" msgid "_Enable" msgstr "_Etkinleştir" #: ../panels/color/color.ui.h:39 -#| msgid "Add profile" msgid "_Add profile" msgstr "Profil _ekle" #: ../panels/color/color.ui.h:40 -#| msgid "Calibrate…" msgid "_Calibrate…" msgstr "_Kalibrasyon…" @@ -771,12 +758,10 @@ msgstr "Aygıtı kalibre et" #: ../panels/color/color.ui.h:42 -#| msgid "Remove profile" msgid "_Remove profile" msgstr "Profili kaldı_r" #: ../panels/color/color.ui.h:43 -#| msgid "View details" msgid "_View details" msgstr "Ayrıntıları _görüntüle" @@ -872,18 +857,19 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Renk" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" "Ekran, kamera veya yazıcı gibi aygıtlarınızın renk kalibrasyonunu yapın." #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Renk;ICC;Profil;Ayar;Yazıcı;Görünüm;" @@ -901,23 +887,23 @@ msgid "No languages found" msgstr "Dil bulunamadı" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Bugün" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Dün" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b, %Y" @@ -1037,8 +1023,9 @@ msgid "December" msgstr "Aralık" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Tarih & Saat" @@ -1080,7 +1067,6 @@ msgstr "Tarih & _Saat" #: ../panels/datetime/datetime.ui.h:24 -#| msgid "Time Zone" msgid "Time Z_one" msgstr "Saat _Dilimi" @@ -1096,12 +1082,12 @@ msgid "AM / PM" msgstr "ÖÖ / ÖS" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Tarihi, saati ve saat dilimini değiştirin" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Saat;Saat Dilimi;Yer;Konum;" @@ -1115,209 +1101,224 @@ "Saat ya da tarih ayarlarını değiştirmek için kimliğinizi doğrulamanız " "gerekiyor." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Kapat Kapatıldı" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Aynalandı" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Birincil" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Kapalı" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "İkincil" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Birleştirilmiş Ekranları Düzenle" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "Uygul_a" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Düzenlemek için ekranları sürükleyin" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Saat yönünün tersine 90° döndür" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "180° döndür" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Saat yönünde 90° döndür" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Boyut" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "En-Boy Oranı" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Çözünürlük" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "TV için Ayarla" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Tazeleme Hızı" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Üst çubuğu ve Etkinlikler Genel Görünümünü bu ekranda göster" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "İkincil Ekran" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Ek çalışma alanı oluşturmak için bu ekranla başka birini birleştir" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Sunum" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Sadece slayt gösterilerini ve ortamı göster" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Aynala" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Varolan görüntünüzü her iki ekranda gösterin" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Kapat" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Bu ekranı kullanma" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Ekran bilgisi alınamadı" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "Birleştirilmiş Ekranları _Düzenle" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "Ekranlar" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Bağlanan ekranların ya da projektörlerin nasıl kullanılacağını seçin" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;Projektör;Ekran;" "Çözünürlük;Tazele;Yenile;Monitör;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Bilinmeyen" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (İnşa Kimliği: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (İnşa Kimliği: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bit" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bit" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Yapılacak şeyi sor" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Hiçbir şey yapma" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Klasör aç" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Diğer Ortamlar" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Ses CD'leri için bir uygulama seçin" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Video DVD'leri için bir uygulama seçin" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Müzik çalar bağlandığında çalıştırılacak uygulamayı seçin" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Kamera bağlandığında çalıştırılacak uygulamayı seçin" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Yazılım CD'leri için bir uygulama seçin" @@ -1326,88 +1327,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "ses DVD'si" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "boş Blu-ray diski" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "boş CD diski" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "boş DVD diski" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "boş HD DVD diski" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray video diski" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-kitap okuyucu" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD video diski" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Resim CD'si" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Süper Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows yazılımı" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Bölüm" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Genel Görünüm" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Öntanımlı Uygulamalar" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Çıkarılabilir Ortam" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Sürüm %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Ayrıntılar" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Sisteminiz hakkında bilgi edinin" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1581,8 +1580,9 @@ msgid "Launch help browser" msgstr "Yardım tarayıcısını çalıştır" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Ayarlar" @@ -1655,7 +1655,6 @@ msgstr "Ekranları kilitle" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Evrensel Erişim" @@ -1691,11 +1690,21 @@ msgid "High contrast on or off" msgstr "Yüksek karşıtlık açık ya da kapalı" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Özel Kısayollar" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:417 +#: ../panels/keyboard/shortcut-editor.ui.h:1 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1722,42 +1731,47 @@ msgid "Modifiers-only switch to next source" msgstr "Sonraki kaynağa sadece değiştirgelerle geçiş" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Klavye" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Kısayolu öntanımlı değerine sıfırla" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:308 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s zaten %s için kullanılıyor. Eğer yerine başka bir şey koyarsanız, " +"%s devre dışı bırakılacak" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:444 +#, c-format +msgid "Keyboard shortcut for %s. Enter new shortcut to change." +msgstr "%s için klavye kısayolu. Değiştirmek için yeni kısayol girin." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:799 +#| msgid "Custom Shortcut" +msgid "Add Custom Shortcut" +msgstr "Özel Kısayol Ekle" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Klavye" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Klavye kısayollarını görün ve değiştirin ayrıca yazım tercihlerinizi " "belirleyin" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Kısayol;Tekrar;Kırpma;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Özel Kısayol" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_İsim:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "K_omut:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Kısayol Ekle" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Kısayolu Kaldır" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 msgid "" "To edit a shortcut, click the row and hold down the new keys or press " "Backspace to clear." @@ -1765,78 +1779,78 @@ "Bir kısayolu düzenlemek için, ilgili satıra tıklayın ve tuşlara ya da " "temizlemek için Backspace tuşuna basın." -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Özel Kısayollar" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#| msgid "Keyboard Shortcuts" +msgid "No keyboard shortcut found" +msgstr "Klavye kısayolu bulunamadı" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:3 +msgid "Try a different search" +msgstr "Farklı bir arama deneyin" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Kısayol tuşu \"%s\" kullanılamıyor çünkü kullanımı halinde bu tuş " -"kullanılarak yazmak mümkün olmayacak.\n" -"Lütfen Control, Alt ya da Shift gibi tuşlar ile aynı anda deneyin." +#: ../panels/keyboard/shortcut-editor.ui.h:2 +#: ../panels/network/connection-editor/ce-page-reset.c:78 +#: ../panels/network/network-wifi.ui.h:51 +msgid "Reset" +msgstr "Sıfırla" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"\"%s\" kısayolu zaten kullanılıyor:\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "İsim" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "" -"Eğer kısayolu \"%s\" olarak tekrar atarsanız, \"%s\" kısayolu " -"etkinsizleştirilecek." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +#| msgid "C_ommand:" +msgid "Command" +msgstr "Komut" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +#| msgid "Shortcuts" +msgid "Shortcut" +msgstr "Kısayol" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Düzenle" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "Tek_rar ata" +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Hiçbiri" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"\"%s\" kısayoluyla ilişkili bir \"%s\" kısayolu var. Otomatik olarak \"%s\"e " -"ayarlamak ister misiniz?" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#| msgid "_Remove" +msgid "Remove" +msgstr "Kaldır" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" şu anda \"%s\" ile ilişkilendirilmiş; eğer devam ederseniz, bu " -"kısayol devre dışı bırakılacak." +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "İptal" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Ekle" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Ata" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#| msgid "_Replace" +msgid "Replace" +msgstr "Yerine Koy" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Ayarlarınızı Sınayın" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Fare & Touchpad" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Fare ve Dokunmatik Yüzey" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "" @@ -1844,7 +1858,7 @@ "elle kullanımı ayarlayın" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Trackpad;İşaretçi;Tıklama;Vurma;Çift;Düğme;Trackball;Kaydırma;" @@ -1903,6 +1917,11 @@ msgstr "Tıklamak için Dokun" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +#| msgid "Two Finger Scrolling" +msgid "Two-finger Scrolling" +msgstr "İki Parmak Kaydırma" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Kenar Kaydırma" @@ -1941,11 +1960,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Uçak Ki_pi" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Ağ Vekili" @@ -1953,17 +1972,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "Aahh, birşeyler ters gitti. Lütfen yazılım satıcınıza başvurun." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "NetworkManager'ın çalışıyor olması gerekir." @@ -1979,7 +1998,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1996,238 +2015,238 @@ msgid "page 2" msgstr "sayfa 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Güvenlik" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "otomatik" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Profil %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Kurumsal" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Hiçbiri" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Asla" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i gün önce" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/sn" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Yok" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Zayıf" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "İyi" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "İyi" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Mükemmel" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Ayrıntılar" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Kimlik" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Adres" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Ağ maskesi" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Geçit" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Adresi Sil" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Ekle" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Sunucu" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "DNS Sunucuyu Sil" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metrik" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Rotayı Sil" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Otomatik (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Elle" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Sadece Yerel Bağlantı" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Ön ek" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Otomatik" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Otomatik, sadece DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 -#: ../panels/network/network-wifi.ui.h:51 -msgid "Reset" -msgstr "Sıfırla" - -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Hiçbiri" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-bit Anahtar (Onaltılık veya ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-bit Parola" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Dinamik WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Kişisel" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA & WPA2 Kurumsal" @@ -2242,30 +2261,30 @@ msgstr "Hat hızı" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 Adresi" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 Adresi" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Donanım Adresi" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2275,7 +2294,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2358,13 +2377,13 @@ msgid "Firewall _Zone" msgstr "Güvenlik Duvarı _Bölgesi" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Öntanımlı" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Bölge; bağlantının güvenilirlik düzeyini tanımlar" @@ -2406,45 +2425,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Bağlantı düzenleyicisi açılamadı" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Yeni Profil" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bağla" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Takım" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Köprü" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "VPN eklentileri yüklenemedi" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Dosyadan içe aktar..." -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Ağ Bağlantısı Ekle" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "VPN Ekle" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2452,7 +2451,7 @@ msgstr "Sıfı_rla" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Unut" @@ -2476,11 +2475,11 @@ msgid "S_ecurity" msgstr "Güv_enlik" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "VPN bağlantısı içe aktarılamıyor" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2492,38 +2491,38 @@ "\n" "Hata: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "İçe aktarılacak dosyayı seçin" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Aç" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "\"%s\" adında bir dosya zaten mevcut." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "Değişti_r" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "" "%s bağlantısını kaydetmek istediğiniz VPN bağlantısıyla değiştirmek istiyor " "musunuz?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "VPN bağlantısı dışa aktarılamıyor" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2534,7 +2533,7 @@ "\n" "Hata: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "VPN bağlantısını dışa aktar" @@ -2561,62 +2560,46 @@ msgid "Make available to _other users" msgstr "Diğer k_ullanıcılar için de kullanılabilir kıl" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Ağ" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "İnternete nasıl bağlandığınızı denetleyin" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Ağ;Kablosuz;Wi-Fi;Wifi;IP;LAN;Yerel Ağ;Proxy;Vekil Sunucu;WAN;Geniş Alan Ağı;" -"Genişbant;Modem;Bluetooth;vpn;sanal özel ağ;vlan;sanal yerel ağ;köprü;bond;" -"bağ;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Yamakları bağla" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(yok)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Yamakları köprüle" +"Ağ;Wireless;Wi-Fi;Wifi;Kablosuz;IP;LAN;Yerel Ağ;Proxy;Vekil Sunucu;WAN;" +"Broadband;Genişbant;Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "asla" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "bugün" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "dün" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 -#: ../panels/network/panel-common.c:698 ../panels/network/panel-common.c:700 -#: ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "İP Adresi" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Son kullanım" @@ -2626,35 +2609,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Kablolu" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 -#: ../panels/network/network-simple.ui.h:8 -#: ../panels/network/network-vpn.ui.h:7 +#: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Seçenekler..." -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Profil %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Yeni bağlantı ekle" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Yamaklardan takım oluştur" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2662,12 +2635,12 @@ "Eğer kablosuzdan başka bir İnternet bağlantısına sahipseniz, kablosuz " "bağlantı noktası kurarak bağlantınızı diğerleriyle paylaşabilirsiniz." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Kablosuz Hotspot'u açmak sizi %s bağlantısından koparacak." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2675,23 +2648,23 @@ "Kablosuz aygıtınız Hotspot olarak etkinleştirilmiş ise İnternete erişmek " "mümkün olmaz." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Etkin nokta durdurulup tüm kullanıcıların bağlantısı kesilsin mi?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "Etkin Noktayı _Durdur" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Sistem politikası Hotspot olarak kullanmayı yasaklıyor" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Kablosuz aygıtı Hotspot kipini desteklememektedir" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2699,11 +2672,11 @@ "Seçilen ağlar için ağ detayları, parolalar ve her türlü özel yapılandırmalar " "kaybolacak." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Geçmiş" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2711,7 +2684,7 @@ msgstr "_Kapat" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Unut" @@ -2747,6 +2720,10 @@ msgid "Provider" msgstr "Sağlayıcı" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Ağ" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2852,16 +2829,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Parola" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Hiçbiri" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "P_arolayı Göster" @@ -2955,7 +2928,6 @@ msgstr "Gizli Ağa _Bağlan…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Geçmiş" @@ -2977,360 +2949,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Parola" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Altyapı" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Durum bilinmiyor" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Yönetilmeyen" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Kullanılamıyor" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Bağlanıyor" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Kimlik doğrulası gerekli" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Bağlı" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Bağlantı kesiliyor" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Bağlantı başarısız" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Durum bilinmiyor (kayıp)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Bağlı değil" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Yapılandırma başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP yapılandırması başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP yapılandırmasının süresi dolmuş" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Özel bilgiler gerekli, fakat size sunulmamış" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x istekçisinin bağlantısı kesildi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x istekçi yapılandırması başarısız oldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x istekçisi başarısız oldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x istekçisinin kimlik doğrulaması çok uzun sürdü" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "PPP hizmeti başlatılamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP hizmetinin bağlantısı kesildi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP istemci başlatılamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP istemci hatası" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP istemcisi başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Paylaşımlı bağlantı hizmeti başlatılamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Paylaşılmış bağlantı hizmeti başarısız oldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "AutoIP hizmeti başlatılamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP hizmet hatası" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP hizmeti başarısız oldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Hat meşgul" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Çevir sesi yok" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Hiçbir taşıyıcı (carrier) elde edilemedi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Çevirme isteği zaman aşımına uğradı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Çevirme denemesi başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Modem başlatma başarısız oldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Belirtilen APN seçilemedi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Ağlar için arama yapılmıyor" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Ağ kaydı reddedildi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Ağ kaydı zaman aşımına uğradı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "İstenilen ağa kaydolunamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN doğrulanamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Aygıt için bellenim dosyası (firmware) eksik olabilir" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Bağlantı kayboldu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Mevcut bağlantı olduğu varsayıldı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Modem bulunamadı" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Bluetooth bağlantı başarısız" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM Kart takılı değil" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "SIM Pin gerekli" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "SIM Puk gerekli" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Yanlış SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand aygıtı bağlantılı kipi desteklemiyor" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Bağlantı bağımlılığı başarısız" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Firmware kayıp" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Kablo takılı değil" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Sertifika Yetkilisi (CA) sertifikası seçilmedi" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "802.1x güvenliğinde (wpa-eap) tanımlanmamış hata" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "hiçbir dosya seçilmedi" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Sertifika Yetkilisi (CA) tarafından onaylanmış bir sertifika kullanmamak; " -"güvensiz, kötü niyetli Wi-Fi ağlarına bağlanmanıza neden olabilir. Sertfika " -"Yetkilisi tarafından onaylanmış bir sertifika seçmek ister misiniz?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Yoksay" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "CA Sertifikası seçin" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER, PEM, veya PKCS#12 özel anahtarları (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "eap-method dosyası doğrulamada belirtilmemiş hata" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, veya PKCS#12 özel anahtarları (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "EAP-FAST PAC dosyası eksik" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "PAC dosyası seçin" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC dosyaları (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC _dosyası" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Dahil_i kimlik denetimi" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC pro_vizyon" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3339,41 +3287,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Anonim" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Kimlik doğrulama başarılı" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "İkisi birden" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC _dosyası" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Dahil_i kimlik denetimi" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Otomatik PAC ön _hazırlığına izin ver" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "EAP-LEAP kullanıcı adı eksik" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "EAP-LEAP parolası eksik" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "K_ullanıcı adı" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "Parolayı g_öster" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "geçersiz EAP-PEAP CA sertifikası: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "geçersiz EAP-PEAP CA sertifikası: sertifika belirtilmedi" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Sertifika Yetkilisi (CA) sertifikası seçin" @@ -3391,19 +3371,56 @@ msgid "C_A certificate" msgstr "C_A sertifikası" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "CA sertifikası ge_rekli değildir" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP _sürümü" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Parolayı her seferinde so_r" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "eksik EAP kullanıcı adı" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "eksik EAP parolası" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "eksik EAP-TLS kimliği" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "geçersiz EAP-TLS CA sertifikası: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "geçersiz EAP-TLS CA sertifikası: sertifika belirtilmedi" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "geçersiz EAP-TLS parolası: eksik" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "geçersiz EAP-TLS gizli-anahtarı: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "geçersiz EAP-TLS kullanıcı-sertifikası: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Şifrelenmemiş özel anahtarlar güvensizdir" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3416,11 +3433,11 @@ "\n" "(OpenSSL ile özel anahtarınızı şifreleyebilirsiniz)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Kişisel sertifikanızı seçin" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Özel anahtarınızı seçin" @@ -3432,51 +3449,56 @@ msgid "_User certificate" msgstr "K_ullanıcı sertifikası" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Özel _anahtar" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Özel anahtar _parolası" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "geçersiz EAP-TTLS CA sertifikası: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "geçersiz EAP-TTLS CA sertifikası: sertifika belirtilmedi" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Beni tekrar _uyarma" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Hayır" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Evet" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "802.1x güvenliğini doğrulamada bilinmeyen hata" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Tünellenmiş TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Korumalı EAP (PEAP)" @@ -3486,6 +3508,50 @@ msgid "Au_thentication" msgstr "Kimlik dene_timi" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "leap-kullanıcı adı eksik" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "leap-parolası eksik" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "wep-anahtarı eksik" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"geçersiz wep-anahtarı: %zu uzunluğundaki bir anahtar yalnızca onaltılı (hex) " +"rakamlardan oluşmalı" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"geçersiz wep-anahtarı: %zu uzunluğundaki bir anahtar yalnızca ascii " +"karakterler içermelidir" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"geçersiz wep-anahtarı: geçersiz anahtar uzunluğu %zu. Bir anahtar ya 5/13 " +"(ascii) ya da 10/26 (onaltılık) uzunluğunda olmalıdır" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "geçersiz wep-anahtarı: parola boş olmamalıdır" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "geçersiz wep-anahtarı: parola 64 karakterden kısa olmalıdır" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Öntanımlı)" @@ -3522,87 +3588,87 @@ msgid "WEP inde_x" msgstr "WEP ende_ksi" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"geçersiz wpa-psk: geçersiz anahtar uzunluğu %zu. [8,63] bayt ya da 64 " +"onaltılık rakam olmalıdır" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "geçersiz wpa-psk: 64 baytlık anahtar onaltılık olarak yorumlanamıyor" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Tür" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Açık" #. This is the per application switch for message tray usage. #: ../panels/notifications/edit-dialog.ui.h:2 -#| msgctxt "notifications" -#| msgid "Notifications" msgctxt "notifications" msgid "_Notifications" msgstr "_Bildirimler" #. This is the setting to configure sounds associated with notifications. #: ../panels/notifications/edit-dialog.ui.h:4 -#| msgctxt "notifications" -#| msgid "Sound Alerts" msgctxt "notifications" msgid "Sound _Alerts" msgstr "Sesli Uy_arılar" #: ../panels/notifications/edit-dialog.ui.h:5 -#| msgctxt "notifications" -#| msgid "Notification Banners" msgctxt "notifications" msgid "Notification _Banners" msgstr "_Bildirim Pencerecikleri" #. Banners here refers to message tray notifications in the middle of the screen. #: ../panels/notifications/edit-dialog.ui.h:7 -#| msgctxt "notifications" -#| msgid "Show Message Content in Banners" msgctxt "notifications" msgid "Show Message _Content in Banners" msgstr "Bildirim Pencereciklerinde İleti İ_çeriğini Göster" #: ../panels/notifications/edit-dialog.ui.h:8 -#| msgctxt "notifications" -#| msgid "Lock Screen Notifications" msgctxt "notifications" msgid "_Lock Screen Notifications" msgstr "Ki_lit Ekranı Bildirimleri" #: ../panels/notifications/edit-dialog.ui.h:9 -#| msgctxt "notifications" -#| msgid "Show Message Content on Lock Screen" msgctxt "notifications" msgid "Show Message C_ontent on Lock Screen" msgstr "Kilit Ekranında İleti İ_çeriğini Göster" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Bildirimler" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Hangi bildirimlerin gösterileceğini ve ne göstereceklerini ayarlayın" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Bildirimler;Mesaj;Tepsi;" #: ../panels/notifications/notifications.ui.h:1 -#| msgid "Notification Banners" msgid "Notification _Banners" msgstr "_Bildirim Pencerecikleri" #: ../panels/notifications/notifications.ui.h:2 -#| msgid "Lock Screen Notifications" msgid "_Lock Screen Notifications" msgstr "Ki_lit Ekranı Bildirimleri" @@ -3612,79 +3678,68 @@ msgid "Applications" msgstr "Uygulamalar" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Diğer" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Hesap Ekle" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "E-Posta" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Takvim" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Kişiler" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Sohbet" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Özkaynaklar" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Hesaba giriş yapılırken hata oluştu" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Kimlik bilgilerinin süresi dolmuş." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Bu hesabı etkinleştirmek için giriş yap." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "Giri_ş Yap" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Hesap oluşturulurken hata meydana geldi" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Hesap silinirken hata oluştu" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Hesabı silmek istediğinizden emin misiniz?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Bu işlem, sunucudaki hesabı silmeyecektir." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Sil" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Çevrimiçi Hesaplar" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "Çevrimiçi hesaplarınıza bağlanın ve ne için kullanacağınızı belirleyin" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3698,6 +3753,7 @@ msgstr "Yapılandırılmış çevrimiçi hesap yok" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Hesabı Kaldır" @@ -3836,7 +3892,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Pil" @@ -3884,101 +3940,102 @@ msgid "When _idle" msgstr "Bo_şta olduğunda" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Güç Tasarrufu" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Ekran parlaklığı" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Otomatik parlaklık" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "_Klavye parlaklığı" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "Etkin olunma_dığında ekranı karart" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Boş Ekran" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Enerji tasarrufu için Kablosuz Ağı kapatın." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Mobil Genişbant" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "Enerji tasarrufu için mobil genişbantı (3G, 4G, LTE, vb.) kapat." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Pille çalışırken" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Fişe takıldığında" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Askıya Al" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Derin Uyku" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Hiçbir Şey" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Askıya Alma & Güç Düğmesi" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "Otomatik olarak _askıya al" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Otomatik askıya alma" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Gü_ç Düğmesine Basıldığında" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Aygıtlar" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Güç" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Pil durumunuzu görüntüleyin ve güç koruma ayarlarını değiştirin" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "Güç;Uyku;Bekleme;Derin Uyku;Pil;Parlaklık;Karartma;Monitör;DPMS;Boşta;" @@ -4055,11 +4112,6 @@ msgid "Delay" msgstr "Gecikme" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "İptal" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Kimlik doğrulama" @@ -4069,153 +4121,153 @@ msgstr "Kimlik doğrulaması gerekli" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Toner düşük seviyede" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Toner tükendi" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Film banyo kimyasalı az" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Film banyo kimyasalı tükendi" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Renk kartuşu az" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Renk kartuşu tükendi" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Kapak açık" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Kapı açık" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Kağıt az" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Kağıt tükendi" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Kapalı" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Durduruldu" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Atık kutusu neredeyse dolu" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Atık kutusu dolu" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Baskı silindiri ömrünü doldurmak üzere" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Baskı silindiri artık çalışmıyor" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Yapılandırılıyor" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Hazır" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Görev kabul etmiyor" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "İşleniyor" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Toner Seviyesi" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Mürekkep Seviyesi" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Malzeme Seviyesi" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Kuruluyor" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u etkin" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Yeni yazıcı eklenemedi." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "PPD Dosyası Seç" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4223,50 +4275,47 @@ "PostScript Yazıcı Tanımlama dosyaları (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Uygun sürücü bulunamadı" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Tercih edilen sürücüler aranıyor..." -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Veritabanından seç..." -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "PPD Dosyası Verin..." #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Deneme sayfası" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Yazıcı yok" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Arayüz yüklenemedi: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Yazıcılar" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Yazıcı ekleyin, yazıcı görevlerini görüntüleyin ve nasıl çıktı alacağınıza " "karar verin" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Yazıcı;Kuyruk;Yazdur;Kâğıt;Mürekkep;Toner;" @@ -4277,7 +4326,6 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 -#| msgid "%s Active Jobs" msgid "No Active Printer Jobs" msgstr "Etkin Yazıcı Görevi Yok" @@ -4373,7 +4421,6 @@ #. Translators: Job's state (job is held for printing) #: ../panels/printers/pp-jobs-dialog.c:107 -#| msgid "Last used" msgctxt "print job" msgid "Paused" msgstr "Duraklatıldı" @@ -4411,7 +4458,6 @@ #. Translators: This is the printer name for which we are showing the active jobs #: ../panels/printers/pp-jobs-dialog.c:289 #, c-format -#| msgid "%s Active Jobs" msgctxt "Printer jobs dialog title" msgid "%s - Active Jobs" msgstr "%s - Etkin Görevler" @@ -4431,6 +4477,11 @@ msgid "Parallel Port" msgstr "Paralel Bağlantı Noktası" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4643,13 +4694,17 @@ msgid "_Options" msgstr "_Seçenekler" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Yazıcı yok" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Yazıcı Ekle" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4657,73 +4712,70 @@ "Üzgünüm! Sistemin yazdırma hizmeti\n" "kullanılamıyor." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Ekran Kilidi" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Kullanımda" -#: ../panels/privacy/cc-privacy-panel.c:425 -#| msgid "On" +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Açık" -#: ../panels/privacy/cc-privacy-panel.c:426 -#| msgid "Off" +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Kapalı" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 -#| msgid "_Location Services" +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Konum Hizmetleri" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Kullanım & Geçmiş" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Çöpteki tüm ögeler boşaltılsın mı?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Çöpteki tüm ögeler kalıcı olarak silinecek." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Çöpü _Boşalt" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Tüm geçici dosyalar silinsin mi?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Tüm geçici dosyalar kalıcı olarak silinecek." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "Geçici Dosyaları _Sil" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Çöpü ve geçici dosyaları temizle" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Yazılım Kullanımı" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Sorun Bildirimi" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4733,21 +4785,22 @@ "Bu bildirimler, anonim olarak gönderilir ve kişisel verilerden " "arındırılmıştır." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Gizlilik İlkesi" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Gizlilik" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Kişisel bilgilerinizi koruyun ve başkalarının ne görebileceğini denetleyin" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4918,23 +4971,22 @@ msgid "Other" msgstr "Diğer" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Değişikliklerin etkin olması için oturumunuzu yeniden başlatmanız gerekiyor" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Yeniden Başlat" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Girdi kaynağı seçilmedi" -#: ../panels/region/cc-region-panel.c:1807 -#| msgid "Login Screen" +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Oturum A_çma Ekranı" @@ -4966,11 +5018,12 @@ msgid "Paper" msgstr "Kağıt" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Bölge & Dil" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Bölge ve Dil" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "" @@ -4978,7 +5031,7 @@ "kaynaklarınızı ayarlayın" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Dil;Yerleşim;Klavye;Giriş;Language;Layout;Keyboard;Input;" @@ -5035,7 +5088,7 @@ msgstr "Sol+Sağ Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "Di_l" @@ -5044,7 +5097,6 @@ msgstr "İngilizce (Birleşik Krallık)" #: ../panels/region/region.ui.h:3 -#| msgid "Formats" msgid "_Formats" msgstr "Bi_çimler" @@ -5085,26 +5137,11 @@ msgstr "" "Giriş ayarları sisteme giriş esnasında tüm kullanıcılar tarafından kullanılır" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Yerler" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Yer İmleri" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Diğer" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Konum Seçin" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Tamam" @@ -5112,11 +5149,12 @@ msgid "No applications found" msgstr "Uygulama bulunamadı" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Arama" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" @@ -5124,7 +5162,7 @@ "göstereceğini belirleyin" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Ara;Bul;Endeks;Gizle;Gizlilik;Sonuçlar;" @@ -5132,6 +5170,18 @@ msgid "Search Locations" msgstr "Arama Konumları" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Yerler" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Yerimleri" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Diğer" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Yukarı Taşı" @@ -5144,6 +5194,11 @@ msgid "Preferences" msgstr "Tercihler" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Paylaşımı için ağ seçilmedi" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5169,21 +5224,54 @@ msgid "Choose a Folder" msgstr "Klasör Seç" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Kişisel Dosya Paylaşımı şuanki ağınızdaki diğer kişilerle Ortak dizininizi " +"dav://%s adresini kullanarak paylaşmanızı sağlar." + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Uzaktan oturum açma etkinleştirildiğinde, uzak kullanıcılar Güvenli Kabuk " +"(Secure Shell) komutunu kullanarak bağlanabilirler:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Ekran paylaşımı, uzak kullanıcıların vnc://%s " +"adresine bağlanarak ekranınızı izlemesine veya denetlemesine izin verir." + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Kopyala" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Paylaşım" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Paylaşım" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Diğerleri ile ne paylaşacağınızı denetleyin" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5191,6 +5279,10 @@ "paylaş;paylaşım;ssh;makine;host;isim;uzak;masaüstü;ortam;ses;video;görüntü;" "resimler;fotoğraflar;filmler;sunucu;renderer;yorumlayıcı;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Ağlar" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Uzaktan bağlanmayı aç" @@ -5200,40 +5292,23 @@ msgstr "" "Uzaktan bağlantıyı açmak veya kapamak için kimlik doğrulaması gerekiyor" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Paylaşımı için ağ seçilmedi" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Ağlar" - #: ../panels/sharing/sharing.ui.h:1 -#| msgid "Computer Name" msgid "_Computer Name" msgstr "_Bilgisayar Adı" #: ../panels/sharing/sharing.ui.h:2 -#| msgid "Personal File Sharing" -msgid "_Personal File Sharing" -msgstr "Kişisel Dosya _Paylaşımı" +msgid "_File Sharing" +msgstr "Dosya _Paylaşımı" #: ../panels/sharing/sharing.ui.h:3 -#| msgid "Screen Sharing" msgid "_Screen Sharing" msgstr "Ekran Payla_şımı" #: ../panels/sharing/sharing.ui.h:4 -#| msgid "Media Sharing" msgid "_Media Sharing" msgstr "Orta_m Paylaşımı" #: ../panels/sharing/sharing.ui.h:5 -#| msgid "Remote Login" msgid "_Remote Login" msgstr "Uzaktan Otu_rum Açma" @@ -5242,90 +5317,54 @@ msgstr "Ağ erişimi olmadığından bazı hizmetler devredışı bırakıldı." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Kişisel Dosya Paylaşımı" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Kişisel Dosya Paylaşımı şuanki ağınızdaki diğer kişilerle Ortak dizininizi " -"dav://%s adresini kullanarak paylaşmanızı sağlar." +msgid "File Sharing" +msgstr "Dosya Paylaşımı" -#: ../panels/sharing/sharing.ui.h:10 -#| msgid "Require Password" +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Parola Gerekti_r" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Uzaktan Bağlantı" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Uzak kullanıcıların ssh %s Secure Shell komutlarını " -"kullanarak bağlanmasına izin ver." - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Ekran Paylaşımı" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Uzak kullanıcıların vnc://%s adresini kullanarak " -"ekranınızı izlemesini veya denetlemesini sağlayın." - -#: ../panels/sharing/sharing.ui.h:19 -#| msgid "Allow Remote Control" -msgid "_Allow Remote Control" -msgstr "Uz_aktan Denetime İzin Ver" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "Ekranı kontrol etmek için bağlantıya _izin ver" -#: ../panels/sharing/sharing.ui.h:20 -#| msgid "_Password" +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Parola:" -#: ../panels/sharing/sharing.ui.h:21 -#| msgid "Show Password" +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "Parolayı Gö_ster" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Erişim Seçenekleri" -#: ../panels/sharing/sharing.ui.h:23 -#| msgid "New connections must ask for access" +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "Ye_ni bağlantıların erişim için izin istemesi gerekir" -#: ../panels/sharing/sharing.ui.h:24 -#| msgid "Require a password" +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Pa_rola iste" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Ortam Paylaşımı" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Ortam paylaşımı; müzikleri, fotoğrafları ve videoları ağ üzerinde " -"paylaşmanıza olanak tanır" +#: ../panels/sharing/sharing.ui.h:19 +msgid "Share music, photos and videos over the network." +msgstr "Müzikleri, fotoğrafları ve videoları ağ üzerinde paylaşın." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Klasörler" @@ -5453,11 +5492,6 @@ msgid "Peak detect" msgstr "Tepe algılama" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "İsim" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Aygıt" @@ -5552,16 +5586,21 @@ msgid "Subwoofer" msgstr "Subwoofer" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Özel" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Evrensel Erişim" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Görme, duyma, yazma, işaretleme ve tıklamayı kolaylaştır." #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5611,12 +5650,10 @@ msgstr "Ekran _Klavyesi" #: ../panels/universal-access/uap.ui.h:13 -#| msgid "Repeat Keys" msgid "R_epeat Keys" msgstr "Tuşları Tek_rarla" #: ../panels/universal-access/uap.ui.h:14 -#| msgid "Cursor Blinking" msgid "Cursor _Blinking" msgstr "_İmleç Yanıp Sönmesi" @@ -5661,8 +5698,9 @@ msgstr "Ses Tuşları" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Num Lock ya da Caps Lock açıldığında uyarı ver." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "" +"Num Lock ya da Caps Lock açıldığında ya da kapandığında sesli uyarı ver." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5916,37 +5954,30 @@ msgstr "Yakınlaştırma Seçenekleri" #: ../panels/universal-access/zoom-options.ui.h:8 -#| msgid "Magnification:" msgid "_Magnification:" msgstr "Büyüt_me:" #: ../panels/universal-access/zoom-options.ui.h:9 -#| msgid "Follow mouse cursor" msgid "_Follow mouse cursor" msgstr "_Fare imlecini takip et" #: ../panels/universal-access/zoom-options.ui.h:10 -#| msgid "Screen part:" msgid "_Screen part:" msgstr "_Ekrandan bölüm:" #: ../panels/universal-access/zoom-options.ui.h:11 -#| msgid "Magnifier extends outside of screen" msgid "Magnifier _extends outside of screen" msgstr "Büyüt_eç ekranın dışına taşar" #: ../panels/universal-access/zoom-options.ui.h:12 -#| msgid "Keep magnifier cursor centered" msgid "_Keep magnifier cursor centered" msgstr "B_üyüteç imlecini ortalı tut" #: ../panels/universal-access/zoom-options.ui.h:13 -#| msgid "Magnifier cursor pushes contents around" msgid "Magnifier cursor _pushes contents around" msgstr "Büyüteç imleci çevresindeki içeriği _iter" #: ../panels/universal-access/zoom-options.ui.h:14 -#| msgid "Magnifier cursor moves with contents" msgid "Magnifier cursor moves with _contents" msgstr "Büyüteç imleci i_çerik ile birlikte hareket eder" @@ -5959,7 +5990,6 @@ msgstr "Büyüteç" #: ../panels/universal-access/zoom-options.ui.h:17 -#| msgid "Thickness:" msgid "_Thickness:" msgstr "_Kalınlık:" @@ -5974,23 +6004,19 @@ msgstr "Kalın" #: ../panels/universal-access/zoom-options.ui.h:20 -#| msgid "Length:" msgid "_Length:" msgstr "Uzun_luk:" #. The color of the accessibility crosshair #: ../panels/universal-access/zoom-options.ui.h:22 -#| msgid "Color:" msgid "Co_lor:" msgstr "Re_nk:" #: ../panels/universal-access/zoom-options.ui.h:23 -#| msgid "Crosshairs:" msgid "_Crosshairs:" msgstr "_Referans Noktaları:" #: ../panels/universal-access/zoom-options.ui.h:24 -#| msgid "Overlaps mouse cursor" msgid "_Overlaps mouse cursor" msgstr "Fare imleci ile _örtüşür" @@ -5999,17 +6025,14 @@ msgstr "Çarpılar" #: ../panels/universal-access/zoom-options.ui.h:26 -#| msgid "White on black:" msgid "_White on black:" msgstr "_Siyah üzerine beyaz:" #: ../panels/universal-access/zoom-options.ui.h:27 -#| msgid "Brightness:" msgid "_Brightness:" msgstr "_Parlaklık:" #: ../panels/universal-access/zoom-options.ui.h:28 -#| msgid "Contrast:" msgid "_Contrast:" msgstr "_Karşıtlık:" @@ -6058,97 +6081,67 @@ msgstr "Renk Efektleri" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Kullanıcı Ekle" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Tam İsim" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "Standart" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Yönetici" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Tam İsim" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Hesap _Türü" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 -#| msgid "Allow user to set a password when they next login" +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Sonraki girişte kullanıcının bir parola belirlemesine o_lanak tanı" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 -#| msgid "Set a password now" +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Şi_mdi parola belirle" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" msgstr "_Doğrula" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Kurumsal giriş, merkezi olarak yönetilen mevcut bir kullanıcı hesabının bu " -"cihazda kullanılmasına olanak tanır." +"cihazda kullanılmasına olanak tanır. Ayrıca bu hesabı internet üzerindeki " +"şirkey kaynaklarına erişmek için de kullanabilirsiniz." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Etki Alanı" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Kurumsal giriş hesapları\n" -"eklemek için çevrimiçi ol." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Kurumsal Giriş" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Kullanıcı Ekle" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "Kayd_et" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Etki Alanı Yöneticisi Girişi" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Kurumsal girişleri kullanmak için bu bilgisayarın etki alanına\n" -"kayıtlı olması gerekiyor. Lütfen ağ yöneticinizin etki alanı\n" -"parolasını buraya girmesini sağlayın." +msgid "You are Offline" +msgstr "Çevrimdışısınız" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "Yö_netici Adı" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "Kurumsal kullanıcıları eklemek için çevrimiçi olmalısınız." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Yönetici Parolası" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Kurumsal Giriş" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6183,7 +6176,7 @@ msgstr "Sağ serçe parmağı" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Parmak İzi Girişi Etkinleştir" @@ -6220,9 +6213,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Giriş;İsim;Parmak izi;Kullanıcı simgesi;Logo;Yüz;Parola;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Giriş Geçmişi" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "Kayd_et" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Etki Alanı Yöneticisi Girişi" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Kurumsal girişleri kullanmak için bu bilgisayarın etki alanına\n" +"kayıtlı olması gerekiyor. Lütfen ağ yöneticinizin etki alanı\n" +"parolasını buraya girmesini sağlayın." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "Yö_netici Adı" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Yönetici Parolası" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6245,38 +6261,31 @@ msgstr "Mevcut _Parola" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Sonraki girişte kullanıcının bir parola belirlemesine olanak tanı" +msgid "Allow user to change their password on next login" +msgstr "Sonraki girişte kullanıcının parolasını değiştirmesine olanak tanı" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Şimdi parola belirle" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Kullanıcı Hesabı Ekle" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Kullanıcı Hesabını Kaldır" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "Kullanıcı _Ekle…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Giriş Seçenekleri" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Ot_omatik Giriş" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "_Parmak İziyle Giriş" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Kullanıcı Simgesi" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Son Giriş" @@ -6379,7 +6388,7 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." +msgid "Mix uppercase and lowercase and try to use a number or two." msgstr "Büyük, küçük karakter karıştırın ve bir iki de sayı kullanın." #: ../panels/user-accounts/pw-utils.c:119 @@ -6471,32 +6480,32 @@ msgstr "Bilinmeyen hata" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Hesap sağlayıcınızın web adresi ile aynı olmalıdır." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Hesap eklenemedi" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Parolalar uyuşmuyor" -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Hesap kaydedilemedi" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Bu alan adıyla kimlik doğrulama yapılamaz" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Etki alanına katılma başarısız" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6504,7 +6513,7 @@ "Giriş adı işe yaramadı.\n" "Lütfen tekrar deneyin." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6512,14 +6521,24 @@ "Giriş parolası işe yaramadı.\n" "Lütfen tekrar deneyin." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Etki alanına girilemedi" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Etki alanı bulunamadı. Belki yanlış yazmışsınızdır?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Standart" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Yönetici" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6538,30 +6557,30 @@ msgid "Enabled" msgstr "Etkin" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Kayıtlı parmak izleri silinsin mi?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "Parmak İzlerini _Sil" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "" "Kayıtlı parmak izlerini silerek parmak izi girişini kapatmak ister misiniz?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Tamamlandı!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "'%s' aygıtına erişilemedi" @@ -6569,16 +6588,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "'%s' aygıtı üzerinde parmak yakalama başlatılamadı" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Hiçbir parmak izi okuyucusuna erişilemedi" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Lütfen yardım için sistem yöneticinizle bağlantıya geçin." @@ -6587,7 +6606,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6596,11 +6615,11 @@ "Parmak izi girişin etkinleşebilmesi için parmak izlerinizden bir tanesini " "'%s' aygıtını kullanarak kaydetmelisiniz." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Parmak seçiliyor" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Parmak izleri kaydediliyor" @@ -6654,14 +6673,22 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Oturum Sonlandı" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Oturum Başladı" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +#| msgid "_Account Activity" +msgid "%s - Account Activity" +msgstr "%s - Hesap Etkinliği" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Lütfen farklı bir parola seçin" @@ -6723,7 +6750,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "%s alan adına bağlanılamadı: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Diğer Hesaplar" @@ -6804,15 +6831,15 @@ msgid "Logged in" msgstr "Oturum açık" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Hesap hizmetiyle bağlantı kurulamadı" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Lütfen AccountService' in kurulu ve etkin olduğundan emin olun." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6820,12 +6847,12 @@ "Değişiklik yapmak için,\n" "önce * simgesine tıklayın" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Kullanıcı hesabı oluştur" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6833,12 +6860,12 @@ "Kullanıcı hesabı oluşturmak için,\n" "önce * simgesine tıklayın" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Seçilen kullanıcı hesabını sil" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6846,33 +6873,34 @@ "Seçilen kullanıcı hesabını silmek için,\n" "önce * simgesine tıklayın" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Hesabım" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "'%s' adlı bir kullanıcı zaten var." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "" +"Üzgünüm, bu kullanıcı adı kullanılabilir değil. Lütfen başka bir tane " +"deneyin." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Kullanıcı adı fazlasıyla uzun." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Kullanıcı adı '-' ile başlayamaz." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Kullanıcı adı sadece a'dan z'ye küçük ya da büyük harfler, rakamlar ve '.', " -"'-', '_' karakterlerinin her hangi birinden oluşmalıdır." +"Kullanıcı adı sadece a'dan z'ye küçük ya da büyük harfler, rakamlar ve şu " +"karakterlerin herhangi birinden oluşmalıdır: . - _" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Başlangıç klasörünüzün adlandırılmasında kullanılacaktır ve sonradan " @@ -6963,18 +6991,18 @@ msgid "Button" msgstr "Düğme" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Wacom Tablet" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Düğme eşlemelerini ve grafik tabletler için kalem hassasiyetini ayarlayın" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Kalem;Silgi;Fare;" @@ -7006,6 +7034,10 @@ msgid "Bluetooth Settings" msgstr "Bluetooth Ayarları" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom Tablet" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Monitörle Eşle..." @@ -7099,22 +7131,22 @@ msgid "Mode Switch #%d" msgstr "Kip Anahtarı #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Sol Düğme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Sağ Düğme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Üst Düğme #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Alt Düğme #%d" @@ -7191,6 +7223,11 @@ msgid "Tip Pressure Feel" msgstr "Parmak Ucu Basınç Hissi" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Tüm Ayarlar" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME Denetim Merkezi" @@ -7247,22 +7284,18 @@ msgid "Quit" msgstr "Çıkış" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Tüm Ayarlar" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Kişisel" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Donanım" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Sistem" @@ -7272,41 +7305,217 @@ msgstr "Tercihler;Ayarlar;" #: ../shell/help-overlay.ui.h:1 -#| msgid "General" msgctxt "shortcut window" msgid "General" msgstr "Genel" #: ../shell/help-overlay.ui.h:2 -#| msgid "Quit" msgctxt "shortcut window" msgid "Quit" msgstr "Çıkış" #: ../shell/help-overlay.ui.h:3 -#| msgid "Search" msgctxt "shortcut window" msgid "Search" msgstr "Ara" #: ../shell/help-overlay.ui.h:4 -#| msgid "Panels" msgctxt "shortcut window" msgid "Panels" msgstr "Paneller" #: ../shell/help-overlay.ui.h:5 -#| msgid "Go back to the overview" msgctxt "shortcut window" msgid "Go back to the overview" msgstr "Genel görünüme geri dön" #: ../shell/help-overlay.ui.h:6 -#| msgid "Cancel search" msgctxt "shortcut window" msgid "Cancel search" msgstr "Aramayı iptal et" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Etkin Nokta" + +#~ msgid "_Name:" +#~ msgstr "_İsim:" + +#~ msgid "Add Shortcut" +#~ msgstr "Kısayol Ekle" + +#~ msgid "Remove Shortcut" +#~ msgstr "Kısayolu Kaldır" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Kısayol tuşu \"%s\" kullanılamıyor çünkü kullanımı halinde bu tuş " +#~ "kullanılarak yazmak mümkün olmayacak.\n" +#~ "Lütfen Control, Alt ya da Shift gibi tuşlar ile aynı anda deneyin." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "\"%s\" kısayolu zaten kullanılıyor:\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "" +#~ "Eğer kısayolu \"%s\" olarak tekrar atarsanız, \"%s\" kısayolu " +#~ "etkinsizleştirilecek." + +#~ msgid "_Reassign" +#~ msgstr "Tek_rar ata" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "\"%s\" kısayoluyla ilişkili bir \"%s\" kısayolu var. Otomatik olarak \"%s" +#~ "\"e ayarlamak ister misiniz?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" şu anda \"%s\" ile ilişkilendirilmiş; eğer devam ederseniz, bu " +#~ "kısayol devre dışı bırakılacak." + +#~ msgid "_Assign" +#~ msgstr "_Ata" + +#~ msgid "Error logging into the account" +#~ msgstr "Hesaba giriş yapılırken hata oluştu" + +#~ msgid "Credentials have expired." +#~ msgstr "Kimlik bilgilerinin süresi dolmuş." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Bu hesabı etkinleştirmek için giriş yap." + +#~ msgid "_Sign In" +#~ msgstr "Giri_ş Yap" + +#~ msgid "Login History" +#~ msgstr "Giriş Geçmişi" + +#~ msgid "Add User Account" +#~ msgstr "Kullanıcı Hesabı Ekle" + +#~ msgid "Remove User Account" +#~ msgstr "Kullanıcı Hesabını Kaldır" + +#~ msgid "Add Network Connection" +#~ msgstr "Ağ Bağlantısı Ekle" + +#~ msgid "Personal File Sharing" +#~ msgstr "Kişisel Dosya Paylaşımı" + +#~ msgid "_Allow Remote Control" +#~ msgstr "Uz_aktan Denetime İzin Ver" + +#~| msgid "GNOME Control Center" +#~ msgid "Welcome to the Control Center" +#~ msgstr "Denetim Merkezine Hoş Geldiniz" + +#~ msgid "Select a panel in the sidelist to see the available options" +#~ msgstr "" +#~ "Kullanılabilir seçenekleri görmek için yandaki listeden bir panel seçin" + +#~ msgid "Color" +#~ msgstr "Renk" + +#~ msgid "Bond" +#~ msgstr "Bağla" + +#~ msgid "Team" +#~ msgstr "Takım" + +#~ msgid "Bridge" +#~ msgstr "Köprü" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "VPN eklentileri yüklenemedi" + +#~ msgid "Bond slaves" +#~ msgstr "Yamakları bağla" + +#~ msgid "(none)" +#~ msgstr "(yok)" + +#~ msgid "Bridge slaves" +#~ msgstr "Yamakları köprüle" + +#~ msgid "Team slaves" +#~ msgstr "Yamaklardan takım oluştur" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand aygıtı bağlantılı kipi desteklemiyor" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Sertifika Yetkilisi (CA) sertifikası seçilmedi" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Sertifika Yetkilisi (CA) tarafından onaylanmış bir sertifika kullanmamak; " +#~ "güvensiz, kötü niyetli Wi-Fi ağlarına bağlanmanıza neden olabilir. " +#~ "Sertfika Yetkilisi tarafından onaylanmış bir sertifika seçmek ister " +#~ "misiniz?" + +#~ msgid "Ignore" +#~ msgstr "Yoksay" + +#~ msgid "Choose CA Certificate" +#~ msgstr "CA Sertifikası seçin" + +#~ msgid "As_k for this password every time" +#~ msgstr "Parolayı her seferinde so_r" + +#~ msgid "Don't _warn me again" +#~ msgstr "Beni tekrar _uyarma" + +#~ msgid "No" +#~ msgstr "Hayır" + +#~ msgid "Yes" +#~ msgstr "Evet" + +#~ msgid "Power" +#~ msgstr "Güç" + +#~ msgid "Privacy" +#~ msgstr "Gizlilik" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Diğer" + +#~ msgid "_Verify" +#~ msgstr "_Doğrula" + +#~ msgid "Login Options" +#~ msgstr "Giriş Seçenekleri" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "'%s' adlı bir kullanıcı zaten var." + #~ msgid "Done" #~ msgstr "Tamamlandı!" @@ -7365,10 +7574,6 @@ #~ msgid "Color" #~ msgstr "Renk" -#~| msgid "Two _finger scroll" -#~ msgid "Two Finger Scrolling" -#~ msgstr "İki Parmak Kaydırma" - #~ msgid "_Delay:" #~ msgstr "_Gecikme:" @@ -7391,9 +7596,6 @@ #~ msgid "S_peed:" #~ msgstr "_Hız:" -#~ msgid "Shortcuts" -#~ msgstr "Kısayollar" - #~ msgid "Test Your Settings" #~ msgstr "Ayarlarınızı Sınayın" diff -Nru gnome-control-center-3.20.2/po/ug.po gnome-control-center-3.22.1/po/ug.po --- gnome-control-center-3.20.2/po/ug.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/ug.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2013-02-16 10:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" -"Language: \n" +"Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/uk.po gnome-control-center-3.22.1/po/uk.po --- gnome-control-center-3.20.2/po/uk.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/uk.po 2016-09-27 12:37:36.000000000 +0000 @@ -7,9 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: gnome-control-center\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-22 22:31+0200\n" -"PO-Revision-Date: 2016-03-22 22:36+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"control-center&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-09-09 09:50+0000\n" +"PO-Revision-Date: 2016-09-15 21:21+0300\n" "Last-Translator: Daniel Korostil \n" "Language-Team: linux.org.ua\n" "Language: uk\n" @@ -91,7 +92,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Домівка" @@ -106,25 +107,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -155,16 +155,18 @@ msgid "Current background" msgstr "Поточне тло" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#| msgid "Background" +msgid "Back­ground" msgstr "Тло" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Змінити малюнок тла на шпалери або фотографію" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Шпалери;Екран;Стільниця;" @@ -204,18 +206,18 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Вимкнути перемикання режиму «у літаку», щоб увімкнути Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#| msgid "Bluetooth" +msgid "Blue­tooth" msgstr "Bluetooth" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Увімкнути або вимкнути з'єднання з пристроєм через Bluetooth" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "оприлюднення;поділитись;блютуз;obex;" @@ -390,7 +392,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Усі файли" @@ -430,7 +432,7 @@ msgstr "Зберегти профіль" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "З_берегти" @@ -687,7 +689,7 @@ "Windows можуть стати в пригоді." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Підсумок" @@ -699,11 +701,11 @@ msgid "_Import File…" msgstr "_Імпортувати файл…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Додати" @@ -852,17 +854,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "Колір" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "Відкалібрувати кольори таких пристроїв, як екрани, камери і принтери" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "Колір;ICC;Профіль;Калібрування;Принтер;Екран;" @@ -880,23 +883,23 @@ msgid "No languages found" msgstr "Не знайдено мов" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Сьогодні" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Учора" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b, %Y" @@ -1016,8 +1019,9 @@ msgid "December" msgstr "Грудень" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Дата й час" @@ -1074,12 +1078,12 @@ msgid "AM / PM" msgstr "До / після полудня " -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Змінити дату та час, і часовий пояс зокрема" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Годинник;Пояс;Місцевість;" @@ -1091,207 +1095,223 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Щоб змінити параметри часу і дати, потрібно авторизуватись." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Кришку закрито" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Віддзеркалення" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Основний" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Вимкнено" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Вторинний" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Впорядкувати об'єднані екрани" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "_Застосувати" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Перетягніть екрани, щоб їх упорядкувати" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Гц (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Гц" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Обернути проти годинникової стрілки на 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Обернути на 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Обернути за годинниковою стрілкою на 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Розмір" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Відношення сторін" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Роздільність" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Підкоригувати для телебачення" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Частота оновлення" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "Показує на верхній панелі та огляді діяльності на цьому екрані" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Другий екран" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "З'єднує цей екран з іншим, щоб утворити більше робочого простору" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Презентація" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Показує тільки слайди та матеріал" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Відзеркалля" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Показує однакове на двох екранах" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "Вимкнути" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Не використовувати цей екран" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Не вдалось отримати інформацію про екран" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Упорядкувати об'єднані екрани" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#| msgid "Displays" +msgid "Dis­plays" msgstr "Екрани" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Змінити використання під'єднаних моніторів та проекторів" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "Панель;Проектори;xrandr;Екран;Роздільність;Оновлення;Монітор;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Невідома" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d біт(Ідентифікатор збірки: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d біт(Ідентифікатор збірки: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-ох бітний" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-ох бітний" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Питати, що робити" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Нічого не робити" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Відкрити теку" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Інший носій" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Вибрати програму для звукових CD" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Вибрати програму для відео DVD" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Вибрати програму для запуску, коли музичний програвач під'єднано" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Вибрати програму для запуску, коли камеру під'єднано" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Вибрати програму для програмного CD" @@ -1300,88 +1320,87 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "audio DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "blank Blu-ray disc" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "blank CD disc" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "blank DVD disc" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "blank HD DVD disc" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-ray video disc" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "e-book reader" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD video disc" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "Picture CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "Super Video CD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "Video CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Програми Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Вибір" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Огляд" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Типові програми" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Змінний носій" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Версія %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#| msgid "Details" +msgid "De­tails" msgstr "Подробиці" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Переглянути інформацію про вашу систему" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1555,8 +1574,9 @@ msgid "Launch help browser" msgstr "Запустити переглядача довідки" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Параметри" @@ -1629,7 +1649,6 @@ msgstr "Заблокувати екран" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Універсальний доступ" @@ -1665,11 +1684,21 @@ msgid "High contrast on or off" msgstr "Увімкнути або вимкнути високий контраст" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Власне скорочення" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1696,124 +1725,142 @@ msgid "Modifiers-only switch to next source" msgstr "Тільки модифікатори перемикають наступне джерело" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Клавіатура" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Повернути скороченю типове значення" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" +"%s вже використовується для %s. Якщо його замінити, %s буде відкинуто" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#| msgid "Custom Shortcut" +msgid "Set Custom Shortcut" +msgstr "Встановити своє скорочення" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +#| msgid "Shortcut" +msgid "Set Shortcut" +msgstr "Встановити скорочення" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Введіть нове скорочення, щоб змінити %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:934 +#| msgid "Custom Shortcut" +msgid "Add Custom Shortcut" +msgstr "Додати своє скорочення" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +#| msgid "Keyboard" +msgid "Key­board" +msgstr "Клавіатура" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "" "Переглянути і змінити клавіатурні скорочення і вказати параметри введення" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Скорочення;Повтори;Блимання;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Власне скорочення" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "_Назва:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "К_оманда:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Додати скорочення" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Вилучити скорочення" +#| msgid "Keyboard Shortcuts" +msgid "No keyboard shortcut found" +msgstr "Не знайдено клавіатурного скорочення" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Щоб змінити комбінацію клавіш, клацніть у відповідному рядку та введіть нові " -"клавіші, або натисніть Backspace для очищення." +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Спробуйте пошукати по-інакшому" -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Власне скорочення" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Натисніть «Esc», що скасувати." -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<Невідома дія>" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Назва" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Скорочення «%s» не можна використовувати, оскільки використання цієї клавіші " -"для звичайного вводу стане неможливим.\n" -"Будь ласка, спробуйте з такими клавішами, як Control, Alt чи Shift одночасно." +#: ../panels/keyboard/shortcut-editor.ui.h:4 +#| msgid "C_ommand:" +msgid "Command" +msgstr "Команда" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Скорочення «%s» вже використовується для\n" -"«%s»" +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Скорочення" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Редагувати" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Після перепризначення скорочення «%s» на «%s», його буде вимкнено." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Немає" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Перепризначити" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +#| msgid "_Remove" +msgid "Remove" +msgstr "Вилучити" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +#| msgid "Error saving the new shortcut" +msgid "Enter the new shortcut" +msgstr "Уведіть нове скорочення" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Скорочення «%s» пов'язано зі скороченням «%s». Бажаєте автоматично вказувати " -"це як «%s»?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Скасувати" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"«%s» наразі пов'язано з «%s», це скорочення буде вимкнено, якщо ви перейдете " -"далі." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Додати" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Призначити" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +#| msgid "_Replace" +msgid "Replace" +msgstr "Замінити" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +#| msgid "Select" +msgid "Set" +msgstr "Встановити" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "Випробувати ваші _параметри" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#| msgid "Mouse & Touchpad" +msgid "Mouse & Touch­pad" msgstr "Миша та сенсорний пристрій" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "Змінити чутливість вашої миші та сенсорного пристрою і вибрати руку" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "Сенсор;Вказівник;Клік;Стукіт;Подвійний;Кнопка;Кулька;Прокрутити;" @@ -1871,6 +1918,11 @@ msgstr "Натиск для клацання" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +#| msgid "Two _finger scroll" +msgid "Two-finger Scrolling" +msgstr "Прокручування двома пальцями" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Краї прокручуванн" @@ -1909,11 +1961,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Режим у _літаку" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Мережева проксі" @@ -1921,18 +1973,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Отакої, щось не так. Зв'яжіться з вашим постачальником програмних засобів." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Потрібно запустити NetworkManager." @@ -1948,7 +2000,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1965,59 +2017,64 @@ msgid "page 2" msgstr "сторінка 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "Безпека" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "автоматично" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Профіль %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Enterprise" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Немає" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Ніколи" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" @@ -2026,179 +2083,179 @@ msgstr[2] "%i днів тому" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Мб/с" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Немає" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Слабке" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Добре" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Непогане" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Відмінне" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Подробиці" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Засвідчення" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Адреса" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Маска" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Шлюз" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Вилучити адресу" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Додати" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Сервер" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Вилучити сервер DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Метрика" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Вилучити маршрут" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Автоматично (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Вручну" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Лише місцевий" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Префікс" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Автоматично" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Автоматично, лише DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Скинути" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Немає" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "40/128 бітний ключ WEP (шістнадцяткова або ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "128-ох бітний пароль для WEP" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "Динамічний WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "Особистий WPA і WPA2" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "Комерційний WPA & WPA2" @@ -2213,30 +2270,30 @@ msgstr "Швидкість сполучення" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Адреса IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Адреса IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Апаратна адреса" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2246,7 +2303,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2329,13 +2386,13 @@ msgid "Firewall _Zone" msgstr "_Зона брандмауера" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Типова" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Зона визначає рівень довіри зв'язку" @@ -2377,45 +2434,26 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Не вдалося відкрити редактор з'єднань" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Створити профіль" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Прив'язка" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Команда" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Міст" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Неможливо завантажити додатки VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Імпортувати з файла…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Додати мережеве з'єднання" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +#| msgid "%s VPN" +msgid "Add VPN" +msgstr "Додати VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2423,7 +2461,7 @@ msgstr "_Скинути" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Забути" @@ -2449,11 +2487,11 @@ msgid "S_ecurity" msgstr "_Захист" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Не вдалось імпортувати з'єднання з VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2466,36 +2504,36 @@ "\n" "Помилка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Виберіть файл для імпортування" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Відкрити" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Файл з назвою «%s» уже існує." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Замінити" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Бажаєте замінити %s на з'єднання з VPN, яке ви зберігаєте?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Неможливо експортувати з'єднання з VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2506,7 +2544,7 @@ "\n" "Помилка: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Експортувати з'єднання з VPN" @@ -2533,60 +2571,50 @@ msgid "Make available to _other users" msgstr "Зробити доступним для _інших користувачів" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#| msgid "Network" +msgid "Net­work" msgstr "Мережа" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Вказати яким способом з'єднуватись з інтернетом" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 +#| msgid "" +#| "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;" +#| "vpn;vlan;bridge;bond;DNS;" msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Мережа;Бездротова;Wi-Fi;Wifi;IP;LAN;Проксі;WAN;Широкосмуговий;Модем;" -"Bluetooth;vpn;vlan;міст;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Прив'язування пристроїв" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(немає)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Міст для пристроїв" +"Мережа;Бездротова;Wi-" +"Fi;Wifi;IP;LAN;Проксі;WAN;Широкосмуговий;Модем;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "ніколи" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "сьогодні" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "вчора" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Адреса IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Востаннє використано" @@ -2596,34 +2624,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Дротовий" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Параметри…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Профіль %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Додати нове з'єднання" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Команда підопічних" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2631,12 +2650,12 @@ "Якщо у вас є з'єднання з інтернетом відмінне від бездротового, можете " "відкрити бездротову точку, щоб поділитись з'єднанням з іншими." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Перемикання на бездротову гарячу точку роз'єднає вас з %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2644,23 +2663,23 @@ "Коли гарячу точку вже ввімкнено, неможливо доступитись до інтернету через " "бездротову мережу." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "Зупинити гарячу точку й від'єднати користувачів?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Зупинити гарячу точку" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "Системна політика забороняє використовувати комп'ютер як гарячу точку" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Бездротовий пристрій не підтримує режиму гарячої точки" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2668,11 +2687,11 @@ "Подробиці мережі для вибраної мережі, зокрема паролі та інші параметри буде " "втрачено." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Історія" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2680,7 +2699,7 @@ msgstr "_Закрити" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Забути" @@ -2717,6 +2736,10 @@ msgid "Provider" msgstr "Провайдер" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Мережа" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2822,16 +2845,12 @@ #: ../panels/network/wireless-security/eap-method-simple.ui.h:2 #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 -#: ../panels/sharing/sharing.ui.h:11 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/sharing/sharing.ui.h:9 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Пароль" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Немає" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "Показати па_роль" @@ -2925,7 +2944,6 @@ msgstr "_З'єднатись з прихованою мережею…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Історія" @@ -2947,359 +2965,338 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Пароль" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Спеціальне" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Інфраструктура" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Стан невідомий" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Некерований" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Недоступний" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "З'єднання" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Потрібна автентифікація" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "З'єднано" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Від'єднання" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Не вдалось з'єднатись" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Стан невідомий (немає)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Не з'єднано" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Не вдалося налаштувати" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Не вдалося налаштувати IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Налаштування IP застаріли" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Таємниці є обов'язковими, проте їх не надано" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "Шукача 802.1x від'єднано" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Не вдалося налаштувати шукач 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Помилка шукача 802.1x" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "Шукач 802.1x забрав надто багато часу для автентифікації " #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Не вдалося запустити службу PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Службу PPP від'єднано" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "Помилка PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Не вдалося запустити клієнт DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Помилка клієнта DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Помилка роботи клієнта DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Не вдалося запустити службу спільного з'єднання" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Помилка роботи служби спільного з'єднання" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Не вдалося запустити службу AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Помилка служби AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Помилка роботи служби AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Лінію зайнято" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Немає гудка" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Неможливо встановити жодного носія" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Час очікування набирання збіг" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Не вдала спроба набирання номеру" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Не вдалося запустити модем" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Не вдалось вибрати вказаний APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Немає пошуку мереж" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Реєстрацію мережі заборонено" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Час реєстрації мережі вичерпано " #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Не вдалось зареєструватись з мережею" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Не вдалось перевірити PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Може бракувати мікропрограми для пристрою" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "З'єднання зникло" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Наявне з'єднання вигадано" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "Не знайдено модему" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Не вдалось з'єднатись з Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Не вставлено картки SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Потрібно SIM Pin" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Потрібно SIM Puk" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "Неправильний SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Пристрій InfiniBand не підтримує з'єднаний режим" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Помилка роботи залежності з'єднання" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "Бракує мікропрограми" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Кабель від'єднано" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Не вибраний сертифікат Центру Сертифікації" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "Невизначена помилка в безпеці 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +#| msgid "No input source selected" +msgid "no file selected" +msgstr "не вибрано жодного файла" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Без використання сертифікату Центру сертифікації (CA) можливе приєднання до " -"небезпечних, зловмисних мереж Wi-Fi. Вибрати сертифікат Центру сертифікації?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Знехтувати" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Вибрати сертифікат ЦС" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Закриті ключі DER, PEM або PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "Невизначена помилка завірення файла з методом eap" + +#: ../panels/network/wireless-security/eap-method.c:480 +#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Закриті ключі DER, PEM або PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Сертифікати DER або PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "Бракує файла EAP-FAST PAC" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Виберіть файл PAC" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Файли PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "_Файл PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Вн_утрішнє засвідчення" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "За_готовлення PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3308,41 +3305,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Анонімно" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Розпізнано" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Обидва" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "_Файл PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Вн_утрішнє засвідчення" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#| msgid "PAC pro_visioning" +msgid "Allow automatic PAC pro_visioning" +msgstr "Дозволити автоматичне за_готовлення PAC" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "бракує користувача EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "бракує паролю EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Користувач" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "П_оказати пароль" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "неправильний сертифікат ЦС EAP-PEAP: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "Неправильний сертифікат ЦС EAP-PEAP: не вказано сертифікату" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Виберіть сертифікат видавця" @@ -3360,19 +3390,58 @@ msgid "C_A certificate" msgstr "Сертифікат _ЦС" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#| msgid "Authentication required" +msgid "No CA certificate is _required" +msgstr "Не _вимагається сертифікату ЦС" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "Ве_рсія PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "_Запитувати цей пароль щоразу" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "бракує користувача EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +#| msgid "Wrong password" +msgid "missing EAP password" +msgstr "бракує паролю EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "бракує ототожнення EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "неправильний сертифікат ЦС EAP-TLS: %s" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "Неправильний сертифікат ЦА EAP-TLS: не вказано сертифікату" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "неправильний пароль EAP-TLS: порожній" + +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "неправильний закритий ключ EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "неправильний сертифікат користувача EAP-TLS: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Небезпечно використовувати секретні ключі без шифрування" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3385,11 +3454,11 @@ "\n" "(можете зробити це за допомогою openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Виберіть ваш особистий сертифікат" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Виберіть ваш особистий ключ" @@ -3401,51 +3470,56 @@ msgid "_User certificate" msgstr "Сертифікат _користувача" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "Закритий _ключ" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Пароль _закритого ключа" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "неправильний сертифікат ЦС EAP-TTLS: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "неправильний сертифікат ЦА EAP-TTLS: не вказано сертифікату" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "_Не попереджувати надалі" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Ні" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Так" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Невідома помилка завірення безпеки 802.1x" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "Тунельований TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "Захищений EAP (PEAP)" @@ -3455,6 +3529,51 @@ msgid "Au_thentication" msgstr "За_свідчення" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "бракує користувача LEAP" + +#: ../panels/network/wireless-security/ws-leap.c:74 +#| msgid "Wrong password" +msgid "missing leap-password" +msgstr "бракує паролю LEAP" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "бракує ключа WEP" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"неправильний ключ WEP: ключ з довжиною %zu мусить містити тільки " +"шістнадцяткові значення" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"неправильний ключ WEP: ключ з довжиною %zu мусить містити тільки символи " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"неправильний ключ WEP: хибний довжина ключа %zu. Ключ має бути: або довжина " +"5/13 (ascii), або 10/26 (шістнадцятковий)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "неправильний ключ WEP: пароль не може убти порожній" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "неправильний ключ WEP: пароль не може перевищувати понд 64 символи" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (типово)" @@ -3491,19 +3610,33 @@ msgid "WEP inde_x" msgstr "_Індекс WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"неправильний ключ PSK: неправильна довжина ключа %zu. Має бути [8,63] біти " +"або 64 шістнадцяткових значення" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"неправильний WPA-PSK: неможливо означити ключ з 64 шістнадцятковими бітами" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Тип" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Увімкнено" @@ -3540,16 +3673,18 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Показувати в_міст повідомлення в заблокованому екрані" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#| msgid "Notifications" +msgid "No­ti­fi­ca­tions" msgstr "Сповіщення" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Вказує які сповіщення показуються і що вони показують" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Сповіщення;Шапка;Повідомлення;Лоток;Контекстний;" @@ -3567,81 +3702,72 @@ msgid "Applications" msgstr "Програми" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Інше" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Додати обліковий запис" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Пошта" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +#| msgid "_Calendar" +msgid "Calendar" +msgstr "Календар" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Контакти" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Розмова" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Ресурси" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Помилка входу в обліковий запис" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Строк дії реєстраційних даних вичерпано." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Увійдіть, щоб увімкнути цей обліковий запис." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "_Увімкнути" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Помилка створення облікового запису" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Помилка вилучення облікового запису" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Вилучити обліковий запис?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Облікового запису не буде вилучено із сервера." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Вилучити" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#| msgid "Online Accounts" +msgid "On­line Accounts" msgstr "Мережеві облікові записи" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "З'єднатись з вашим мережевими обліковими записами і вирішити, що з ними " "робити " #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3654,6 +3780,7 @@ msgstr "Не налаштовано жодного мережевого облікового запису" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Вилучити обліковий запис" @@ -3800,7 +3927,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Батарея" @@ -3848,103 +3975,104 @@ msgid "When _idle" msgstr "Коли _бездіяльний" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Заощадження енергії" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "Яскравість _екрана" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Автоматична яскравість" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Підсвічування _клавіатури" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Затемнювати екран, коли нічого не відбувається" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Порожній екран" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "Wi_-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Вимкнути Wi-Fi для заощадження енергії." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "_Мобільна широкосмугова радіомережа" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Вимкнути пристрої широкосмугової мережі (3G, 4G, LTE тощо) для заощадження " "енергії." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Коли живлення від батареї" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Коли під'єднано" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Призупинити" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Приспати" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Нічого" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Кнопка призупинення і вимикання" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Автоматично призупиняти" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Автоматично призупиняти роботу" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "Коли кнопку ви_мкнення натиснуто" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Пристрої" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Живлення" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Переглянути стан вашої батареї і змінити параметри заощадження енергії" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4023,11 +4151,6 @@ msgid "Delay" msgstr "Затримка" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Скасувати" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Засвідчення" @@ -4037,138 +4160,138 @@ msgstr "Потрібно засвідчитись" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Закінчується тонер" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Вичерпався тонер" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Закінчується проявник" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Вичерпався проявник" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Закінчується фарба" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Вичерпано фарбу" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Відкрита кришка" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Відкриті двері" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Закінчується папір" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Вичерпано папір" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Вимкнено" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Зупинено" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Майже повністю витрачено запас" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Повністю витрачено запас" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Оптичний фотопровідник близький до виходу з ладу" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Оптичний фотопровідник вийшов з ладу" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Налаштування" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Готовий" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Завдання не прийнято" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Оброблення" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Рівень тонера" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Рівень чорнила" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Рівень постачання" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Встановлення" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" @@ -4177,64 +4300,62 @@ msgstr[2] "%u активних" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Не вдалось додати принтер." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Виберіть файл PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "" "Файли опису принтера PostScript (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Не знайдено придатного драйвера" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Пошук бажаних драйверів…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Вибрати з бази даних…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Надати файл PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Тестова сторінка" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Немає принтерів" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Не вдалось завантажити інтерфейс: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#| msgid "Printers" +msgid "Prin­ters" msgstr "Принтери" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Додати принтер, переглянути завдання і визначити, яким способом друкувати" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Принтер;Черга;Друк;Папір;Чорнило;Тонер;" @@ -4396,6 +4517,11 @@ msgid "Parallel Port" msgstr "Паралельний порт" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4607,13 +4733,17 @@ msgid "_Options" msgstr "_Параметри" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Немає принтерів" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Додати принтер" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4621,70 +4751,70 @@ "Вибачте! Система служба друкування,\n" "здається, недоступна." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Блокування екрана" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Використовується" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Увімкнено" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Вимкнено" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Служби розташування" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Використання та історія" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Очистити всі елементи зі смітника?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Якщо вилучити елементи в смітнику, їх буде вилучено безповоротно." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "С_порожнити смітник" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Вилучити усі тимчасові файли?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Усі тимчасові файли буде безповоротно вилучено." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "П_очистити тимчасові файли" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Очистити кошик і тимчасові файли" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Використання програм" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Звітування про проблему" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4693,20 +4823,21 @@ "Надсилання звітів щодо технічних проблем допоможе нам покращити %s. Звіти " "надсилаються анонімно та відкидають особисті дані." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Правила конфіденційності" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Конфіденційність" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "Захистити ваші особисті дані та вказати, що можуть бачити інші" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4878,21 +5009,21 @@ msgid "Other" msgstr "Інше" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "Щоб зміни набрали чинності, потрібно перезапустити ваш сеанс" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Перезапустити зараз" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "Не вибрано жодного джерела введення" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "Вікно в_ходу" @@ -4924,17 +5055,19 @@ msgid "Paper" msgstr "Папір" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#| msgid "Region & Language" +msgid "Re­gion & Lan­guage" msgstr "Регіон та мова" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "Вибрати вашу мову, формати, розклади й джерела введення" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Мова;Розкладка;Клавіатура;Введення;" @@ -4991,7 +5124,7 @@ msgstr "Лівий та правий Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Мова" @@ -5041,26 +5174,11 @@ "Параметри входу використовуються всіма користувачами, коли вони входять у " "систему" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Місця" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Закладки" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Інше" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "Вибрати регіон" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "_Гаразд" @@ -5068,18 +5186,19 @@ msgid "No applications found" msgstr "Не знайдено жодної програми" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Пошук" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" "Вказує, які програми показувати у результатах пошуку в огляді діяльності" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Пошук;Знайти;Індекс;Сховати;Конфіденційність;Результати;" @@ -5087,6 +5206,24 @@ msgid "Search Locations" msgstr "Місця пошуку" +#: ../panels/search/search-locations-dialog.ui.h:2 +#| msgctxt "Search Location" +#| msgid "Places" +msgid "Places" +msgstr "Місця" + +#: ../panels/search/search-locations-dialog.ui.h:3 +#| msgctxt "Search Location" +#| msgid "Bookmarks" +msgid "Bookmarks" +msgstr "Закладки" + +#: ../panels/search/search-locations-dialog.ui.h:4 +#| msgctxt "Online Account" +#| msgid "Other" +msgid "Other" +msgstr "Інше" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Перемістити вгору" @@ -5099,6 +5236,11 @@ msgid "Preferences" msgstr "Параметри" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Немає жодної вибраної мережі для оприлюднення" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5124,55 +5266,89 @@ msgid "Choose a Folder" msgstr "Вибрати теку" -#: ../panels/sharing/cc-sharing-panel.c:798 +#: ../panels/sharing/cc-sharing-panel.c:680 +#, c-format +msgid "" +"Personal File Sharing allows you to share your Public folder with others on " +"your current network using: dav://%s" +msgstr "" +"Особисте оприлюднення файлів дозволяє ділитись вмістом вашої привселюдної " +"теки з іншими у вашій поточній мережі за допомогою: dav://%s" + +#: ../panels/sharing/cc-sharing-panel.c:682 +#, c-format +#| msgid "" +#| "Allow remote users to connect using the Secure Shell command:\n" +#| "ssh %s" +msgid "" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" +"ssh %s" +msgstr "" +"Коли віддалений доступ увімкнено, користувачі можуть підʼєднатись через " +"команду:\n" +"ssh %s" + +#: ../panels/sharing/cc-sharing-panel.c:684 +#, c-format +#| msgid "" +#| "Allow remote users to view or control your screen by connecting to: vnc://%s" +msgid "" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" +msgstr "" +"Дозволяє віддаленим користувачам керувати вашим екраном за допомогою " +"під'єднання до vnc://%s" + +#: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Копіювати" -#: ../panels/sharing/cc-sharing-panel.c:1124 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 +#: ../panels/sharing/cc-sharing-panel.c:1122 msgid "Sharing" msgstr "Оприлюднення" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +#| msgid "Sharing" +msgid "Sha­ring" +msgstr "Оприлюднення" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "Вказує, чим ви бажаєте поділитись з іншими" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" msgstr "" "спільне;оприлюднення;ssh;вузол;назва;віддалений;стільниця;носій;аудіо;відео;" "малюнок;фотографії;фільми;сервер;відтворення;" - -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 -msgid "Enable or disable remote login" -msgstr "Увімкнути або вимкнути віддалений вхід" - -#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 -msgid "Authentication is required to enable or disable remote login" -msgstr "Потрібно засвідчення, щоб увімкнути або вимкнути віддалений вхід" - -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Немає жодної вибраної мережі для оприлюднення" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. + #: ../panels/sharing/networks.ui.h:1 msgid "Networks" msgstr "Мережі" +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 +msgid "Enable or disable remote login" +msgstr "Увімкнути або вимкнути віддалений вхід" + +#: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:2 +msgid "Authentication is required to enable or disable remote login" +msgstr "Потрібно засвідчення, щоб увімкнути або вимкнути віддалений вхід" + #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Назва _комп'ютера" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "_Особисте оприлюднення файлів" +#| msgid "_Personal File Sharing" +msgid "_File Sharing" +msgstr "_Оприлюднення файлів" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5191,85 +5367,58 @@ msgstr "Деякі служби вимкнено через недоступність мережі." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Особисте оприлюднення файлів" - -#: ../panels/sharing/sharing.ui.h:9 -#, no-c-format -msgid "" -"Personal File Sharing allows you to share your Public folder with others on " -"your current network using: dav://%s" -msgstr "" -"Особисте оприлюднення файлів дозволяє ділитись вмістом вашої привселюдної " -"теки з іншими у вашій поточній мережі за допомогою: dav://%s" +#| msgid "Sharing" +msgid "File Sharing" +msgstr "Оприлюднення файлів" -#: ../panels/sharing/sharing.ui.h:10 +#: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" msgstr "Вимагати па_роль" -#: ../panels/sharing/sharing.ui.h:12 +#: ../panels/sharing/sharing.ui.h:10 msgid "Remote Login" msgstr "Віддалений вхід" -#: ../panels/sharing/sharing.ui.h:14 -#, no-c-format -msgid "" -"Allow remote users to connect using the Secure Shell command:\n" -"ssh %s" -msgstr "" -"Дозволяє віддаленим користувачам під'єднатись за допомогою команди:\n" -"ssh %s" - -#: ../panels/sharing/sharing.ui.h:16 +#: ../panels/sharing/sharing.ui.h:11 msgid "Screen Sharing" msgstr "Оприлюднення екрана" -#: ../panels/sharing/sharing.ui.h:18 -#, no-c-format -msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" -msgstr "" -"Дозволяє віддаленим користувачам керувати вашим екраном за допомогою " -"під'єднання до: vnc://%s" - -#: ../panels/sharing/sharing.ui.h:19 -msgid "_Allow Remote Control" -msgstr "_Дозволити віддалене керування" +#: ../panels/sharing/sharing.ui.h:12 +msgid "_Allow connections to control the screen" +msgstr "_Дозволити під'єднуватись і керувати екраном" -#: ../panels/sharing/sharing.ui.h:20 +#: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" msgstr "_Пароль:" -#: ../panels/sharing/sharing.ui.h:21 +#: ../panels/sharing/sharing.ui.h:14 msgid "_Show Password" msgstr "_Показати пароль" -#: ../panels/sharing/sharing.ui.h:22 +#: ../panels/sharing/sharing.ui.h:15 msgid "Access Options" msgstr "Параметри доступу" -#: ../panels/sharing/sharing.ui.h:23 +#: ../panels/sharing/sharing.ui.h:16 msgid "_New connections must ask for access" msgstr "_Нові з'єднання мають вимагати доступ" -#: ../panels/sharing/sharing.ui.h:24 +#: ../panels/sharing/sharing.ui.h:17 msgid "_Require a password" msgstr "Вимагати _пароль" -#: ../panels/sharing/sharing.ui.h:25 +#: ../panels/sharing/sharing.ui.h:18 msgid "Media Sharing" msgstr "Оприлюднення матеріалів" -#: ../panels/sharing/sharing.ui.h:26 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Оприлюднення матеріалів дозволяє ділитись музикою, світлинами та " -"відеозаписами через мережу." +#: ../panels/sharing/sharing.ui.h:19 +#| msgid "" +#| "Media sharing allows you to share music, photos and videos over the " +#| "network." +msgid "Share music, photos and videos over the network." +msgstr "Ділитись музикою, світлинами та відеозаписами через мережу." -#: ../panels/sharing/sharing.ui.h:27 +#: ../panels/sharing/sharing.ui.h:20 msgid "Folders" msgstr "Теки" @@ -5399,11 +5548,6 @@ msgid "Peak detect" msgstr "Виявлення піків" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Назва" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Пристрій" @@ -5498,16 +5642,22 @@ msgid "Subwoofer" msgstr "Низькочастотний динамік" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Свій" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +#| msgid "Universal Access" +msgid "Uni­ver­sal Access" +msgstr "Універсальний доступ" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Полегшує читання, слухання, набирання, наведення і натискання" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5605,8 +5755,9 @@ msgstr "Звукові клавіші" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Подавати гудок, коли ввімкнено Num Lock або Caps Lock." +#| msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Подавати гудок, коли перемикається Num Lock або Caps Lock." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5987,96 +6138,81 @@ msgstr "Ефекти кольорів" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Додати користувача" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Повне ім'я" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 +#| msgctxt "Account type" +#| msgid "Standard" msgid "Standard" msgstr "Стандартно" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 +#| msgctxt "Account type" +#| msgid "Administrator" msgid "Administrator" msgstr "Адміністратор" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Повне ім'я" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "_Тип облікового запису" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "" "Дозволяє користувачу вказати пароль, коли він в_ходитиме наступного разу" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Вкажіть пароль _зараз" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +#| msgid "_Configure..." +msgid "_Confirm" msgstr "Пі_дтвердити" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 +#| msgid "" +#| "Enterprise login allows an existing centrally managed user account to be " +#| "used on this device." msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" "Комерційний вхід дозволяє наявним обліковим записам централізовано " -"використовуватись на цьому пристрою." +"використовуватись на цьому пристрою. Можете також використовувати цей " +"обліковий запис для доступу ресурсів компанії через інтернет." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Домен" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Увійдіть у мережу, щоб\n" -"додати комерційні облікові записи." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "_Комерційний вхід" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Додати користувача" +#| msgctxt "printer state" +#| msgid "Offline" +msgid "You are Offline" +msgstr "Ви поза мережею" -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "З_ареєструвати" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Вхід адміністратора домену" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"Комп'ютер потрібно зареєструвати в домені, щоб\n" -"використовувати комерційний вхід. Попрохайте вашого \n" -"мережевого адміністратора ввести тут пароль домену." - -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Адміністратор" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#| msgid "" +#| "Go online to add\n" +#| "enterprise login accounts." +msgid "You must be online in order to add enterprise users." +msgstr "Увійдіть у мережу, щоб додавати комерційних користувачів." -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Пароль адміністратора" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "_Комерційний вхід" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6111,7 +6247,7 @@ msgstr "Мізинець палець правої руки" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Увімкнути вхід у систему за відбитком" @@ -6148,9 +6284,32 @@ msgid "Login;Name;Fingerprint;Avatar;Logo;Face;Password;" msgstr "Вхід;Назва;Відбитки;Аватар;Логотип;Лице;Пароль;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Історія входжень" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "З_ареєструвати" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Вхід адміністратора домену" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Комп'ютер потрібно зареєструвати в домені, щоб\n" +"використовувати комерційний вхід. Попрохайте вашого \n" +"мережевого адміністратора ввести тут пароль домену." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Адміністратор" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Пароль адміністратора" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6173,39 +6332,32 @@ msgstr "П_оточний пароль" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "" -"Дозволяє користувачу вказати пароль, коли він входитиме наступного разу" +#| msgid "Allow user to set a password when they next login" +msgid "Allow user to change their password on next login" +msgstr "Дозволяє користувачу змінювати пароль під час наступного входу" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Вкажіть пароль зараз" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Додати обліковий запис користувача" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Вилучити обліковий запис користувача" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +#| msgid "Add User" +msgid "_Add User…" +msgstr "_Додати користувача…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Параметри входу" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "_Автоматичний вхід" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Вхід через відбитки _пальців" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Піктограма користувача" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Останній вхід" @@ -6308,9 +6460,11 @@ msgstr "Намагайтесь додати якомога більше букв, чисел і символів." #: ../panels/user-accounts/pw-utils.c:117 +#| msgctxt "Password hint" +#| msgid "Mix uppercase and lowercase and use a number or two." msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Змішуйте великі букви з малими і використайте число або навіть два." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Змішуйте великі букви з малими і намагайтесь використовувати числа." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6401,32 +6555,33 @@ msgstr "Невідома помилка" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "Мусить збігатись з адресою вашого постачальника облікового запису." +#| msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." +msgstr "Мусить збігатись з адресою вашого постачальника." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Не вдалось додати обліковий запис" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Паролі не збігаються." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Не вдалося зареєструвати обліковий запис" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Непідтримуваний спосіб автентифікації з цим доменом" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Не вдалось долучитись до домену" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6434,7 +6589,7 @@ "Цей користувач не спрацював.\n" "Спробуйте ще." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6442,14 +6597,24 @@ "Цей пароль не спрацював.\n" "Спробуйте ще." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Не вдалось увійти до домену" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Неможливо знайти домен. Можливо, ви зробили орфографічну помилку?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Стандартно" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Адміністратор" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6469,30 +6634,30 @@ msgid "Enabled" msgstr "Увімкнено" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Вилучити зареєстровані відбитки?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "В_илучити відбитки" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "" "Вилучити зареєстровані відбитки пальців та заборонити вхід через відбитки?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Зроблено!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Не вдалось отримати доступ до пристрою «%s»" @@ -6500,16 +6665,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Не вдалось почати сканування відбитків пальців на пристрої «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Не вдалось знайти пристрої сканування відбитків" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Зв'яжіться з системним адміністратором за допомогою." @@ -6518,7 +6683,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6527,11 +6692,11 @@ "Щоб увімкнути вхід через відбитки пальців, треба зняти один або декілька " "зразків, використовуючи пристрій «%s»" -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Вибирання пальця" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Зарахування відбитків" @@ -6585,14 +6750,21 @@ msgid "%s, %s" msgstr "%s, %s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Сеанс завершено" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Сеанс розпочато" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s — Діяльність облікового запису" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Будь ласка, виберіть інший пароль." @@ -6654,7 +6826,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Неможливо з'єднатися із доменом %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Інші облікові записи" @@ -6734,15 +6906,15 @@ msgid "Logged in" msgstr "Увійшов" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Не вдалось зв'язатись зі службою облікових записів" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Будь ласка, переконайтесь, що AccountService встановлено та ввімкнено." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6750,12 +6922,12 @@ "Щоб унести зміни,\n" "натисніть спочатку на піктограму *" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Створити обліковий запис користувача" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6763,12 +6935,12 @@ "Щоб створити обліковий запис користувача,\n" "натисніть спочатку на піктограму *" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Вилучити вибраний обліковий запис користувача" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6776,33 +6948,35 @@ "Щоб вилучити вибраний обліковий запис користувача,\n" "натисніть спочатку на піктограму *" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Мій обліковий запис" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Користувач «%s» вже існує." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Вибачте, цей користувач недоступний. Спробуйте інакшого." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Перейменуйте користувача на меншу кількістю літер." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Користувач не може мати на початку «-»." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 +#| msgid "" +#| "The username should only consist of lower and upper case letters from a-" +#| "z, digits and any of characters '.', '-' and '_'." msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Щоб найменувати користувача, потрібно використовувати великі і малі букви " -"від a до z, числа і будь-який символ з «.», «-» і «_»." +"Щоб вказати користувача, потрібно використовувати великі і малі букви від a " +"до z, числа і такі числа: «.», «-», «_»." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Це буде назвою вашого домашнього каталогу, яку згодом змінити буде неможливо." @@ -6893,19 +7067,20 @@ msgid "Button" msgstr "Кнопка" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#| msgid "Wacom Tablet" +msgid "Wa­com Tab­let" msgstr "Планшет Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "" "Вкажіть відбиття кнопок і скоригуйте чутливість стилуса для графічних " "планшетів" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Планшет;Wacom;Стилус;Гумка;Миша;" @@ -6937,6 +7112,10 @@ msgid "Bluetooth Settings" msgstr "Параметри Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Планшет Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Відбити на моніторі…" @@ -7030,22 +7209,22 @@ msgid "Mode Switch #%d" msgstr "Перемикач режиму #%d" -#: ../panels/wacom/gsd-wacom-device.c:1300 +#: ../panels/wacom/gsd-wacom-device.c:1238 #, c-format msgid "Left Button #%d" msgstr "Ліва кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1303 +#: ../panels/wacom/gsd-wacom-device.c:1241 #, c-format msgid "Right Button #%d" msgstr "Права кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1306 +#: ../panels/wacom/gsd-wacom-device.c:1244 #, c-format msgid "Top Button #%d" msgstr "Верхня кнопка #%d" -#: ../panels/wacom/gsd-wacom-device.c:1309 +#: ../panels/wacom/gsd-wacom-device.c:1247 #, c-format msgid "Bottom Button #%d" msgstr "Нижня кнопка #%d" @@ -7122,6 +7301,11 @@ msgid "Tip Pressure Feel" msgstr "Чутливість дотику" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Усі параметри" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Центр керування GNOME" @@ -7178,22 +7362,18 @@ msgid "Quit" msgstr "Вийти" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Усі параметри" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Особисте" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Обладнання" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Система" @@ -7232,6 +7412,186 @@ msgid "Cancel search" msgstr "Скасувати пошук" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +#| msgid "_Stop Hotspot" +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Гарячу точка" + +#~ msgid "Color" +#~ msgstr "Колір" + +#~ msgid "_Name:" +#~ msgstr "_Назва:" + +#~ msgid "Add Shortcut" +#~ msgstr "Додати скорочення" + +#~ msgid "Remove Shortcut" +#~ msgstr "Вилучити скорочення" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Щоб змінити комбінацію клавіш, клацніть у відповідному рядку та введіть " +#~ "нові клавіші, або натисніть Backspace для очищення." + +#~ msgid "" +#~ msgstr "<Невідома дія>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Скорочення «%s» не можна використовувати, оскільки використання цієї " +#~ "клавіші для звичайного вводу стане неможливим.\n" +#~ "Будь ласка, спробуйте з такими клавішами, як Control, Alt чи Shift " +#~ "одночасно." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Скорочення «%s» вже використовується для\n" +#~ "«%s»" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Після перепризначення скорочення «%s» на «%s», його буде вимкнено." + +#~ msgid "_Reassign" +#~ msgstr "_Перепризначити" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Скорочення «%s» пов'язано зі скороченням «%s». Бажаєте автоматично " +#~ "вказувати це як «%s»?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "«%s» наразі пов'язано з «%s», це скорочення буде вимкнено, якщо ви " +#~ "перейдете далі." + +#~ msgid "_Assign" +#~ msgstr "_Призначити" + +#~ msgid "Bond" +#~ msgstr "Прив'язка" + +#~ msgid "Team" +#~ msgstr "Команда" + +#~ msgid "Bridge" +#~ msgstr "Міст" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Неможливо завантажити додатки VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Додати мережеве з'єднання" + +#~ msgid "Bond slaves" +#~ msgstr "Прив'язування пристроїв" + +#~ msgid "(none)" +#~ msgstr "(немає)" + +#~ msgid "Bridge slaves" +#~ msgstr "Міст для пристроїв" + +#~ msgid "Team slaves" +#~ msgstr "Команда підопічних" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Пристрій InfiniBand не підтримує з'єднаний режим" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Не вибраний сертифікат Центру Сертифікації" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Без використання сертифікату Центру сертифікації (CA) можливе приєднання " +#~ "до небезпечних, зловмисних мереж Wi-Fi. Вибрати сертифікат Центру " +#~ "сертифікації?" + +#~ msgid "Ignore" +#~ msgstr "Знехтувати" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Вибрати сертифікат ЦС" + +#~ msgid "As_k for this password every time" +#~ msgstr "_Запитувати цей пароль щоразу" + +#~ msgid "Don't _warn me again" +#~ msgstr "_Не попереджувати надалі" + +#~ msgid "No" +#~ msgstr "Ні" + +#~ msgid "Yes" +#~ msgstr "Так" + +#~ msgid "Error logging into the account" +#~ msgstr "Помилка входу в обліковий запис" + +#~ msgid "Credentials have expired." +#~ msgstr "Строк дії реєстраційних даних вичерпано." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Увійдіть, щоб увімкнути цей обліковий запис." + +#~ msgid "_Sign In" +#~ msgstr "_Увімкнути" + +#~ msgid "Power" +#~ msgstr "Живлення" + +#~ msgid "Privacy" +#~ msgstr "Конфіденційність" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Інше" + +#~ msgid "Personal File Sharing" +#~ msgstr "Особисте оприлюднення файлів" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Дозволити віддалене керування" + +#~ msgid "_Verify" +#~ msgstr "Пі_дтвердити" + +#~ msgid "Login History" +#~ msgstr "Історія входжень" + +#~ msgid "Add User Account" +#~ msgstr "Додати обліковий запис користувача" + +#~ msgid "Remove User Account" +#~ msgstr "Вилучити обліковий запис користувача" + +#~ msgid "Login Options" +#~ msgstr "Параметри входу" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Користувач «%s» вже існує." + #~ msgid "Done" #~ msgstr "Завершено" @@ -7304,9 +7664,6 @@ #~ msgid "Fast" #~ msgstr "Швидка" -#~ msgid "Two _finger scroll" -#~ msgstr "Прокручування _двома пальцями" - #~ msgid "No printers available" #~ msgstr "Нема принтерів" @@ -7844,9 +8201,6 @@ #~ msgid "Domain not found." #~ msgstr "Домен не знайдено." -#~ msgid "Wrong password" -#~ msgstr "Неправильний пароль" - #~ msgid "Switch Modes" #~ msgstr "Режими перемикання" @@ -8161,9 +8515,6 @@ #~ msgid "C_reate..." #~ msgstr "С_творити…" -#~ msgid "_Configure..." -#~ msgstr "Н_алаштувати…" - #~ msgid "Wireless Hotspot" #~ msgstr "Бездротова гаряча точка" @@ -8469,9 +8820,6 @@ #~ msgid "Take a screenshot" #~ msgstr "Зробити знімок екрана" -#~ msgid "Shortcut" -#~ msgstr "Скорочення" - #~ msgid "_Right-handed" #~ msgstr "Під _праву руку" @@ -8735,9 +9083,6 @@ #~ msgid "The type of accelerator." #~ msgstr "Тип акселератора." -#~ msgid "Error saving the new shortcut" -#~ msgstr "Помилка при збереженні нового скорочення" - #~ msgid "Too many custom shortcuts" #~ msgstr "Надто багато скорочень" diff -Nru gnome-control-center-3.20.2/po/uz@cyrillic.po gnome-control-center-3.22.1/po/uz@cyrillic.po --- gnome-control-center-3.20.2/po/uz@cyrillic.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/uz@cyrillic.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-11-12 09:36+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: Uzbek\n" +"Language: uz@cyrillic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/uz.po gnome-control-center-3.22.1/po/uz.po --- gnome-control-center-3.20.2/po/uz.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/uz.po 2016-08-12 12:43:57.000000000 +0000 @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-11-12 09:36+0500\n" "Last-Translator: Nurali Abdurahmonov \n" "Language-Team: Uzbek\n" +"Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/vi.po gnome-control-center-3.22.1/po/vi.po --- gnome-control-center-3.20.2/po/vi.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/vi.po 2016-09-27 12:37:36.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: gnome-control-center master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-03-25 20:57+0000\n" -"PO-Revision-Date: 2016-03-26 14:30+0700\n" +"POT-Creation-Date: 2016-09-09 23:07+0000\n" +"PO-Revision-Date: 2016-09-10 07:47+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -93,7 +93,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "Thư mục chứa ảnh" @@ -108,25 +108,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2076 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -157,16 +156,17 @@ msgid "Current background" msgstr "Ảnh nền hiện tại" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "Ảnh nền" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "Thay đổi ảnh nền màn hình" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;Ảnh;nền;Anh;nen;Screen;Màn;hình;Man;hinh;Desktop;" @@ -206,18 +206,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "Tắt chế độ máy bay chuyển sang bật Bluetooth." -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" -msgstr "Bluetooth" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" +msgstr "Blue­tooth" + +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "Bật/tắt Bluetooth và kết nối thiết bị" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;chia sẻ;chia se;sharing;bluetooth;obex;" @@ -387,7 +386,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Mọi tập tin" @@ -426,7 +425,7 @@ msgstr "Lưu hồ sơ" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "_Lưu" @@ -684,7 +683,7 @@ "href=\"windows\">Microsoft Windows một cách hữu ích." #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "Tóm tắt" @@ -696,11 +695,11 @@ msgid "_Import File…" msgstr "Nhậ_p tập tin…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "_Thêm" @@ -850,11 +849,12 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" -msgstr "Màu sắc" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" +msgstr "Màu" + +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "" @@ -862,7 +862,7 @@ "in" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "Color;Màu;Mau;ICC;Profile;Calibrate;Chinh;Printer;Máy;in;May;Display;Màn;" @@ -882,23 +882,23 @@ msgid "No languages found" msgstr "Không tìm thấy ngôn ngữ" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "Hôm nay" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "Hôm qua" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%e %b" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%e %b, %Y" @@ -1018,8 +1018,9 @@ msgid "December" msgstr "Tháng mười hai" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "Ngày & giờ" @@ -1074,14 +1075,14 @@ #: ../panels/datetime/datetime.ui.h:27 msgid "AM / PM" -msgstr "AM / PM" +msgstr "SA / CH" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "Thay đổi ngày giờ hay múi giờ" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "" "Clock;Đồng;hồ;Dong;ho;Timezone;Múi;giờ;Mui;gio;Location;Vị;trí;Vi;tri;nước;" @@ -1095,209 +1096,225 @@ msgid "To change time or date settings, you need to authenticate." msgstr "Bạn cần xác thực để có thể sửa đổi thời gian hoặc ngày tháng." -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "Nắp đã đóng" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "Hiển thị giống nhau" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "Chính" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1960 ../panels/power/cc-power-panel.c:1971 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "Tắt" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "Phụ" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "Sắp xếp màn hình hiển thị tổ hợp" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "Á_p dụng" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "Kéo các bộ hiển thị để sắp xếp chúng" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "Quay ngược chiều kim đồng hồ 90°" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "Quay 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "Quay xuôi chiều kim đồng hồ 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "Cỡ" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "Tỷ lệ màn hình" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "Độ phân giải" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "Chỉnh cho TV" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "Tốc độ làm tươi" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" -msgstr "Hiển thị thanh đỉnh và “Tổng quan Tích cực” trên màn hình hiển thị này" +msgstr "" +"Hiển thị thanh đỉnh và “Tổng quan hoạt động” trên màn hình hiển thị này" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "Màn hình hiển thị thứ hai" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "Nối hai màn hình để tạo không gian làm việc rộng hơn" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "Trình diễn" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "Chỉ hiển thị phần trình diễn và đa phương tiện" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "Giống nhau" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "Cả hai màn hình hiện cùng nội dung" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "_Tắt" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "Không dùng màn hình hiển thị này" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "Không thể lấy thông tin về màn hình" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "_Sắp xếp màn hình hiển thị tổ hợp" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" -msgstr "Thiết bị hiển thị" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" +msgstr "Màn hình" + +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "Chọn cách dùng màn hình và máy chiếu được kết nối" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Bảng;bang;Projector;Máy;chiếu;May;chieu;xrandr;Screen;Màn;hình;Man;" "hinh;Resolution;Độ;phân;giải;Do;phan;gia;Refresh;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "Chưa biết" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d-bit (Mã số biên dịch: %s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d-bit (Mã số biên dịch: %s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d-bít" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d-bít" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "Hỏi cần phải làm gì" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "Không làm gì cả" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "Mở thư mục" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "Thiết bị lưu trữ khác" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "Chọn ứng dụng dành cho đĩa CD nhạc" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "Chọn ứng dụng cho DVD phim" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "Chọn ứng dụng cần chạy khi kết nối máy nghe nhạc" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "Chọn ứng dụng cần chạy khi kết nối máy ảnh, máy quay phim" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "Chọn ứng dụng cho CD phần mềm" @@ -1306,88 +1323,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "DVD nhạc" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "Đĩa Blu-ray trắng" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "Đĩa CD trắng" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "Đĩa DVD trắng" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "Đĩa HD DVD trắng" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Đĩa phim Blu-ray" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "Bộ đọc e-book" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "Đĩa phim HD DVD" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "CD hình" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "CD Siêu phim" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "CD Phim" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Phần mềm Windows" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "Phần" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "Tổng quan" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "Ứng dụng mặc định" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "Đa phương tiện" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "Phiên bản %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" msgstr "Chi tiết" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "Xem thông tin về hệ thống của bạn" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1566,8 +1581,9 @@ msgid "Launch help browser" msgstr "Chạy trình duyệt trợ giúp" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "Cài đặt" @@ -1640,7 +1656,6 @@ msgstr "Khóa màn hình" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "Hỗ trợ truy cập" @@ -1676,11 +1691,21 @@ msgid "High contrast on or off" msgstr "Bật hoặc tắt tương phản cao" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "Phím tắt tự chọn" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1707,122 +1732,129 @@ msgid "Modifiers-only switch to next source" msgstr "Chuyển sang kiểu gõ kế chỉ dùng phím bổ trợ" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "Bàn phím" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "Đặt lại các phím tắt thành giá trị mặc định của chúng" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "%s đang được sử dụng cho %s. Nếu bạn thay thế nó, %s sẽ bị tắt" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "Đặt phím tắt tự chọn" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "Đặt phím tắt" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "Gõ phím tắt mới để thay đổi %s." + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "Thêm phím tắt tự chọn" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "Bàn phím" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "Xem và thay đổi phím tắt và đặt tùy thích nhập liệu" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Shortcut;Phím;tắt;phim;tat;Repeat;Lặp;lap;Blink;Nháy;nhay;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "Phím tắt tự chọn" +msgid "No keyboard shortcut found" +msgstr "Không tìm thấy phím tắt bàn phím" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "Tê_n:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "Lện_h:" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "Thêm phím tắt" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "Bỏ phím tắt" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"Để sửa đổi phím tắt, nhấn vào hàng muốn sửa rồi ấn tổ hợp phím mới hoặc nhấn " -"Backspace để xóa phím tắt." - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "Phím tắt tự chọn" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "Thử tìm kiếm khác" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "Nhấn phím Esc để thôi." -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"Không thể dùng \"%s\" làm phím tắt vì sẽ không thể gõ được phím này nữa.\n" -"Xin hãy thêm một phím bổ trợ như Ctrl, Alt, Shift." +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "Tên" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"Phím tắt \"%s\" đã dùng cho\n" -"\"%s\"" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "Câu lệnh" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "Phím tắt" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "Chỉnh sửa" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "Nếu bạn gán lại phím tắt là \"%s\", \"%s\" sẽ bị tắt." +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "Không có" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "_Gán lại" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "Xóa" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "Gõ phím tắt mới" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "" -"Tổ hợp phím tắt \"%s\" đã được gán cho \"%s\". Bạn có muốn tự động đặt nó " -"thành \"%s\"?" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "Thôi" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "" -"\"%s\" hiện tại được gán cho \"%s\", phím tắt này sẽ bị tắt nếu bạn di " -"chuyển về phía trước." +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:276 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "Thêm" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "_Gán" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "Thay thế" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "Đặt" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "_Kiểm tra cài đặt của bạn" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "Chuột và Touchpad" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "Chuột & Touchpad" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "Thay đổi độ nhạy chuột và touchpad và chọn thuận tay phải/trái" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Pointer;Con;trỏ;tro;Click;Nhấn;Nhắp;Nhan;Nhap;Tap;Double;Dup;Button;" @@ -1882,6 +1914,10 @@ msgstr "Chỗ để bấm chuột" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "Cuộn hai-ngón" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "Cuộn sắc" @@ -1920,11 +1956,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "Chế độ _máy bay" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "Ủy nhiệm mạng" @@ -1932,18 +1968,18 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "VPN %s" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "" "Ôi trời, có gì đó sai rồi. Vui lòng liên lạc với nhà cung cấp phần mềm." -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "Trình quản lý kết nối mạng cần phải đang chạy." @@ -1959,7 +1995,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1976,238 +2012,243 @@ msgid "page 2" msgstr "trang 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "An ninh" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "tự động" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "Hồ sơ %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "Doanh nghiệp" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "Không" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "Không bao giờ" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i ngày trước" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "Không" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "Yếu" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "Ok" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "Tốt" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "Tuyệt hảo" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "Chi tiết" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "Thực thể" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:178 +#: ../panels/network/connection-editor/ce-page-ip4.c:432 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "Địa chỉ" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:191 +#: ../panels/network/connection-editor/ce-page-ip4.c:445 msgid "Netmask" msgstr "Mặt nạ mạng" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:205 +#: ../panels/network/connection-editor/ce-page-ip4.c:458 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "Máy cổng" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:222 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "Xóa địa chỉ" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "Thêm" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:339 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "Máy chủ" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:356 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "Xóa máy chủ DNS" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:472 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "Metric" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:493 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "Xóa định tuyến" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:597 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "Tự động (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:601 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "Thủ công" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:605 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "Chỉ Link-Local" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:935 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "Tiền tố" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "Tự động" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "Tự động, chỉ DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "Đặt lại" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "Không" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Khóa WEP 40/128-bit (thập lục phân hoặc ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "Mật khẩu WEP 128-bit" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "WEP động (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA & WPA2 Cá nhân" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA và WPA2 Doanh nghiệp" @@ -2222,30 +2263,30 @@ msgstr "Tốc độ đường truyền" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "Địa chỉ IPv4" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "Địa chỉ IPv6" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "Địa chỉ phần cứng" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2255,7 +2296,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2338,13 +2379,13 @@ msgid "Firewall _Zone" msgstr "_Vùng tường lửa" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "Mặc định" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "Đây là vùng định nghĩa mức tin cậy của kết nối" @@ -2386,45 +2427,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "Không thể mở cửa sổ điều chỉnh kết nối" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "Hồ sơ mới" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "Bond" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "Team" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "Bridge" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "Không thể tải phần mở rộng VPN" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "Nhập từ tập tin…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "Thêm kết nối mạng" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "Thêm VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2432,7 +2453,7 @@ msgstr "Đặ_t lại" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "_Quên" @@ -2457,11 +2478,11 @@ msgid "S_ecurity" msgstr "_An ninh" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "Không thể nhập kết nối VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2474,36 +2495,36 @@ "\n" "Lỗi: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "Chọn tập tin cần nhập" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "_Mở" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "Đã có tập tin tên “%s” rồi." -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "_Thay thế" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Bạn có muốn thay thế %s bằng kết nối này?" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "Không thể xuất kết nối VPN" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2514,7 +2535,7 @@ "\n" "Lỗi: %s." -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "Xuất kết nối VPN" @@ -2541,60 +2562,46 @@ msgid "Make available to _other users" msgstr "Cho người dùng _khác sử dụng" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "Mạng" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "Điều khiển cách kết nối Internet" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" -"Network;mạng;mang;Wireless;không;dây;khong;day;Wi-Fi;Wifi;IP;LAN;Proxy;ủy;" -"nhiệm;uy;nhiem;WAN;Broadband;Modem;Bluetooth;vlan;bridge;bond;DNS;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "Bond slave" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(không)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "Bridge slave" +"Network;mạng;mang;Wireless;không dây;khong day;Wi-Fi;Wifi;IP;LAN;Proxy;ủy " +"nhiệm;uy nhiem;WAN;Broadband;Modem;Bluetooth;vpn;DNS;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "chưa bao giờ" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "hôm nay" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "hôm qua" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "Địa chỉ IP" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "Dùng lần cuối" @@ -2604,34 +2611,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "Có dây" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "Tùy chọn…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "Hồ sơ %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "Thêm kết nối mới" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "Team slave" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2639,12 +2637,12 @@ "Nếu bạn có kết nối Internet không phải không dây, bạn có thể cài đặt một " "điểm kết nối không dây (hotspot) để chia sẻ kết nối Internet với người khác." -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "Chuyển qua kết nối không dây, bạn sẽ bị ngắt khỏi %s." -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." @@ -2652,26 +2650,26 @@ "Không thể truy cập Internet không dây khi điểm kết nối không dây vẫn đang " "hoạt động." -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "" "Bạn có muốn dừng điểm truy cập này và ngắt kết nối những người đang sử dụng?" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "_Dừng điểm truy cập" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "" "Chính sách của hệ thống cấm chỉ dùng máy tính này như một Hotspot (Điểm tập " "trung để máy khác truy cập mạng)" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "Thiết bị không dây không hỗ trợ chế độ điểm truy cập" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." @@ -2679,11 +2677,11 @@ "Sẽ mất chi tiết của những mạng được chọn, bao gồm mật khẩu và các cài đặt " "tùy biến khác." -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "Lịch sử" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2691,7 +2689,7 @@ msgstr "Đón_g" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "_Quên" @@ -2726,6 +2724,10 @@ msgid "Provider" msgstr "Nhà cung cấp" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "Mạng" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2832,15 +2834,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "_Mật khẩu" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "Không có" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "_Hiện mật khẩu" @@ -2934,7 +2932,6 @@ msgstr "_Nối vào mạng ẩn…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "_Lịch sử" @@ -2956,360 +2953,337 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "Mật khẩu" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "Hạ tầng" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "Tình trạng không rõ" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "Chưa được quản lý" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "Không sẵn sàng" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "Đang kết nối" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "Cần xác thực" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "Đã kết nối" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "Đang ngắt kết nối" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "Kết nối gặp lỗi" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "Tình trạng không rõ (thiếu)" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "Chưa kết nối" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "Cấu hình gặp lỗi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "Cấu hình IP gặp lỗi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "Hết hạn cấu hình IP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "Cần bí mật nhưng chưa được cung cấp" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x supplicant ngắt kết nối" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "Lỗi cấu hình 802.1x supplicant" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "Lỗi 802.1x supplicant" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x supplicant tốn quá nhiều thời gian để xác thực" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "Gặp lỗi khi khởi động dịch vụ PPP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "Dịch vụ PPP bị ngắt" # Name: don't translate / Tên: đừng dịch #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP bị lỗi" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "Lỗi khởi động trình khách DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "Lỗi trình khách DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "Lỗi trình khách DHCP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "Lỗi khởi động dịch vụ kết nối chia sẻ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "Lỗi dịch vụ kết nối chia sẻ" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "Lỗi khởi động dịch vụ AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "Lỗi dịch vụ AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "Lỗi dịch vụ AutoIP" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "Đường dây bận" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "Không có tông" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "Không thể cài đặt carrier" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "Hết hạn yêu cầu quay số" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "Lỗi quay số" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "Lỗi khởi động Modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "Lỗi chọn APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "Không tìm thấy mạng" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "Đăng ký mạng bị từ chối" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "Hết hạn đăng ký mạng" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "Lỗi đăng ký mạng yêu cầu" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "Gặp lỗi khi kiểm tra PIN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "Có lẽ thiếu firmware cho thiết bị" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "Kết nối bị biến mất" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "Ngầm định kết nối đã tồn tại" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "không tìm thấy Modem" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "Lỗi kết nối Bluetooth" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "Chưa cài SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "Cần Pin của SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "Cần Puk của SIM" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM không đúng" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "Thiết bị InfiniBand không hỗ trợ chế độ kết nối" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "Lỗi phụ thuộc kết nối" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "thiếu firmware" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "Chưa cắm dây" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "Chưa chọn chứng nhận CA." +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "lỗi chưa biết trong an ninh 802.1x (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "chưa chọn tập tin" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"Không dùng giấy chứng nhận CA có thể là nguyên nhân gây nên mất an toàn của " -"kết nối, mạng Wi-Fi lừa đảo. Bạn có muốn chọn một giấy chứng nhận CA không?" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "Bỏ qua" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "Chọn chứng nhận CA" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "Khóa riêng DER, PEM, hay PKCS#12 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "lỗi chưa định nghĩa khi xác thực lại tập tin eap-method" + +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "Khóa riêng DER, PEM, hay PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Giấy phép DER hay PEM (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "thiếu tập tin EAP-FAST" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "Chọn tập tin PAC của bạn" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Tập tin PAC (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "Tập tin _PAC" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "Xác thực _bên trong" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "PAC pro_visioning" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3318,41 +3292,74 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "Nặc danh" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "Đã xác thực" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "Cả hai" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "Tập tin _PAC" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "Xác thực _bên trong" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "Cho phép PAC pro_visioning tự động" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "thiếu tên tài khoản EAP-LEAP" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "thiếu mật khẩu EAP-LEAP" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "_Tài khoản" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "_Hiện mật khẩu" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "giấy chứng nhận CA EAP-PEAP không hợp lệ: %s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "" +"giấy chứng nhận CA EAP-PEAP không hợp lệ: chưa chỉ định giấy chứng nhận" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "Chọn một giấy chứng nhận CA" @@ -3370,19 +3377,56 @@ msgid "C_A certificate" msgstr "Giấy chứng nhận C_A" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +msgid "No CA certificate is _required" +msgstr "_Yêu cầu là không giấy chứng nhận CA" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "_Phiên bản PEAP" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "Luôn _Hỏi mật khẩu này" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "thiếu tên tài khoản EAP" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "thiếu mật khẩu EAP" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "sai định danh EAP-TLS" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "giấy chứng nhận CA EAP-TLS không hợp lệ: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "giấy chứng nhận CA EAP-TLS không hợp lệ: chưa chỉ định giấy chứng nhận" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "mật khẩu EAP-TLS không hợp lệ: thiếu" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "khóa riêng EAP-TLS không hợp lệ: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "giấy chứng nhận người dùng EAP-TLS không hợp lệ: %s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Khóa riêng mà không được mã hóa là không an toàn" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3395,11 +3439,11 @@ "\n" "(Bạn có thể bảo vệ khóa riêng bằng mật khẩu với openssl)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "Chọn chứng nhận cá nhân của bạn" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "Chọn khóa riêng của bạn" @@ -3411,51 +3455,57 @@ msgid "_User certificate" msgstr "Chứng nhận _người dùng" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "_Khóa riêng" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "Mật khẩu khóa _riêng" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "giấy chứng nhận CA EAP-TTLS không hợp lệ: %s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "" +"giấy chứng nhận CA EAP-TTLS không hợp lệ: chưa chỉ định giấy chứng nhận" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "Đừng _cảnh báo tôi nữa" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "Không" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "Có" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "Lỗi thẩm tra an ninh 802.1x chưa biết" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "TLS Xuyên hầm" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "EAP được bảo vệ (PEAP)" @@ -3465,6 +3515,50 @@ msgid "Au_thentication" msgstr "_Xác thực" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "thiếu leap-username" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "thiếu leap-password" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "thiếu wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "" +"wep-key không hợp lệ: khóa phải có chiều dài của %zu phải chỉ chứa chữ số " +"thập lục" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "" +"wep-key không hợp lệ: khóa phải có chiều dài của %zu phải chỉ chứa các ký tự " +"ascii" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"wep-key không hợp lệ: khóa phải có chiều dài của %zu. Một khóa phải hoặc là " +"có chiều dài 5/4 (ascii) hoặc là 10/26 (chữ số thập lục)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "wep-key không hợp lệ: mật khẩu phải không rỗng" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "wep-key không hợp lệ: mật khẩu phải ngắn hơn 64 ký tự" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (Mặc định)" @@ -3501,19 +3595,33 @@ msgid "WEP inde_x" msgstr "_Mục lục WEP" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "" +"wpa-psk không hợp lệ: chiều dài khóa %zu không hợp lệ. Phải là [8,63] bye " +"hoặc 64 số thập lục" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "" +"wpa-psk không hợp lệ: không thể phiên dịch khóa với 64 bye như là số thập lục" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "_Kiểu" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1966 ../panels/power/cc-power-panel.c:1973 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "Bật" @@ -3550,16 +3658,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "Hiển thị nội _dung lời nhắn trên màn hình khóa" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "Thông báo" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "Cấu hình xem cảnh báo nào sẽ được hiển thị và hiển thị nó như thế nào" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "" "Notifications;Thông;báo;Thong;bao;Banner;Message;Nhắn;nhan;Tray;Khay;Popup;" @@ -3579,80 +3688,69 @@ msgid "Applications" msgstr "Ứng dụng" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "Khác" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "Thêm tài khoản" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "Thư điện tử" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "Lịch" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "Danh bạ" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "Tán gẫu" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "Tài nguyên" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "Không thể đăng nhập vào tài khoản này" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "Các giấy ủy nhiệm đã hết hạn." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "Đăng nhập để bật tài khoản này." - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "Đă_ng nhập" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "Không thể tạo tài khoản mới" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "Không thể xóa tài khoản" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "Bạn có chắc chắn muốn xóa tài khoản này không?" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "Hành động này không xóa tài khoản trên máy chủ." -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "_Xóa" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "Tài khoản trực tuyến" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "" "Kết nối các tài khoản trực tuyến của bạn và quyết định dùng chúng vào việc gì" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3666,6 +3764,7 @@ msgstr "Chưa cấu hình tài khoản trực tuyến" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "Bỏ tài khoản" @@ -3804,7 +3903,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2358 msgid "Battery" msgstr "Pin" @@ -3852,102 +3951,103 @@ msgid "When _idle" msgstr "Kh_i nghỉ" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1680 msgid "Power Saving" msgstr "Tiết kiệm năng lượng" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1715 msgid "_Screen brightness" msgstr "_Màn hình sáng tối đa" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1734 msgid "Automatic brightness" msgstr "Chỉnh độ sáng tự động" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1754 msgid "_Keyboard brightness" msgstr "Độ sáng _bàn phím" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1764 msgid "_Dim screen when inactive" msgstr "_Giảm sáng màn hình nếu máy không hoạt động" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1789 msgid "_Blank screen" msgstr "_Tắt màn hình" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1826 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1831 msgid "Turn off Wi-Fi to save power." msgstr "Tắt Wi-Fi để tiết kiệm điện." -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1856 msgid "_Mobile broadband" msgstr "Mạng _di động băng thông rộng" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1861 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "" "Tắt thiết bị di động băng thông rộng (3G, 4G, LTE, v.v..) để tiết kiệm điện." -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1906 msgid "_Bluetooth" msgstr "_Bluetooth" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1962 msgid "When on battery power" msgstr "Khi sử dụng nguồn pin" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1964 msgid "When plugged in" msgstr "Khi cắm dây nguồn" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2059 msgid "Suspend" msgstr "Tạm ngưng" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2060 msgid "Hibernate" msgstr "Ngủ đông" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2061 msgid "Nothing" msgstr "Không gì" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2175 msgid "Suspend & Power Button" msgstr "Nút tạm ngưng & Tắt máy" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2218 msgid "_Automatic suspend" msgstr "_Tự động tạm dừng" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2219 msgid "Automatic suspend" msgstr "Tự động tạm dừng" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2286 msgid "_When the Power Button is pressed" msgstr "_Khi nút bật tắt nguồn được ấn" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2412 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "Thiết bị" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "Nguồn điện" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "Hiển thị trạng thái pin và thay đổi cài đặt chế độ tiết kiệm pin" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -4027,11 +4127,6 @@ msgid "Delay" msgstr "Khoảng trễ" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "Thôi" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "Xác thực" @@ -4041,153 +4136,153 @@ msgstr "Cần xác thực" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:683 msgid "Low on toner" msgstr "Sắp hết mực" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:685 msgid "Out of toner" msgstr "Hết mực" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:688 msgid "Low on developer" msgstr "Sắp hết thuốc hiện hình" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:691 msgid "Out of developer" msgstr "Hết thuốc hiện hình" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:693 msgid "Low on a marker supply" msgstr "Sắp hết một ống mực" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:695 msgid "Out of a marker supply" msgstr "Một ống mực đã hết" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:697 msgid "Open cover" msgstr "Mở nắp" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:699 msgid "Open door" msgstr "Mở cửa" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:701 msgid "Low on paper" msgstr "Sắp hết giấy" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:703 msgid "Out of paper" msgstr "Hết giấy" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:705 msgctxt "printer state" msgid "Offline" msgstr "Ngoại tuyến" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:707 +#: ../panels/printers/cc-printers-panel.c:897 msgctxt "printer state" msgid "Stopped" msgstr "Dừng" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:709 msgid "Waste receptacle almost full" msgstr "Thùng chứa chất thải sắp đầy" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:711 msgid "Waste receptacle full" msgstr "Thùng chứa chất thải đã đầy" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:713 msgid "The optical photo conductor is near end of life" msgstr "Trống quang máy in sắp quá tuổi thọ" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:715 msgid "The optical photo conductor is no longer functioning" msgstr "Trống quang máy in không còn hoạt động được nữa" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:824 msgctxt "printer state" msgid "Configuring" msgstr "Đang cấu hình" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:883 msgctxt "printer state" msgid "Ready" msgstr "Sẵn sàng" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:888 msgctxt "printer state" msgid "Does not accept jobs" msgstr "Không chấp nhận lệnh in" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:893 msgctxt "printer state" msgid "Processing" msgstr "Đang xử lý" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1013 msgid "Toner Level" msgstr "Mức trống mực" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1016 msgid "Ink Level" msgstr "Mức mực" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1019 msgid "Supply Level" msgstr "Mức cung cấp" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1037 msgctxt "printer state" msgid "Installing" msgstr "Đang cài đặt" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1551 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u đang hoạt động" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1892 msgid "Failed to add new printer." msgstr "Không thể thêm máy in mới." -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2073 msgid "Select PPD File" msgstr "Chọn tập tin PPD" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2082 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" @@ -4195,49 +4290,46 @@ "Tập tin PostScript Printer Description (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2389 msgid "No suitable driver found" msgstr "Không tìm thấy trình điều khiển phù hợp" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2460 msgid "Searching for preferred drivers…" msgstr "Đang tìm trình điều khiển phù hợp…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2481 msgid "Select from database…" msgstr "Chọn từ cơ sở dữ liệu…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2490 msgid "Provide PPD File…" msgstr "Cung cấp tập tin PPD…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2637 +#: ../panels/printers/cc-printers-panel.c:2660 msgid "Test page" msgstr "Trang in thử" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "Không có máy in" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3115 #, c-format msgid "Could not load ui: %s" msgstr "Không thể tải giao diện: %s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "Máy in" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "" "Thêm máy in, xem các công việc in và quyết định bạn muốn in như thế nào" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Máy;in;May;Queue;Print;In;Paper;Giấy;Giay;Ink;Mực;Muc;Toner;" @@ -4249,7 +4341,7 @@ #. Translators: this label describes the dialog empty state, with no jobs listed. #: ../panels/printers/jobs-dialog.ui.h:4 msgid "No Active Printer Jobs" -msgstr "Không có yêu cầu in nào tích cực" +msgstr "Không có yêu cầu in nào hoạt động" #: ../panels/printers/new-printer-dialog.ui.h:1 msgid "Add a New Printer" @@ -4399,6 +4491,11 @@ msgid "Parallel Port" msgstr "Cổng song song" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "Bluetooth" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4610,13 +4707,17 @@ msgid "_Options" msgstr "_Tùy chọn" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "Không có máy in" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "Thêm máy in" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4624,70 +4725,70 @@ "Rất tiếc! Dịch vụ in hệ thống\n" "hình như không sẵn sàng." -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "Khóa màn hình" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "Đang dùng" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "Bật" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "Tắt" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "Dịch vụ vị trí" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "Sử dụng & Lịch sử" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "Bỏ mọi thứ trong thùng rác chứ?" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "Toàn bộ nội dung chứa trong Thùng rác sẽ bị xóa vĩnh viễn." -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "Đổ _rác" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "Xóa tất cả các tập tin tạm?" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "Toàn bộ các tập tin tạm sẽ bị xóa vĩnh viễn." -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "_Xóa tập tin tạm" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "Đổ rác & tập tin tạm" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "Cách dùng phần mềm" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "Báo cáo trục trặc" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4696,22 +4797,23 @@ "Báo cáo trục trặc kỹ thuật cho chúng tôi để giúp chúng tôi nâng cao %s. Báo " "cáo gửi nặc danh và xóa sạch dữ liệu cá nhân." -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "Chính sách riêng tư" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" msgstr "Riêng tư" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "" "Bảo về thông tin cá nhân của bạn và không khiển xem người khác có thể xem " "được những gì" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4787,7 +4889,7 @@ #: ../panels/privacy/privacy.ui.h:23 msgid "Cl_ear Recent History" -msgstr "Xóa _Sạch Danh sách Mới dùng" +msgstr "_Xóa Danh sách Mới dùng" #: ../panels/privacy/privacy.ui.h:25 msgid "The Screen Lock protects your privacy when you are away." @@ -4877,30 +4979,30 @@ #: ../panels/region/cc-input-chooser.c:182 msgid "No input sources found" -msgstr "Không tìm thấy nguồn nhập" +msgstr "Không tìm thấy nguồn nhập liệu" #: ../panels/region/cc-input-chooser.c:992 msgctxt "Input Source" msgid "Other" msgstr "Khác" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "" "Phiên làm việc của bạn cần phải khởi động lại máy tính thì các thay đổi mới " "được áp dụng" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "Khởi động lại ngay" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" -msgstr "Chưa chọn nguồn nhập" +msgstr "Chưa chọn nguồn nhập liệu" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "_Màn hình đăng nhập" @@ -4933,17 +5035,19 @@ msgid "Paper" msgstr "Giấy" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" -msgstr "Lãnh thổ và ngôn ngữ" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" +msgstr "Lãnh thổ & ngôn ngữ" + +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" -msgstr "Chọn ngôn ngữ hiển thị, định dạng, bố cục của bàn phím và nguồn nhập" +msgstr "" +"Chọn ngôn ngữ hiển thị, định dạng, bố cục của bàn phím và nguồn nhập liệu" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "" "Language;Ngôn;ngữ;Ngon;ngu;Layout;Bố;trí;Bo;tri;Keyboard;Bàn;phím;Ban;phim;" @@ -4951,7 +5055,7 @@ #: ../panels/region/input-chooser.ui.h:1 msgid "Add an Input Source" -msgstr "Thêm nguồn nhập" +msgstr "Thêm nguồn nhập liệu" #: ../panels/region/input-chooser.ui.h:4 msgid "Input methods can't be used on the login screen" @@ -4959,7 +5063,7 @@ #: ../panels/region/input-options.ui.h:1 msgid "Input Source Options" -msgstr "Tùy chọn nguồn nhập" +msgstr "Tùy chọn nguồn nhập liệu" #: ../panels/region/input-options.ui.h:2 msgid "Use the _same source for all windows" @@ -4975,7 +5079,7 @@ #: ../panels/region/input-options.ui.h:5 msgid "Switch to previous source" -msgstr "Chuyển sang nguồn cũ" +msgstr "Chuyển sang nguồn trước" #: ../panels/region/input-options.ui.h:6 msgid "Super+Shift+Space" @@ -5002,7 +5106,7 @@ msgstr "Alt trái+phải" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "_Ngôn ngữ" @@ -5024,53 +5128,38 @@ #: ../panels/region/region.ui.h:7 msgid "Add input source" -msgstr "Thêm nguồn nhập" +msgstr "Thêm nguồn nhập liệu" #: ../panels/region/region.ui.h:8 msgid "Remove input source" -msgstr "Gỡ bỏ nguồn nhập" +msgstr "Gỡ bỏ nguồn nhập liệu" #: ../panels/region/region.ui.h:9 msgid "Move input source up" -msgstr "Đưa nguồn nhập lên trên" +msgstr "Đưa nguồn nhập liệu lên trên" #: ../panels/region/region.ui.h:10 msgid "Move input source down" -msgstr "Đưa nguồn nhập xuống dưới" +msgstr "Đưa nguồn nhập liệu xuống dưới" #: ../panels/region/region.ui.h:11 msgid "Configure input source" -msgstr "Cấu hình nguồn nhập" +msgstr "Cấu hình nguồn nhập liệu" #: ../panels/region/region.ui.h:12 msgid "Show input source keyboard layout" -msgstr "Hiển thị bố trí bàn phím nguồn nhập" +msgstr "Hiển thị bố trí bàn phím nguồn nhập liệu" #: ../panels/region/region.ui.h:13 msgid "Login settings are used by all users when logging into the system" msgstr "" "Cài đặt đăng nhập được dùng bởi mọi người dùng khi đăng nhập vào hệ thống" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "Mở nhanh" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "Đánh dấu" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "Khác" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "_Chọn vị trí" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "Đồn_g ý" @@ -5078,19 +5167,20 @@ msgid "No applications found" msgstr "Không tìm thấy ứng dụng" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "Tìm kiếm" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "" -"Điều chỉnh ứng dụng nào hiển thị kết quả tìm kiếm trong một “Tổng quan Tích " -"cực”" +"Điều chỉnh ứng dụng nào hiển thị kết quả tìm kiếm trong một “Tổng quan hoạt " +"động”" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "" "Search;Tìm;tim;Find;Index;Mục;lục;muc;luc;Hide;Ẩn;an;Privacy;Riêng;tư;rieng;" @@ -5100,6 +5190,18 @@ msgid "Search Locations" msgstr "Vị trí tìm" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "Mở nhanh" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "Đánh dấu" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "Khác" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "Chuyển lên" @@ -5112,6 +5214,11 @@ msgid "Preferences" msgstr "Tùy thích" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "Chưa chọn mạng để chia sẻ" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5149,37 +5256,43 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"Cho phép người điều khiển từ xa kết nối dùng lệnh “Secure Shell” (ssh):\n" +"Khi đăng nhập máy mạng được bật, những người dùng máy mạng có thể sử dụng " +"lệnh “Secure Shell” (ssh):\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"Cho phép người điều khiển từ xa có thể xem, điều khiển màn hình của bạn bằng " -"cách kết nối đến: vnc://%s" +"Chia sẻ màn hình cho phép người điều khiển từ xa có thể xem, điều khiển màn " +"hình của bạn bằng cách kết nối đến: vnc://%s" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "Chép" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "Chia sẻ" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "Chia sẻ" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "" "Điều khiển việc bạn muôn chia sẻ những gì với các máy tính hay thiết bị khác" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5188,6 +5301,10 @@ "điều;khiển;desktop;media;đa phương tiện;da phuong tien;audio;nhạc;nhạc;video;" "phim;pictures;photos;ảnh;anh;movies;server;renderer;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "Mạng" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "Bật hoặc tắt đăng nhập từ xa" @@ -5196,25 +5313,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "Cần xác thực để bật hoặc tắt đăng nhập từ xa" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "Chưa chọn mạng để chia sẻ" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "Mạng" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "Tên má_y tính" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "Chia sẻ tập tin _cá nhân" +msgid "_File Sharing" +msgstr "Chia sẻ _tập tin" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5233,8 +5338,8 @@ msgstr "Một số dịch vụ bị tắt bởi vì không truy cập được mạng." #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "Chia sẻ tập tin cá nhân" +msgid "File Sharing" +msgstr "Chia sẻ tập tin" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5249,8 +5354,8 @@ msgstr "Chia sẻ màn hình" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "_Cho phép điều khiển từ xa" +msgid "_Allow connections to control the screen" +msgstr "Cho _phép các kết nối điều khiển màn hinh" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5277,11 +5382,8 @@ msgstr "Chia sẻ phương tiện" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "" -"Chia sẻ đa phương tiện cho phép bạn chia sẻ nhạc, ảnh, phim với những người " -"khác qua mạng." +msgid "Share music, photos and videos over the network." +msgstr "Chia sẻ nhạc, ảnh, phim với những người khác qua mạng." #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5411,11 +5513,6 @@ msgid "Peak detect" msgstr "Dò tìm đỉnh" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "Tên" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "Thiết bị" @@ -5511,16 +5608,21 @@ msgid "Subwoofer" msgstr "Siêu trầm" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "Tự chọn" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "Hỗ trợ truy cập" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "Làm cho việc xem, nghe, gõ, di và bấm chuột trở nên dễ dàng hơn" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5620,8 +5722,8 @@ msgstr "Phím âm thanh" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." -msgstr "Kêu bíp khi các phím Num Lock hay Caps Lock được bật." +msgid "Beep when Num Lock or Caps Lock are turned on or off." +msgstr "Kêu bíp khi các phím Num Lock hay Caps Lock được bật hay tắt." #: ../panels/universal-access/uap.ui.h:26 msgid "Visual Alerts" @@ -5791,7 +5893,7 @@ #: ../panels/universal-access/uap.ui.h:67 msgid "_Hover Click" -msgstr "Bấm _lửng" +msgstr "Bấm _khi lướt qua" #: ../panels/universal-access/uap.ui.h:68 msgid "Trigger a click when the pointer hovers" @@ -6002,94 +6104,68 @@ msgstr "Hiệu ứng màu" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" -msgid "Standard" -msgstr "Tiêu chuẩn" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "Thêm người dùng" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "_Họ tên" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +msgid "Standard" +msgstr "Chuẩn" + +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "Quản trị" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "_Họ tên" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "Kiểu _tài khoản" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "Cho phép người dùng đặt mật khẩu khi họ đăng nhậ_p lần kế tiếp" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "Đặt mật khẩu mới _ngay" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "_Kiểm tra" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "Xá_c nhận" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"Đăng nhập theo các doanh nghiệp cho phép các tài khoản người dùng được quản " -"lý theo kiểu tập trung để sử dụng trên thiết bị này." +"Đăng nhập theo cách doanh nghiệp cho phép các tài khoản người dùng được quản " +"lý theo kiểu tập trung để sử dụng trên thiết bị này. Bạn có thể sử dụng tài " +"khoản này để truy cập các nguồn tài nguyên của công ty trên mạng internet." -#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/account-dialog.ui.h:15 +#: ../panels/user-accounts/data/join-dialog.ui.h:9 msgid "_Domain" msgstr "_Miền" -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." -msgstr "" -"Kết nối mạng để\n" -"thêm tài khoản đăng nhập kiểu doanh nghiệp." - -#: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "Đăng nhập _Kiểu doanh nghiệp" - #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "Thêm người dùng" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "_Enroll" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "Đăng nhập quản trị miền" +msgid "You are Offline" +msgstr "Bạn đang Ngoại tuyến" -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." msgstr "" -"Để dùng đăng nhập kiểu doanh nghiệp, máy này cần nằm trong miền. Hãy nhờ " -"quản trị mạng của bạn nhập mật khẩu miền vào đây." +"Bạn phải kết nối trực tuyến để thêm tài khoản đăng nhập kiểu doanh nghiệp." -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "_Tên quản trị" - -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "Mật khẩu quản trị" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "Đăng nhập _Kiểu doanh nghiệp" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6124,7 +6200,7 @@ msgstr "Ngón út tay phải" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "Bật đăng nhập bằng vân tay" @@ -6163,9 +6239,31 @@ "Login;Đăng;nhập;Dang;nhap;Name;Tên;Ten;Fingerprint;Vân;tay;Van;Avatar;Logo;" "Face;Mặt;Mat;Password;Mật;khẩu;mã;Mat;khau;ma;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "Lịch sử đăng nhập" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "_Enroll" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "Đăng nhập quản trị miền" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"Để dùng đăng nhập kiểu doanh nghiệp, máy này cần nằm trong miền. Hãy nhờ " +"quản trị mạng của bạn nhập mật khẩu miền vào đây." + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "_Tên quản trị" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "Mật khẩu quản trị" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6188,38 +6286,30 @@ msgstr "_Mật khẩu hiện tại" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "Cho phép người dùng đặt mật khẩu khi họ đăng nhập lần kế tiếp" +msgid "Allow user to change their password on next login" +msgstr "Cho phép người dùng thay đổi mật khẩu khi họ đăng nhập lần kế tiếp" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "Đặt mật khẩu mới ngay" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "Thêm tài khoản người dùng" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "Bỏ tài khoản người dùng" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "_Thêm người dùng…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "Tùy chọn đăng nhập" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "Đăng nhập _tự động" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "Đăng nhập bằng _vân tay" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "Biểu tượng người dùng" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "Đăng nhập cuối" @@ -6321,8 +6411,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "Trộn chữ cái HOA và thường cùng với một vài chữ số." +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "Trộn chữ cái HOA và thường cùng với một chữ số hoặc hai." #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6413,32 +6503,32 @@ msgstr "Lỗi chưa biết" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." +msgid "Should match the web address of your login provider." msgstr "Nên khớp với địa chỉ web của nhà cung cấp tài khoản cho bạn." #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "Gặp lỗi khi thêm tài khoản" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "Mật khẩu không khớp nhau." -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "Gặp lỗi khi đăng ký tài khoản" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "Không có cách xác thực được hỗ trợ nào với miền này" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "Gặp lỗi khi gia nhập miền" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6446,7 +6536,7 @@ "Tên tài khoản đăng nhập đó không đúng.\n" "Vui lòng thử lại." -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6454,14 +6544,24 @@ "Mật khẩu đăng nhập đó không đúng.\n" "Vui lòng thử lại." -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "Gặp lỗi khi đăng nhập miền" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "Không thể tìm thấy miền. Có lẽ bạn gõ sai chăng?" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "Tiêu chuẩn" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "Quản trị" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6481,15 +6581,15 @@ msgid "Enabled" msgstr "Bật" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "Xóa các vân tay đã đăng ký?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "_Xóa các vân tay" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" @@ -6497,15 +6597,15 @@ "Bạn có muốn xóa các vân tay đã đăng ký để tắt chức năng đăng nhập bằng vân " "tay không?" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "Hoàn tất!" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "Không thể truy cập thiết bị “%s”" @@ -6513,16 +6613,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "Không thể khởi chạy tiến trình đọc vân tay trên thiết bị “%s”" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "Không thể truy cập đến thiết bị đọc vân tay nào" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "Hãy liên lạc với quản trị hệ thống để yêu cầu sự giúp đỡ." @@ -6531,7 +6631,7 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " @@ -6540,11 +6640,11 @@ "Để bật tính năng đăng nhập bằng vân tay, bạn cần lưu một bản vân tay của " "mình, sử dụng thiết bị “%s”." -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "Chọn ngón tay" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "Đang ghi dấu vân tay" @@ -6598,14 +6698,21 @@ msgid "%s, %s" msgstr "%2$s, %1$s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "Phiên đã chấm dứt" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "Phiên được bắt đầu" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, c-format +msgid "%s - Account Activity" +msgstr "%s - Sự hoạt động của tài khoản" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "Vui lòng chọn mật khẩu khác." @@ -6667,7 +6774,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "Không thể kết nối miền %s: %s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "Tài khoản khác" @@ -6745,15 +6852,15 @@ msgid "Logged in" msgstr "Đang đăng nhập" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "Gặp lỗi khi liên lạc dịch vụ tài khoản (accountsservice)" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "Hãy kiểm tra xem AccountService có cài và được bật không." -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6761,12 +6868,12 @@ "Để thay đổi,\n" "nhấn biểu tượng * trước" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "Tạo tài khoản người dùng mới" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6774,12 +6881,12 @@ "Để tạo tài khoản người dùng,\n" "nhấn biểu tượng * trước" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "Xóa tài khoản người dùng được chọn" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6787,33 +6894,32 @@ "Để xóa tài khoản người dùng được chọn,\n" "nhấn biểu tượng * trước" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "Tài khoản của mình" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "Đã có người dùng tên “%s” rồi." +msgid "Sorry, that user name isn't available. Please try another." +msgstr "Rất tiếc, tên tài khoản đó không sẵn sàng. Vui lòng thử cái khác." -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "Tên người dùng quá dài." -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "Tên người dùng không thể bắt đầu bằng “-”." -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"Tên người dùng hay còn gọi là tài khoản, chỉ được phép chứa các chữ cái HOA/" -"thường từ a-z, chữ số và các ký tự “.”, “-” và “_”." +"Tên tài khoản chỉ được phép chứa các chữ cái HOA/thường từ a-z, chữ số và " +"các ký tự sau: “.”, “-” và “_”." -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "" "Cái này sẽ được dùng để đặt tên cho thư mục riêng của bạn và không thể thay " @@ -6904,17 +7010,17 @@ msgid "Button" msgstr "Nút" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" msgstr "Bảng vẽ Wacom" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "Đặt ảnh của nút và sửa kiểu dáng cho thích hợp dành cho bảng đồ họa" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "" "Tablet;Bảng;bang;Wacom;Stylus;Bút;trỏ;but;tro;Eraser;Tẩy;Tay;Mouse;Chuột;" @@ -6948,6 +7054,10 @@ msgid "Bluetooth Settings" msgstr "Cài đặt Bluetooth" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Bảng vẽ Wacom" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "Ánh xạ sang màn hình…" @@ -7133,6 +7243,11 @@ msgid "Tip Pressure Feel" msgstr "Cảm giác ấn ngón" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "Mọi cài đặt" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "Trung tâm điều khiển GNOME" @@ -7189,22 +7304,18 @@ msgid "Quit" msgstr "Thoát" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "Mọi cài đặt" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "Cá nhân" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "Phần cứng" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "Hệ thống" @@ -7245,6 +7356,186 @@ msgid "Cancel search" msgstr "Ngưng tìm" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "Điểm truy cập" + +#~ msgid "Keyboard shortcut for %s. Enter new shortcut to change." +#~ msgstr "Phím tắt cho %s. Nhập vào phím tắt mới để thay đổi." + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "Để sửa đổi phím tắt, nhấn vào hàng muốn sửa rồi ấn tổ hợp phím mới hoặc " +#~ "nhấn Backspace để xóa phím tắt." + +#~ msgid "Color" +#~ msgstr "Màu sắc" + +#~ msgid "_Name:" +#~ msgstr "Tê_n:" + +#~ msgid "Add Shortcut" +#~ msgstr "Thêm phím tắt" + +#~ msgid "Remove Shortcut" +#~ msgstr "Bỏ phím tắt" + +#~ msgid "" +#~ msgstr "" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "Không thể dùng \"%s\" làm phím tắt vì sẽ không thể gõ được phím này nữa.\n" +#~ "Xin hãy thêm một phím bổ trợ như Ctrl, Alt, Shift." + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "Phím tắt \"%s\" đã dùng cho\n" +#~ "\"%s\"" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "Nếu bạn gán lại phím tắt là \"%s\", \"%s\" sẽ bị tắt." + +#~ msgid "_Reassign" +#~ msgstr "_Gán lại" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "" +#~ "Tổ hợp phím tắt \"%s\" đã được gán cho \"%s\". Bạn có muốn tự động đặt nó " +#~ "thành \"%s\"?" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "" +#~ "\"%s\" hiện tại được gán cho \"%s\", phím tắt này sẽ bị tắt nếu bạn di " +#~ "chuyển về phía trước." + +#~ msgid "_Assign" +#~ msgstr "_Gán" + +#~ msgid "Bond" +#~ msgstr "Bond" + +#~ msgid "Team" +#~ msgstr "Team" + +#~ msgid "Bridge" +#~ msgstr "Bridge" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "Không thể tải phần mở rộng VPN" + +#~ msgid "Add Network Connection" +#~ msgstr "Thêm kết nối mạng" + +#~ msgid "Bond slaves" +#~ msgstr "Bond slave" + +#~ msgid "(none)" +#~ msgstr "(không)" + +#~ msgid "Bridge slaves" +#~ msgstr "Bridge slave" + +#~ msgid "Team slaves" +#~ msgstr "Team slave" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "Thiết bị InfiniBand không hỗ trợ chế độ kết nối" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "Chưa chọn chứng nhận CA." + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "Không dùng giấy chứng nhận CA có thể là nguyên nhân gây nên mất an toàn " +#~ "của kết nối, mạng Wi-Fi lừa đảo. Bạn có muốn chọn một giấy chứng nhận CA " +#~ "không?" + +#~ msgid "Ignore" +#~ msgstr "Bỏ qua" + +#~ msgid "Choose CA Certificate" +#~ msgstr "Chọn chứng nhận CA" + +#~ msgid "As_k for this password every time" +#~ msgstr "Luôn _Hỏi mật khẩu này" + +#~ msgid "Don't _warn me again" +#~ msgstr "Đừng _cảnh báo tôi nữa" + +#~ msgid "No" +#~ msgstr "Không" + +#~ msgid "Yes" +#~ msgstr "Có" + +#~ msgid "Error logging into the account" +#~ msgstr "Không thể đăng nhập vào tài khoản này" + +#~ msgid "Credentials have expired." +#~ msgstr "Các giấy ủy nhiệm đã hết hạn." + +#~ msgid "Sign in to enable this account." +#~ msgstr "Đăng nhập để bật tài khoản này." + +#~ msgid "_Sign In" +#~ msgstr "Đă_ng nhập" + +#~ msgid "Power" +#~ msgstr "Nguồn điện" + +#~ msgid "Privacy" +#~ msgstr "Riêng tư" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "Khác" + +#~ msgid "Personal File Sharing" +#~ msgstr "Chia sẻ tập tin cá nhân" + +#~ msgid "_Allow Remote Control" +#~ msgstr "_Cho phép điều khiển từ xa" + +#~ msgid "_Verify" +#~ msgstr "_Kiểm tra" + +#~ msgid "Login History" +#~ msgstr "Lịch sử đăng nhập" + +#~ msgid "Add User Account" +#~ msgstr "Thêm tài khoản người dùng" + +#~ msgid "Remove User Account" +#~ msgstr "Bỏ tài khoản người dùng" + +#~ msgid "Login Options" +#~ msgstr "Tùy chọn đăng nhập" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "Đã có người dùng tên “%s” rồi." + #~ msgid "Done" #~ msgstr "Xong" @@ -7273,9 +7564,6 @@ #~ msgid "S_peed:" #~ msgstr "_Tốc độ:" -#~ msgid "Shortcuts" -#~ msgstr "Phím tắt" - #~ msgid "Test Your Settings" #~ msgstr "Kiểm tra các cài đặt của bạn" @@ -7314,9 +7602,6 @@ #~ msgid "Fast" #~ msgstr "Nhanh" -#~ msgid "Two _finger scroll" -#~ msgstr "Cuộn _hai ngón" - #~ msgid "No printers available" #~ msgstr "Không có máy in" diff -Nru gnome-control-center-3.20.2/po/wa.po gnome-control-center-3.22.1/po/wa.po --- gnome-control-center-3.20.2/po/wa.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/wa.po 2016-08-12 12:43:57.000000000 +0000 @@ -17,6 +17,7 @@ "PO-Revision-Date: 2003-01-02 12:26+0100\n" "Last-Translator: Pablo Saratxaga \n" "Language-Team: Walon \n" +"Language: wa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/xh.po gnome-control-center-3.22.1/po/xh.po --- gnome-control-center-3.20.2/po/xh.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/xh.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2005-03-23 09:53+0200\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" +"Language: xh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/zh_HK.po gnome-control-center-3.22.1/po/zh_HK.po --- gnome-control-center-3.20.2/po/zh_HK.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/zh_HK.po 2016-08-12 12:43:57.000000000 +0000 @@ -18,7 +18,7 @@ "PO-Revision-Date: 2014-08-25 14:05+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" -"Language: zh_TW\n" +"Language: zh_HK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/po/zh_TW.po gnome-control-center-3.22.1/po/zh_TW.po --- gnome-control-center-3.20.2/po/zh_TW.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/zh_TW.po 2016-10-10 16:16:22.000000000 +0000 @@ -14,8 +14,8 @@ "Project-Id-Version: gnome-control-center 3.3.91\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "control-center&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-04-04 07:58+0000\n" -"PO-Revision-Date: 2016-03-27 17:59+0800\n" +"POT-Creation-Date: 2016-09-24 10:17+0000\n" +"PO-Revision-Date: 2016-10-09 22:06+0800\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" @@ -23,7 +23,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Poedit 1.8.8\n" #: ../panels/background/background.ui.h:1 msgid "_Background" @@ -95,7 +95,7 @@ #. * directory in the string below when XDG_PICTURES_DIR is #. * undefined #: ../panels/background/cc-background-chooser-dialog.c:561 -#: ../panels/search/cc-search-locations-dialog.c:274 +#: ../panels/search/cc-search-locations-dialog.c:302 msgid "Home" msgstr "家" @@ -110,25 +110,24 @@ #: ../panels/color/cc-color-panel.c:225 ../panels/color/cc-color-panel.c:963 #: ../panels/color/color-calibrate.ui.h:2 ../panels/color/color.ui.h:30 #: ../panels/common/language-chooser.ui.h:3 -#: ../panels/display/cc-display-panel.c:1563 -#: ../panels/display/cc-display-panel.c:2196 -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +#: ../panels/display/cc-display-panel.c:1561 +#: ../panels/display/cc-display-panel.c:2206 #: ../panels/network/connection-editor/connection-editor.ui.h:1 -#: ../panels/network/connection-editor/vpn-helpers.c:245 -#: ../panels/network/connection-editor/vpn-helpers.c:374 -#: ../panels/network/net-device-wifi.c:1269 -#: ../panels/network/net-device-wifi.c:1462 +#: ../panels/network/connection-editor/vpn-helpers.c:181 +#: ../panels/network/connection-editor/vpn-helpers.c:310 +#: ../panels/network/net-device-wifi.c:1298 +#: ../panels/network/net-device-wifi.c:1535 #: ../panels/network/network-wifi.ui.h:1 -#: ../panels/printers/cc-printers-panel.c:2052 +#: ../panels/printers/cc-printers-panel.c:2077 #: ../panels/printers/new-printer-dialog.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:982 +#: ../panels/privacy/cc-privacy-panel.c:1048 #: ../panels/region/format-chooser.ui.h:3 ../panels/region/input-chooser.ui.h:2 -#: ../panels/search/cc-search-locations-dialog.c:681 +#: ../panels/search/cc-search-locations-dialog.c:637 #: ../panels/sharing/cc-sharing-panel.c:372 -#: ../panels/user-accounts/data/account-dialog.ui.h:17 +#: ../panels/user-accounts/data/account-dialog.ui.h:2 +#: ../panels/user-accounts/data/join-dialog.ui.h:2 #: ../panels/user-accounts/data/password-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-dialog.c:1476 -#: ../panels/user-accounts/um-fingerprint-dialog.c:264 +#: ../panels/user-accounts/um-fingerprint-dialog.c:265 #: ../panels/user-accounts/um-photo-dialog.c:94 #: ../panels/user-accounts/um-photo-dialog.c:217 #: ../panels/user-accounts/um-user-panel.c:705 @@ -159,16 +158,17 @@ msgid "Current background" msgstr "目前的背景" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:1 -msgid "Background" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +msgid "Back­ground" msgstr "背景" -#: ../panels/background/gnome-background-panel.desktop.in.in.h:2 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:3 msgid "Change your background image to a wallpaper or photo" msgstr "將您的背景影像變更為桌布或相片" #. Translators: those are keywords for the background control-center panel -#: ../panels/background/gnome-background-panel.desktop.in.in.h:4 +#: ../panels/background/gnome-background-panel.desktop.in.in.h:5 msgid "Wallpaper;Screen;Desktop;" msgstr "Wallpaper;Screen;Desktop;桌布;螢幕;桌面;" @@ -208,18 +208,17 @@ msgid "Turn off the Airplane mode switch to enable Bluetooth." msgstr "關閉飛安模式開關以啟用藍牙。" -#. Translators: The found device is a printer connected via Bluetooth -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:1 -#: ../panels/printers/pp-new-printer-dialog.c:1676 -msgid "Bluetooth" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +msgid "Blue­tooth" msgstr "藍牙" -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:2 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:3 msgid "Turn Bluetooth on and off and connect your devices" msgstr "開啟或關閉藍牙與連接您的裝置" #. Translators: those are keywords for the bluetooth control-center panel -#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:4 +#: ../panels/bluetooth/gnome-bluetooth-panel.desktop.in.in.h:5 msgid "share;sharing;bluetooth;obex;" msgstr "share;sharing;bluetooth;obex;分享;藍牙;" @@ -388,7 +387,7 @@ #. TRANSLATORS: filter name on the file->open dialog #: ../panels/color/cc-color-panel.c:244 -#: ../panels/network/wireless-security/eap-method-fast.c:420 +#: ../panels/network/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "所有檔案" @@ -427,7 +426,7 @@ msgstr "儲存描述檔" #: ../panels/color/cc-color-panel.c:964 -#: ../panels/network/connection-editor/vpn-helpers.c:375 +#: ../panels/network/connection-editor/vpn-helpers.c:311 msgid "_Save" msgstr "儲存(_S)" @@ -673,7 +672,7 @@ "X 和 Microsoft Windows 系統上使用描述檔的指引。" #: ../panels/color/color.ui.h:27 -#: ../panels/user-accounts/um-fingerprint-dialog.c:729 +#: ../panels/user-accounts/um-fingerprint-dialog.c:730 msgid "Summary" msgstr "摘要" @@ -685,11 +684,11 @@ msgid "_Import File…" msgstr "載入檔案(_I)…" -#: ../panels/color/color.ui.h:31 ../panels/keyboard/gnome-keyboard-panel.ui.h:3 -#: ../panels/network/connection-editor/net-connection-editor.c:518 +#: ../panels/color/color.ui.h:31 +#: ../panels/network/connection-editor/net-connection-editor.c:546 #: ../panels/printers/new-printer-dialog.ui.h:3 #: ../panels/region/input-chooser.ui.h:3 -#: ../panels/user-accounts/um-account-dialog.c:1477 +#: ../panels/user-accounts/data/account-dialog.ui.h:3 msgid "_Add" msgstr "加入(_A)" @@ -835,17 +834,18 @@ msgid "D75" msgstr "D75" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:1 -msgid "Color" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +msgid "Co­lor" msgstr "顏色" -#: ../panels/color/gnome-color-panel.desktop.in.in.h:2 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:3 msgid "" "Calibrate the color of your devices, such as displays, cameras or printers" msgstr "校準您裝置的顏色，像是顯示器、攝影機或印表機" #. Translators: those are keywords for the color control-center panel -#: ../panels/color/gnome-color-panel.desktop.in.in.h:4 +#: ../panels/color/gnome-color-panel.desktop.in.in.h:5 msgid "Color;ICC;Profile;Calibrate;Printer;Display;" msgstr "" "Color;ICC;Profile;Calibrate;Printer;Display;顏色;色彩描述檔;校準;印表機;顯示" @@ -865,23 +865,23 @@ msgid "No languages found" msgstr "找不到語言" -#: ../panels/common/cc-util.c:125 -#: ../panels/network/connection-editor/ce-page-details.c:102 +#: ../panels/common/cc-util.c:127 +#: ../panels/network/connection-editor/ce-page-details.c:100 msgid "Today" msgstr "今日" -#: ../panels/common/cc-util.c:129 -#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/common/cc-util.c:131 +#: ../panels/network/connection-editor/ce-page-details.c:102 msgid "Yesterday" msgstr "昨日" #. Translators: This is a date format string in the style of "Feb 24". -#: ../panels/common/cc-util.c:136 +#: ../panels/common/cc-util.c:138 msgid "%b %e" msgstr "%b%e日" #. Translators: This is a date format string in the style of "Feb 24, 2013". -#: ../panels/common/cc-util.c:141 +#: ../panels/common/cc-util.c:143 msgid "%b %e, %Y" msgstr "%Y年%b%e日" @@ -1001,8 +1001,9 @@ msgid "December" msgstr "十二月" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/datetime/datetime.ui.h:13 -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:1 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 msgid "Date & Time" msgstr "日期與時刻" @@ -1059,12 +1060,12 @@ msgid "AM / PM" msgstr "AM / PM" -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:2 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:3 msgid "Change the date and time, including time zone" msgstr "改變時刻與日期，包含時區" #. Translators: those are keywords for the date and time control-center panel -#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:4 +#: ../panels/datetime/gnome-datetime-panel.desktop.in.in.h:5 msgid "Clock;Timezone;Location;" msgstr "Clock;Timezone;Location;時鐘;時區;位置;" @@ -1076,209 +1077,224 @@ msgid "To change time or date settings, you need to authenticate." msgstr "要改變時刻或日期設定值，您需要通過核對。" -#: ../panels/display/cc-display-panel.c:575 +#: ../panels/display/cc-display-panel.c:573 msgid "Lid Closed" msgstr "上蓋已經關閉" #. translators: "Mirrored" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:576 msgid "Mirrored" msgstr "相同顯示" -#: ../panels/display/cc-display-panel.c:580 -#: ../panels/display/cc-display-panel.c:2390 +#: ../panels/display/cc-display-panel.c:578 +#: ../panels/display/cc-display-panel.c:2429 msgid "Primary" msgstr "主要" -#: ../panels/display/cc-display-panel.c:582 +#: ../panels/display/cc-display-panel.c:580 #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1927 ../panels/power/cc-power-panel.c:1938 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1968 ../panels/power/cc-power-panel.c:1979 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 #: ../panels/universal-access/uap.ui.h:6 msgid "Off" msgstr "關閉" -#: ../panels/display/cc-display-panel.c:585 +#: ../panels/display/cc-display-panel.c:583 msgid "Secondary" msgstr "次要" #. Title of displays dialog when multiple monitors are present. -#: ../panels/display/cc-display-panel.c:1560 +#: ../panels/display/cc-display-panel.c:1558 msgid "Arrange Combined Displays" msgstr "排列顯示器的組合方式" -#: ../panels/display/cc-display-panel.c:1564 -#: ../panels/display/cc-display-panel.c:2197 +#: ../panels/display/cc-display-panel.c:1562 +#: ../panels/display/cc-display-panel.c:2207 #: ../panels/network/connection-editor/connection-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:2 msgid "_Apply" msgstr "套用(_A)" -#: ../panels/display/cc-display-panel.c:1588 +#: ../panels/display/cc-display-panel.c:1586 msgid "Drag displays to rearrange them" msgstr "拖拉顯示器以重新排列" #. translators: example string is "60 Hz (NTSC)" #. * NTSC is https://en.wikipedia.org/wiki/NTSC -#: ../panels/display/cc-display-panel.c:1794 +#: ../panels/display/cc-display-panel.c:1793 #, c-format msgid "%d Hz (NTSC)" msgstr "%d Hz (NTSC)" #. translators: example string is "60 Hz" -#: ../panels/display/cc-display-panel.c:1800 +#: ../panels/display/cc-display-panel.c:1799 #, c-format msgid "%d Hz" msgstr "%d Hz" -#: ../panels/display/cc-display-panel.c:2246 +#: ../panels/display/cc-display-panel.c:2259 msgid "Rotate counterclockwise by 90°" msgstr "逆時針" -#: ../panels/display/cc-display-panel.c:2264 +#: ../panels/display/cc-display-panel.c:2277 msgid "Rotate by 180°" msgstr "旋轉 180°" -#: ../panels/display/cc-display-panel.c:2282 +#: ../panels/display/cc-display-panel.c:2295 msgid "Rotate clockwise by 90°" msgstr "順時針旋轉 90°" -#: ../panels/display/cc-display-panel.c:2303 +#: ../panels/display/cc-display-panel.c:2316 msgid "Size" msgstr "尺寸" #. aspect ratio -#: ../panels/display/cc-display-panel.c:2316 +#: ../panels/display/cc-display-panel.c:2331 msgid "Aspect Ratio" msgstr "長寬比" -#: ../panels/display/cc-display-panel.c:2338 +#: ../panels/display/cc-display-panel.c:2354 #: ../panels/printers/pp-options-dialog.c:85 msgid "Resolution" msgstr "解析度" -#: ../panels/display/cc-display-panel.c:2360 +#: ../panels/display/cc-display-panel.c:2374 +msgid "Adjust for TV" +msgstr "調整為電視" + +#: ../panels/display/cc-display-panel.c:2398 msgid "Refresh Rate" msgstr "更新率" -#: ../panels/display/cc-display-panel.c:2391 +#: ../panels/display/cc-display-panel.c:2430 msgid "Show the top bar and Activities Overview on this display" msgstr "在這個顯示器顯示頂端列與活動概覽" -#: ../panels/display/cc-display-panel.c:2397 +#: ../panels/display/cc-display-panel.c:2436 msgid "Secondary Display" msgstr "次要顯示器" -#: ../panels/display/cc-display-panel.c:2398 +#: ../panels/display/cc-display-panel.c:2437 msgid "Join this display with another to create an extra workspace" msgstr "將本顯示器與另一個顯示器組合以建立額外的工作空間" -#: ../panels/display/cc-display-panel.c:2405 +#: ../panels/display/cc-display-panel.c:2444 msgid "Presentation" msgstr "展示" -#: ../panels/display/cc-display-panel.c:2406 +#: ../panels/display/cc-display-panel.c:2445 msgid "Show slideshows and media only" msgstr "只顯示投影片與媒體" #. translators: "Mirror" describes when both displays show the same view -#: ../panels/display/cc-display-panel.c:2411 +#: ../panels/display/cc-display-panel.c:2450 msgid "Mirror" msgstr "相同" -#: ../panels/display/cc-display-panel.c:2412 +#: ../panels/display/cc-display-panel.c:2451 msgid "Show your existing view on both displays" msgstr "兩個顯示器上皆顯示您現在的檢視畫面" -#: ../panels/display/cc-display-panel.c:2418 +#: ../panels/display/cc-display-panel.c:2457 msgid "Turn Off" msgstr "關閉" -#: ../panels/display/cc-display-panel.c:2419 +#: ../panels/display/cc-display-panel.c:2458 msgid "Don't use this display" msgstr "不使用這個顯示器" -#: ../panels/display/cc-display-panel.c:2722 +#: ../panels/display/cc-display-panel.c:2769 msgid "Could not get screen information" msgstr "無法取得螢幕資訊" -#: ../panels/display/cc-display-panel.c:2753 +#: ../panels/display/cc-display-panel.c:2800 msgid "_Arrange Combined Displays" msgstr "排列顯示器組合方式(_A)" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:1 -msgid "Displays" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +msgid "Dis­plays" msgstr "顯示器" -#: ../panels/display/gnome-display-panel.desktop.in.in.h:2 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:3 msgid "Choose how to use connected monitors and projectors" msgstr "選擇如何使用連接的顯示器和投影機" #. Translators: those are keywords for the display control-center panel -#: ../panels/display/gnome-display-panel.desktop.in.in.h:4 +#: ../panels/display/gnome-display-panel.desktop.in.in.h:5 msgid "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;" msgstr "" "Panel;Projector;xrandr;Screen;Resolution;Refresh;Monitor;面板;投影機;螢幕;解" "析度;重新整理;螢幕;" -#: ../panels/info/cc-info-panel.c:385 +#: ../panels/info/cc-info-panel.c:345 msgid "Wayland" msgstr "Wayland" #. TRANSLATORS: AP type -#: ../panels/info/cc-info-panel.c:388 ../panels/network/panel-common.c:127 +#: ../panels/info/cc-info-panel.c:348 ../panels/network/panel-common.c:123 msgid "Unknown" msgstr "不明" -#: ../panels/info/cc-info-panel.c:473 +#: ../panels/info/cc-info-panel.c:481 +#, c-format +msgid "%s %d-bit (Build ID: %s)" +msgstr "%s %d 位元 (組建 ID：%s)" + +#: ../panels/info/cc-info-panel.c:483 +#, c-format +msgid "%d-bit (Build ID: %s)" +msgstr "%d 位元 (組建 ID：%s)" + +#: ../panels/info/cc-info-panel.c:491 #, c-format msgid "%s %d-bit" msgstr "%s %d 位元" -#: ../panels/info/cc-info-panel.c:475 +#: ../panels/info/cc-info-panel.c:493 #, c-format msgid "%d-bit" msgstr "%d 位元" -#: ../panels/info/cc-info-panel.c:1155 +#: ../panels/info/cc-info-panel.c:1174 msgid "Ask what to do" msgstr "詢問要做什麼" -#: ../panels/info/cc-info-panel.c:1159 +#: ../panels/info/cc-info-panel.c:1178 msgid "Do nothing" msgstr "不做任何事" -#: ../panels/info/cc-info-panel.c:1163 +#: ../panels/info/cc-info-panel.c:1182 msgid "Open folder" msgstr "開啟資料夾" -#: ../panels/info/cc-info-panel.c:1254 +#: ../panels/info/cc-info-panel.c:1273 msgid "Other Media" msgstr "其他媒體" -#: ../panels/info/cc-info-panel.c:1285 +#: ../panels/info/cc-info-panel.c:1304 msgid "Select an application for audio CDs" msgstr "選擇播放音樂 CD 的應用程式" -#: ../panels/info/cc-info-panel.c:1286 +#: ../panels/info/cc-info-panel.c:1305 msgid "Select an application for video DVDs" msgstr "選擇播放影片 DVD 的應用程式" -#: ../panels/info/cc-info-panel.c:1287 +#: ../panels/info/cc-info-panel.c:1306 msgid "Select an application to run when a music player is connected" msgstr "選擇當音樂播放器連接時要執行的應用程式" -#: ../panels/info/cc-info-panel.c:1288 +#: ../panels/info/cc-info-panel.c:1307 msgid "Select an application to run when a camera is connected" msgstr "選擇當攝影機連接時要執行的應用程式" -#: ../panels/info/cc-info-panel.c:1289 +#: ../panels/info/cc-info-panel.c:1308 msgid "Select an application for software CDs" msgstr "選擇軟體 CD 要用的應用程式" @@ -1287,88 +1303,86 @@ #. * If the shared-mime-info translation works for your language, #. * simply leave these untranslated. #. -#: ../panels/info/cc-info-panel.c:1301 +#: ../panels/info/cc-info-panel.c:1320 msgid "audio DVD" msgstr "音樂 DVD" -#: ../panels/info/cc-info-panel.c:1302 +#: ../panels/info/cc-info-panel.c:1321 msgid "blank Blu-ray disc" msgstr "空白 Blu-ray 碟片" -#: ../panels/info/cc-info-panel.c:1303 +#: ../panels/info/cc-info-panel.c:1322 msgid "blank CD disc" msgstr "空白 CD 碟片" -#: ../panels/info/cc-info-panel.c:1304 +#: ../panels/info/cc-info-panel.c:1323 msgid "blank DVD disc" msgstr "空白 DVD 碟片" -#: ../panels/info/cc-info-panel.c:1305 +#: ../panels/info/cc-info-panel.c:1324 msgid "blank HD DVD disc" msgstr "空白 HD DVD 碟片" -#: ../panels/info/cc-info-panel.c:1306 +#: ../panels/info/cc-info-panel.c:1325 msgid "Blu-ray video disc" msgstr "Blu-Ray 影片碟片" -#: ../panels/info/cc-info-panel.c:1307 +#: ../panels/info/cc-info-panel.c:1326 msgid "e-book reader" msgstr "電子書閱讀器" -#: ../panels/info/cc-info-panel.c:1308 +#: ../panels/info/cc-info-panel.c:1327 msgid "HD DVD video disc" msgstr "HD DVD 影片碟片" -#: ../panels/info/cc-info-panel.c:1309 +#: ../panels/info/cc-info-panel.c:1328 msgid "Picture CD" msgstr "照片 CD" -#: ../panels/info/cc-info-panel.c:1310 +#: ../panels/info/cc-info-panel.c:1329 msgid "Super Video CD" msgstr "SVCD" -#: ../panels/info/cc-info-panel.c:1311 +#: ../panels/info/cc-info-panel.c:1330 msgid "Video CD" msgstr "影片 CD" -#: ../panels/info/cc-info-panel.c:1312 +#: ../panels/info/cc-info-panel.c:1331 msgid "Windows software" msgstr "Windows 軟體" -#: ../panels/info/cc-info-panel.c:1435 -#: ../panels/keyboard/keyboard-shortcuts.c:1949 +#: ../panels/info/cc-info-panel.c:1454 msgid "Section" msgstr "節" -#: ../panels/info/cc-info-panel.c:1444 ../panels/info/info.ui.h:14 +#: ../panels/info/cc-info-panel.c:1463 ../panels/info/info.ui.h:14 msgid "Overview" msgstr "概覽" -#: ../panels/info/cc-info-panel.c:1450 ../panels/info/info.ui.h:21 +#: ../panels/info/cc-info-panel.c:1469 ../panels/info/info.ui.h:21 msgid "Default Applications" msgstr "預設應用程式" -#: ../panels/info/cc-info-panel.c:1455 ../panels/info/info.ui.h:29 +#: ../panels/info/cc-info-panel.c:1474 ../panels/info/info.ui.h:29 msgid "Removable Media" msgstr "可移除式媒體" -#: ../panels/info/cc-info-panel.c:1480 +#: ../panels/info/cc-info-panel.c:1499 #, c-format msgid "Version %s" msgstr "版本 %s" -#: ../panels/info/gnome-info-panel.desktop.in.in.h:1 -#: ../panels/network/connection-editor/ce-page-details.c:240 -#: ../panels/network/network-wifi.ui.h:46 -msgid "Details" -msgstr "詳細資料" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/info/gnome-info-panel.desktop.in.in.h:2 +msgid "De­tails" +msgstr "詳細資訊" + +#: ../panels/info/gnome-info-panel.desktop.in.in.h:3 msgid "View information about your system" msgstr "檢視您系統的資訊" #. sure that you use the same "translation" for those keywords -#: ../panels/info/gnome-info-panel.desktop.in.in.h:4 +#: ../panels/info/gnome-info-panel.desktop.in.in.h:5 msgid "" "device;system;information;memory;processor;version;default;application;" "preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;" @@ -1543,8 +1557,9 @@ msgid "Launch help browser" msgstr "執行說明文件瀏覽器" -#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/cc-window.c:1606 -#: ../shell/gnome-control-center.desktop.in.in.h:1 +#: ../panels/keyboard/01-launchers.xml.in.h:3 ../shell/alt/cc-window.c:274 +#: ../shell/alt/cc-window.c:829 ../shell/cc-window.c:1584 +#: ../shell/gnome-control-center.desktop.in.in.h:1 ../shell/window.ui.h:1 msgid "Settings" msgstr "設定值" @@ -1617,7 +1632,6 @@ msgstr "鎖定畫面" #: ../panels/keyboard/50-accessibility.xml.in.h:1 -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:1 msgid "Universal Access" msgstr "無障礙功能" @@ -1653,11 +1667,21 @@ msgid "High contrast on or off" msgstr "高對比開或關" +#: ../panels/keyboard/cc-keyboard-manager.c:514 +#: ../panels/keyboard/cc-keyboard-manager.c:522 +#: ../panels/keyboard/cc-keyboard-manager.c:830 +msgid "Custom Shortcuts" +msgstr "自訂捷徑鍵" + +#. This label is displayed in a treeview cell displaying +#. * a disabled accelerator key combination. +#. #. translators: #. * The device has been disabled #: ../panels/keyboard/cc-keyboard-option.c:276 #: ../panels/keyboard/cc-keyboard-option.c:395 -#: ../panels/keyboard/keyboard-shortcuts.c:1220 +#: ../panels/keyboard/keyboard-shortcuts.c:440 +#: ../panels/keyboard/shortcut-editor.ui.h:2 #: ../panels/network/network-wifi.ui.h:31 #: ../panels/sound/gvc/gvc-mixer-control.c:1830 #: ../panels/user-accounts/um-fingerprint-dialog.c:213 @@ -1684,117 +1708,129 @@ msgid "Modifiers-only switch to next source" msgstr "只以修飾鍵切換至下個來源" -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:1 -msgid "Keyboard" -msgstr "鍵盤" +#: ../panels/keyboard/cc-keyboard-panel.c:215 +msgid "Reset the shortcut to its default value" +msgstr "" +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:357 +#, c-format +msgid "" +"%s is already being used for %s. If you replace it, %s will be " +"disabled" +msgstr "" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +msgid "Set Custom Shortcut" +msgstr "設定自訂捷徑鍵" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:514 +#: ../panels/keyboard/shortcut-editor.ui.h:7 +msgid "Set Shortcut" +msgstr "設定捷徑鍵" + +#. Setup the top label +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:523 +#, c-format +msgid "Enter new shortcut to change %s." +msgstr "" + +#: ../panels/keyboard/cc-keyboard-shortcut-editor.c:937 +msgid "Add Custom Shortcut" +msgstr "加入自訂捷徑鍵" + +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:2 +msgid "Key­board" +msgstr "鍵盤" + +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:3 msgid "View and change keyboard shortcuts and set your typing preferences" msgstr "檢視與變更鍵盤捷徑鍵並設定您的輸入偏好設定" #. Translators: those are keywords for the keyboard control-center panel -#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:4 +#: ../panels/keyboard/gnome-keyboard-panel.desktop.in.in.h:5 msgid "Shortcut;Repeat;Blink;" msgstr "Shortcut;Repeat;Blink;捷徑鍵;重複;閃爍;" #: ../panels/keyboard/gnome-keyboard-panel.ui.h:1 -msgid "Custom Shortcut" -msgstr "自訂捷徑鍵" +msgid "No keyboard shortcut found" +msgstr "找不到鍵盤捷徑鍵" -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:4 -msgid "_Name:" -msgstr "名稱(_N)：" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:5 -msgid "C_ommand:" -msgstr "指令(_O)：" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:6 -msgid "Add Shortcut" -msgstr "加入捷徑鍵" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:7 -msgid "Remove Shortcut" -msgstr "移除捷徑鍵" - -#: ../panels/keyboard/gnome-keyboard-panel.ui.h:8 -msgid "" -"To edit a shortcut, click the row and hold down the new keys or press " -"Backspace to clear." -msgstr "" -"要編輯捷徑鍵，點選相應的列並按下新的按鍵組合，或以 Backspace 鍵來清除。" - -#: ../panels/keyboard/keyboard-shortcuts.c:633 -#: ../panels/keyboard/keyboard-shortcuts.c:641 -msgid "Custom Shortcuts" -msgstr "自訂捷徑鍵" +#: ../panels/keyboard/gnome-keyboard-panel.ui.h:2 +msgid "Try a different search" +msgstr "嘗試不同的搜尋內容" -#: ../panels/keyboard/keyboard-shortcuts.c:858 -msgid "" -msgstr "<行動設定不詳>" +#: ../panels/keyboard/shortcut-editor.ui.h:1 +msgid "Press Esc to cancel." +msgstr "按下 Esc 鍵取消。" -#: ../panels/keyboard/keyboard-shortcuts.c:1359 -#, c-format -msgid "" -"The shortcut \"%s\" cannot be used because it will become impossible to type " -"using this key.\n" -"Please try with a key such as Control, Alt or Shift at the same time." -msgstr "" -"捷徑「%s」無法使用，原因是會無法按下此按鍵。\n" -"請試用其它的按鍵：如同時使用 Control，Alt 或 Shift。" +#: ../panels/keyboard/shortcut-editor.ui.h:3 +#: ../panels/sound/gvc-mixer-dialog.c:1493 +#: ../panels/sound/gvc-sound-theme-chooser.c:564 +msgid "Name" +msgstr "名稱" -#: ../panels/keyboard/keyboard-shortcuts.c:1389 -#, c-format -msgid "" -"The shortcut \"%s\" is already used for\n" -"\"%s\"" -msgstr "" -"捷徑鍵「%s」己經使用於：\n" -"「%s」" +#: ../panels/keyboard/shortcut-editor.ui.h:4 +msgid "Command" +msgstr "指令" + +#: ../panels/keyboard/shortcut-editor.ui.h:5 +msgid "Shortcut" +msgstr "捷徑鍵" + +#: ../panels/keyboard/shortcut-editor.ui.h:6 +msgid "Edit" +msgstr "編輯" -#: ../panels/keyboard/keyboard-shortcuts.c:1394 -#, c-format -msgid "" -"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled." -msgstr "如果您重新指派捷徑鍵為「%s」，「%s」的捷徑鍵就會停用。" +#: ../panels/keyboard/shortcut-editor.ui.h:8 +#: ../panels/network/network-wifi.ui.h:20 +msgid "None" +msgstr "沒有" -#: ../panels/keyboard/keyboard-shortcuts.c:1400 -msgid "_Reassign" -msgstr "重新指派(_R)" +#: ../panels/keyboard/shortcut-editor.ui.h:9 +msgid "Remove" +msgstr "移除" + +#: ../panels/keyboard/shortcut-editor.ui.h:10 +msgid "Enter the new shortcut" +msgstr "輸入新的捷徑鍵" -#: ../panels/keyboard/keyboard-shortcuts.c:1441 -#, c-format -msgid "" -"The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " -"automatically set it to \"%s\"?" -msgstr "捷徑鍵「%s」已指派「%s」捷徑。您想要自動將它設定為「%s」嗎？" +#: ../panels/keyboard/shortcut-editor.ui.h:11 +#: ../panels/printers/authentication-dialog.ui.h:2 +#: ../panels/printers/ppd-selection-dialog.ui.h:2 +msgid "Cancel" +msgstr "取消" -#: ../panels/keyboard/keyboard-shortcuts.c:1451 -#, c-format -msgid "" -"\"%s\" is currently associated with \"%s\", this shortcut will be disabled " -"if you move forward." -msgstr "「%s」目前指派為「%s」，如果您繼續這個捷徑鍵就會停用。" +#: ../panels/keyboard/shortcut-editor.ui.h:12 +#: ../panels/network/connection-editor/ce-page-ip4.c:305 +#: ../panels/network/connection-editor/ce-page-ip6.c:277 +msgid "Add" +msgstr "加入" -#: ../panels/keyboard/keyboard-shortcuts.c:1458 -msgid "_Assign" -msgstr "指派(_R)" +#: ../panels/keyboard/shortcut-editor.ui.h:13 +msgid "Replace" +msgstr "取代" + +#: ../panels/keyboard/shortcut-editor.ui.h:14 +msgid "Set" +msgstr "設定" #: ../panels/mouse/cc-mouse-panel.c:82 msgid "Test Your _Settings" msgstr "測試您的設定值(_S)" -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:1 -msgid "Mouse & Touchpad" -msgstr "滑鼠和觸控板" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:2 +msgid "Mouse & Touch­pad" +msgstr "滑鼠及觸控板" + +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:3 msgid "" "Change your mouse or touchpad sensitivity and select right or left-handed" msgstr "改變您的滑鼠或控制板靈敏度並選擇慣用右手或左手" #. Translators: those are keywords for the mouse and touchpad control-center panel -#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:4 +#: ../panels/mouse/gnome-mouse-panel.desktop.in.in.h:5 msgid "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;" msgstr "" "Trackpad;Pointer;Click;Tap;Double;Button;Trackball;Scroll;觸控板;指標;點擊;輕" @@ -1854,6 +1890,10 @@ msgstr "輕觸表示點擊" #: ../panels/mouse/gnome-mouse-properties.ui.h:15 +msgid "Two-finger Scrolling" +msgstr "兩指捲動" + +#: ../panels/mouse/gnome-mouse-properties.ui.h:16 msgid "Edge Scrolling" msgstr "邊緣捲動" @@ -1892,11 +1932,11 @@ #. TRANSLATORS: this is to disable the radio hardware in the #. * network panel -#: ../panels/network/cc-network-panel.c:358 +#: ../panels/network/cc-network-panel.c:349 msgid "Air_plane Mode" msgstr "飛安模式(_P)" -#: ../panels/network/cc-network-panel.c:967 +#: ../panels/network/cc-network-panel.c:953 msgid "Network proxy" msgstr "網路代理伺服器" @@ -1904,17 +1944,17 @@ #. * window for vpn connections, it is also used to display #. * vpn connections in the device list. #. -#: ../panels/network/cc-network-panel.c:1144 ../panels/network/net-vpn.c:278 -#: ../panels/network/net-vpn.c:432 +#: ../panels/network/cc-network-panel.c:1129 ../panels/network/net-vpn.c:283 +#: ../panels/network/net-vpn.c:440 #, c-format msgid "%s VPN" msgstr "%s VPN" -#: ../panels/network/cc-network-panel.c:1300 +#: ../panels/network/cc-network-panel.c:1194 msgid "Oops, something has gone wrong. Please contact your software vendor." msgstr "噢，有問題發生。請聯繫您的軟體供應商。" -#: ../panels/network/cc-network-panel.c:1306 +#: ../panels/network/cc-network-panel.c:1200 msgid "NetworkManager needs to be running." msgstr "需要先執行 NetworkManager。" @@ -1930,7 +1970,7 @@ #: ../panels/network/connection-editor/8021x-security-page.ui.h:3 #: ../panels/network/connection-editor/security-page.ui.h:4 -#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 #: ../panels/network/wireless-security/eap-method-peap.ui.h:5 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:2 msgid "Anony_mous identity" @@ -1947,238 +1987,243 @@ msgid "page 2" msgstr "頁 2" -#: ../panels/network/connection-editor/ce-page-8021x-security.c:108 -#: ../panels/network/connection-editor/ce-page-security.c:469 +#: ../panels/network/connection-editor/ce-page-8021x-security.c:101 +#: ../panels/network/connection-editor/ce-page-security.c:459 #: ../panels/network/connection-editor/details-page.ui.h:3 #: ../panels/network/network-wifi.ui.h:6 msgid "Security" msgstr "安全性" -#: ../panels/network/connection-editor/ce-page.c:507 +#: ../panels/network/connection-editor/ce-page.c:481 msgid "automatic" msgstr "自動" +#: ../panels/network/connection-editor/ce-page.c:521 +#, c-format +msgid "Profile %d" +msgstr "設定檔 %d" + #. TRANSLATORS: this WEP WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:52 -#: ../panels/network/net-device-wifi.c:219 -#: ../panels/network/net-device-wifi.c:383 +#: ../panels/network/connection-editor/ce-page-details.c:50 +#: ../panels/network/net-device-wifi.c:214 +#: ../panels/network/net-device-wifi.c:390 msgid "WEP" msgstr "WEP" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:56 -#: ../panels/network/net-device-wifi.c:223 -#: ../panels/network/net-device-wifi.c:388 +#: ../panels/network/connection-editor/ce-page-details.c:54 +#: ../panels/network/net-device-wifi.c:218 +#: ../panels/network/net-device-wifi.c:395 #: ../panels/network/network-wifi.ui.h:19 msgid "WPA" msgstr "WPA" #. TRANSLATORS: this WPA WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:60 -#: ../panels/network/net-device-wifi.c:227 +#: ../panels/network/connection-editor/ce-page-details.c:58 +#: ../panels/network/net-device-wifi.c:222 msgid "WPA2" msgstr "WPA2" #. TRANSLATORS: this Enterprise WiFi security -#: ../panels/network/connection-editor/ce-page-details.c:65 -#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/connection-editor/ce-page-details.c:63 +#: ../panels/network/net-device-wifi.c:227 msgid "Enterprise" msgstr "企業版" -#: ../panels/network/connection-editor/ce-page-details.c:70 -#: ../panels/network/net-device-wifi.c:237 -#: ../panels/network/net-device-wifi.c:373 +#: ../panels/network/connection-editor/ce-page-details.c:68 +#: ../panels/network/net-device-wifi.c:232 +#: ../panels/network/net-device-wifi.c:380 msgctxt "Wifi security" msgid "None" msgstr "沒有" -#: ../panels/network/connection-editor/ce-page-details.c:91 +#: ../panels/network/connection-editor/ce-page-details.c:89 #: ../panels/power/power.ui.h:17 msgid "Never" msgstr "永不" -#: ../panels/network/connection-editor/ce-page-details.c:106 -#: ../panels/network/net-device-ethernet.c:124 -#: ../panels/network/net-device-wifi.c:477 +#: ../panels/network/connection-editor/ce-page-details.c:104 +#: ../panels/network/net-device-ethernet.c:120 +#: ../panels/network/net-device-wifi.c:485 #, c-format msgid "%i day ago" msgid_plural "%i days ago" msgstr[0] "%i 天以前" #. Translators: network device speed -#: ../panels/network/connection-editor/ce-page-details.c:155 -#: ../panels/network/net-device-ethernet.c:54 -#: ../panels/network/net-device-wifi.c:534 +#: ../panels/network/connection-editor/ce-page-details.c:153 +#: ../panels/network/net-device-ethernet.c:50 +#: ../panels/network/net-device-wifi.c:542 #, c-format msgid "%d Mb/s" msgstr "%d Mb/s" -#: ../panels/network/connection-editor/ce-page-details.c:181 -#: ../panels/network/net-device-wifi.c:563 +#: ../panels/network/connection-editor/ce-page-details.c:179 +#: ../panels/network/net-device-wifi.c:571 msgctxt "Signal strength" msgid "None" msgstr "沒有" -#: ../panels/network/connection-editor/ce-page-details.c:183 -#: ../panels/network/net-device-wifi.c:565 +#: ../panels/network/connection-editor/ce-page-details.c:181 +#: ../panels/network/net-device-wifi.c:573 msgctxt "Signal strength" msgid "Weak" msgstr "太弱" -#: ../panels/network/connection-editor/ce-page-details.c:185 -#: ../panels/network/net-device-wifi.c:567 +#: ../panels/network/connection-editor/ce-page-details.c:183 +#: ../panels/network/net-device-wifi.c:575 msgctxt "Signal strength" msgid "Ok" msgstr "確定" -#: ../panels/network/connection-editor/ce-page-details.c:187 -#: ../panels/network/net-device-wifi.c:569 +#: ../panels/network/connection-editor/ce-page-details.c:185 +#: ../panels/network/net-device-wifi.c:577 msgctxt "Signal strength" msgid "Good" msgstr "良好" -#: ../panels/network/connection-editor/ce-page-details.c:189 -#: ../panels/network/net-device-wifi.c:571 +#: ../panels/network/connection-editor/ce-page-details.c:187 +#: ../panels/network/net-device-wifi.c:579 msgctxt "Signal strength" msgid "Excellent" msgstr "很好" -#: ../panels/network/connection-editor/ce-page-ethernet.c:226 -#: ../panels/network/connection-editor/ce-page-vpn.c:220 -#: ../panels/network/connection-editor/ce-page-wifi.c:262 +#: ../panels/network/connection-editor/ce-page-details.c:225 +#: ../panels/network/network-wifi.ui.h:46 ../shell/alt/cc-window.c:266 +msgid "Details" +msgstr "詳細資料" + +#: ../panels/network/connection-editor/ce-page-ethernet.c:215 +#: ../panels/network/connection-editor/ce-page-vpn.c:221 +#: ../panels/network/connection-editor/ce-page-wifi.c:227 #: ../panels/network/network-wifi.ui.h:47 msgid "Identity" msgstr "身分" -#: ../panels/network/connection-editor/ce-page-ip4.c:177 -#: ../panels/network/connection-editor/ce-page-ip4.c:439 -#: ../panels/network/connection-editor/ce-page-ip6.c:179 -#: ../panels/network/connection-editor/ce-page-ip6.c:443 +#: ../panels/network/connection-editor/ce-page-ip4.c:202 +#: ../panels/network/connection-editor/ce-page-ip4.c:461 +#: ../panels/network/connection-editor/ce-page-ip6.c:180 +#: ../panels/network/connection-editor/ce-page-ip6.c:427 msgid "Address" msgstr "地址" -#: ../panels/network/connection-editor/ce-page-ip4.c:190 -#: ../panels/network/connection-editor/ce-page-ip4.c:452 +#: ../panels/network/connection-editor/ce-page-ip4.c:215 +#: ../panels/network/connection-editor/ce-page-ip4.c:474 msgid "Netmask" msgstr "網路遮罩" -#: ../panels/network/connection-editor/ce-page-ip4.c:204 -#: ../panels/network/connection-editor/ce-page-ip4.c:465 -#: ../panels/network/connection-editor/ce-page-ip6.c:205 -#: ../panels/network/connection-editor/ce-page-ip6.c:473 +#: ../panels/network/connection-editor/ce-page-ip4.c:229 +#: ../panels/network/connection-editor/ce-page-ip4.c:487 +#: ../panels/network/connection-editor/ce-page-ip6.c:206 +#: ../panels/network/connection-editor/ce-page-ip6.c:453 #: ../panels/network/network-vpn.ui.h:2 msgid "Gateway" msgstr "通訊閘" -#: ../panels/network/connection-editor/ce-page-ip4.c:221 -#: ../panels/network/connection-editor/ce-page-ip6.c:222 +#: ../panels/network/connection-editor/ce-page-ip4.c:250 +#: ../panels/network/connection-editor/ce-page-ip6.c:223 msgid "Delete Address" msgstr "刪除位址" -#: ../panels/network/connection-editor/ce-page-ip4.c:275 -#: ../panels/network/connection-editor/ce-page-ip6.c:276 -msgid "Add" -msgstr "加入" - -#: ../panels/network/connection-editor/ce-page-ip4.c:343 -#: ../panels/network/connection-editor/ce-page-ip6.c:347 +#: ../panels/network/connection-editor/ce-page-ip4.c:368 +#: ../panels/network/connection-editor/ce-page-ip6.c:334 msgid "Server" msgstr "伺服器" -#: ../panels/network/connection-editor/ce-page-ip4.c:360 -#: ../panels/network/connection-editor/ce-page-ip6.c:364 +#: ../panels/network/connection-editor/ce-page-ip4.c:385 +#: ../panels/network/connection-editor/ce-page-ip6.c:351 msgid "Delete DNS Server" msgstr "刪除 DNS 伺服器" #. Translators: Please see https://en.wikipedia.org/wiki/Metrics_(networking) -#: ../panels/network/connection-editor/ce-page-ip4.c:479 -#: ../panels/network/connection-editor/ce-page-ip6.c:487 +#: ../panels/network/connection-editor/ce-page-ip4.c:501 +#: ../panels/network/connection-editor/ce-page-ip6.c:467 msgctxt "network parameters" msgid "Metric" msgstr "公制" -#: ../panels/network/connection-editor/ce-page-ip4.c:500 -#: ../panels/network/connection-editor/ce-page-ip6.c:508 +#: ../panels/network/connection-editor/ce-page-ip4.c:522 +#: ../panels/network/connection-editor/ce-page-ip6.c:484 msgid "Delete Route" msgstr "刪除路由" -#: ../panels/network/connection-editor/ce-page-ip4.c:615 +#: ../panels/network/connection-editor/ce-page-ip4.c:626 #: ../panels/network/network-wifi.ui.h:27 msgid "Automatic (DHCP)" msgstr "自動 (DHCP)" -#: ../panels/network/connection-editor/ce-page-ip4.c:619 -#: ../panels/network/connection-editor/ce-page-ip6.c:621 +#: ../panels/network/connection-editor/ce-page-ip4.c:630 +#: ../panels/network/connection-editor/ce-page-ip6.c:592 #: ../panels/network/network-wifi.ui.h:26 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Manual" msgstr "手動" -#: ../panels/network/connection-editor/ce-page-ip4.c:623 -#: ../panels/network/connection-editor/ce-page-ip6.c:625 +#: ../panels/network/connection-editor/ce-page-ip4.c:634 +#: ../panels/network/connection-editor/ce-page-ip6.c:596 msgid "Link-Local Only" msgstr "只有本機連線" -#: ../panels/network/connection-editor/ce-page-ip4.c:967 +#: ../panels/network/connection-editor/ce-page-ip4.c:979 #: ../panels/network/network-wifi.ui.h:48 msgid "IPv4" msgstr "IPv4" -#: ../panels/network/connection-editor/ce-page-ip6.c:192 -#: ../panels/network/connection-editor/ce-page-ip6.c:456 +#: ../panels/network/connection-editor/ce-page-ip6.c:193 +#: ../panels/network/connection-editor/ce-page-ip6.c:440 msgid "Prefix" msgstr "前綴" -#: ../panels/network/connection-editor/ce-page-ip6.c:613 +#: ../panels/network/connection-editor/ce-page-ip6.c:584 #: ../panels/network/connection-editor/ethernet-page.ui.h:1 #: ../panels/network/connection-editor/ip4-page.ui.h:4 #: ../panels/network/connection-editor/ip6-page.ui.h:4 #: ../panels/network/wireless-security/eap-method-peap.ui.h:2 -#: ../panels/privacy/cc-privacy-panel.c:199 +#: ../panels/privacy/cc-privacy-panel.c:217 msgid "Automatic" msgstr "自動" -#: ../panels/network/connection-editor/ce-page-ip6.c:617 +#: ../panels/network/connection-editor/ce-page-ip6.c:588 msgid "Automatic, DHCP only" msgstr "自動，僅使用 DHCP" -#: ../panels/network/connection-editor/ce-page-ip6.c:937 +#: ../panels/network/connection-editor/ce-page-ip6.c:898 #: ../panels/network/network-wifi.ui.h:49 msgid "IPv6" msgstr "IPv6" -#: ../panels/network/connection-editor/ce-page-reset.c:91 +#: ../panels/network/connection-editor/ce-page-reset.c:78 #: ../panels/network/network-wifi.ui.h:51 msgid "Reset" msgstr "重設" -#: ../panels/network/connection-editor/ce-page-security.c:253 +#: ../panels/network/connection-editor/ce-page-security.c:248 msgctxt "Wi-Fi/Ethernet security" msgid "None" msgstr "沒有" -#: ../panels/network/connection-editor/ce-page-security.c:276 +#: ../panels/network/connection-editor/ce-page-security.c:271 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "WEP 40/128-位元金鑰 (Hex 或 ASCII)" -#: ../panels/network/connection-editor/ce-page-security.c:286 +#: ../panels/network/connection-editor/ce-page-security.c:281 msgid "WEP 128-bit Passphrase" msgstr "WEP 128-位元密語" -#: ../panels/network/connection-editor/ce-page-security.c:299 -#: ../panels/network/wireless-security/wireless-security.c:409 +#: ../panels/network/connection-editor/ce-page-security.c:294 +#: ../panels/network/wireless-security/wireless-security.c:463 msgid "LEAP" msgstr "LEAP" -#: ../panels/network/connection-editor/ce-page-security.c:312 +#: ../panels/network/connection-editor/ce-page-security.c:307 msgid "Dynamic WEP (802.1x)" msgstr "動態 WEP (802.1x)" -#: ../panels/network/connection-editor/ce-page-security.c:326 +#: ../panels/network/connection-editor/ce-page-security.c:321 msgid "WPA & WPA2 Personal" msgstr "WPA 和 WPA2 個人版" -#: ../panels/network/connection-editor/ce-page-security.c:340 +#: ../panels/network/connection-editor/ce-page-security.c:335 msgid "WPA & WPA2 Enterprise" msgstr "WPA 和 WPA2 企業版" @@ -2193,30 +2238,30 @@ msgstr "連線速度" #: ../panels/network/connection-editor/details-page.ui.h:4 -#: ../panels/network/net-device-ethernet.c:157 +#: ../panels/network/net-device-ethernet.c:153 #: ../panels/network/network-simple.ui.h:3 -#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:695 +#: ../panels/network/network-wifi.ui.h:7 ../panels/network/panel-common.c:644 msgid "IPv4 Address" msgstr "IPv4 位址" #: ../panels/network/connection-editor/details-page.ui.h:5 +#: ../panels/network/net-device-ethernet.c:154 #: ../panels/network/net-device-ethernet.c:158 -#: ../panels/network/net-device-ethernet.c:162 #: ../panels/network/network-mobile.ui.h:4 #: ../panels/network/network-simple.ui.h:4 -#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:696 +#: ../panels/network/network-wifi.ui.h:8 ../panels/network/panel-common.c:645 msgid "IPv6 Address" msgstr "IPv6 位址" #: ../panels/network/connection-editor/details-page.ui.h:6 -#: ../panels/network/net-device-ethernet.c:165 +#: ../panels/network/net-device-ethernet.c:161 #: ../panels/network/network-simple.ui.h:2 #: ../panels/network/network-wifi.ui.h:9 msgid "Hardware Address" msgstr "硬體位址" #: ../panels/network/connection-editor/details-page.ui.h:7 -#: ../panels/network/net-device-ethernet.c:169 +#: ../panels/network/net-device-ethernet.c:165 #: ../panels/network/network-mobile.ui.h:5 #: ../panels/network/network-simple.ui.h:5 #: ../panels/network/network-wifi.ui.h:10 @@ -2226,7 +2271,7 @@ #: ../panels/network/connection-editor/details-page.ui.h:8 #: ../panels/network/connection-editor/ip4-page.ui.h:3 #: ../panels/network/connection-editor/ip6-page.ui.h:3 -#: ../panels/network/net-device-ethernet.c:171 +#: ../panels/network/net-device-ethernet.c:167 #: ../panels/network/network-mobile.ui.h:6 #: ../panels/network/network-simple.ui.h:6 #: ../panels/network/network-wifi.ui.h:11 @@ -2309,13 +2354,13 @@ msgid "Firewall _Zone" msgstr "防火牆界域(_Z)" -#: ../panels/network/connection-editor/firewall-helpers.c:48 -#: ../panels/network/connection-editor/firewall-helpers.c:113 +#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:118 msgctxt "Firewall zone" msgid "Default" msgstr "預設" -#: ../panels/network/connection-editor/firewall-helpers.c:49 +#: ../panels/network/connection-editor/firewall-helpers.c:50 msgid "The zone defines the trust level of the connection" msgstr "界域定義了連線的信任等級" @@ -2357,45 +2402,25 @@ msgid "IPv_6" msgstr "IPv_6" -#: ../panels/network/connection-editor/net-connection-editor.c:275 +#: ../panels/network/connection-editor/net-connection-editor.c:296 msgid "Unable to open connection editor" msgstr "無法開啟連線編輯器" -#: ../panels/network/connection-editor/net-connection-editor.c:293 +#: ../panels/network/connection-editor/net-connection-editor.c:314 msgid "New Profile" msgstr "新增設定檔" -#: ../panels/network/connection-editor/net-connection-editor.c:583 +#: ../panels/network/connection-editor/net-connection-editor.c:635 msgid "VPN" msgstr "VPN" -#: ../panels/network/connection-editor/net-connection-editor.c:584 -msgid "Bond" -msgstr "繫結" - -#: ../panels/network/connection-editor/net-connection-editor.c:586 -msgid "Team" -msgstr "團隊" - -#: ../panels/network/connection-editor/net-connection-editor.c:588 -msgid "Bridge" -msgstr "橋接" - -#: ../panels/network/connection-editor/net-connection-editor.c:589 -msgid "VLAN" -msgstr "VLAN" - -#: ../panels/network/connection-editor/net-connection-editor.c:740 -msgid "Could not load VPN plugins" -msgstr "無法載入 VPN 外掛程式" - -#: ../panels/network/connection-editor/net-connection-editor.c:809 +#: ../panels/network/connection-editor/net-connection-editor.c:783 msgid "Import from file…" msgstr "從檔案匯入…" -#: ../panels/network/connection-editor/net-connection-editor.c:880 -msgid "Add Network Connection" -msgstr "加入網路連線" +#: ../panels/network/connection-editor/net-connection-editor.c:817 +msgid "Add VPN" +msgstr "加入 VPN" #: ../panels/network/connection-editor/reset-page.ui.h:1 #: ../panels/network/network-wifi.ui.h:41 @@ -2403,7 +2428,7 @@ msgstr "重設(_R)" #: ../panels/network/connection-editor/reset-page.ui.h:2 -#: ../panels/network/net-device-wifi.c:1463 +#: ../panels/network/net-device-wifi.c:1536 #: ../panels/network/network-wifi.ui.h:42 msgid "_Forget" msgstr "遺忘(_F)" @@ -2425,11 +2450,11 @@ msgid "S_ecurity" msgstr "安全性(_E)" -#: ../panels/network/connection-editor/vpn-helpers.c:205 +#: ../panels/network/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "無法匯入 VPN 網路連線" -#: ../panels/network/connection-editor/vpn-helpers.c:207 +#: ../panels/network/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -2441,36 +2466,36 @@ "\n" "錯誤：%s。" -#: ../panels/network/connection-editor/vpn-helpers.c:242 +#: ../panels/network/connection-editor/vpn-helpers.c:178 msgid "Select file to import" msgstr "選擇要匯入的檔案" -#: ../panels/network/connection-editor/vpn-helpers.c:246 -#: ../panels/printers/cc-printers-panel.c:2053 +#: ../panels/network/connection-editor/vpn-helpers.c:182 +#: ../panels/printers/cc-printers-panel.c:2078 #: ../panels/sharing/cc-sharing-panel.c:373 #: ../panels/user-accounts/um-photo-dialog.c:218 msgid "_Open" msgstr "開啟(_O)" -#: ../panels/network/connection-editor/vpn-helpers.c:294 +#: ../panels/network/connection-editor/vpn-helpers.c:230 #, c-format msgid "A file named \"%s\" already exists." msgstr "名為「%s」的檔案已經存在。" -#: ../panels/network/connection-editor/vpn-helpers.c:296 +#: ../panels/network/connection-editor/vpn-helpers.c:232 msgid "_Replace" msgstr "取代(_R)" -#: ../panels/network/connection-editor/vpn-helpers.c:298 +#: ../panels/network/connection-editor/vpn-helpers.c:234 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "您是否要以準備儲存的 VPN 連線取代 %s？" -#: ../panels/network/connection-editor/vpn-helpers.c:334 +#: ../panels/network/connection-editor/vpn-helpers.c:270 msgid "Cannot export VPN connection" msgstr "不能匯出 VPN 連線" -#: ../panels/network/connection-editor/vpn-helpers.c:336 +#: ../panels/network/connection-editor/vpn-helpers.c:272 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -2481,7 +2506,7 @@ "\n" "錯誤：%s。" -#: ../panels/network/connection-editor/vpn-helpers.c:371 +#: ../panels/network/connection-editor/vpn-helpers.c:307 msgid "Export VPN connection" msgstr "匯出 VPN 連線" @@ -2508,61 +2533,46 @@ msgid "Make available to _other users" msgstr "允許其他使用者使用(_O)" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:1 -#: ../panels/network/network-mobile.ui.h:7 -msgid "Network" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +msgid "Net­work" msgstr "網路" -#: ../panels/network/gnome-network-panel.desktop.in.in.h:2 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:3 msgid "Control how you connect to the Internet" msgstr "控制您如何連線至網際網絡" #. Translators: those are keywords for the network control-center panel -#: ../panels/network/gnome-network-panel.desktop.in.in.h:4 +#: ../panels/network/gnome-network-panel.desktop.in.in.h:5 msgid "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;" +"DNS;" msgstr "" "Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Modem;Bluetooth;vpn;" -"vlan;bridge;bond;DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;橋接;" -"繫結;" - -#: ../panels/network/net-device-bond.c:77 -msgid "Bond slaves" -msgstr "繫結的連線" - -#: ../panels/network/net-device-bond.c:102 -#: ../panels/network/net-device-bridge.c:102 -#: ../panels/network/net-device-team.c:102 -msgid "(none)" -msgstr "(沒有)" - -#: ../panels/network/net-device-bridge.c:77 -msgid "Bridge slaves" -msgstr "橋接的連線" +"DNS;網路;無線網路;區域網路;代理伺服器;寬頻;數據機;藍牙;" -#: ../panels/network/net-device-ethernet.c:110 -#: ../panels/network/net-device-wifi.c:463 +#: ../panels/network/net-device-ethernet.c:106 +#: ../panels/network/net-device-wifi.c:471 msgid "never" msgstr "永不" -#: ../panels/network/net-device-ethernet.c:120 -#: ../panels/network/net-device-wifi.c:473 +#: ../panels/network/net-device-ethernet.c:116 +#: ../panels/network/net-device-wifi.c:481 msgid "today" msgstr "今日" -#: ../panels/network/net-device-ethernet.c:122 -#: ../panels/network/net-device-wifi.c:475 +#: ../panels/network/net-device-ethernet.c:118 +#: ../panels/network/net-device-wifi.c:483 msgid "yesterday" msgstr "昨日" -#: ../panels/network/net-device-ethernet.c:160 -#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:698 -#: ../panels/network/panel-common.c:700 ../panels/printers/printers.ui.h:13 +#: ../panels/network/net-device-ethernet.c:156 +#: ../panels/network/network-mobile.ui.h:3 ../panels/network/panel-common.c:647 +#: ../panels/network/panel-common.c:649 ../panels/printers/printers.ui.h:13 msgid "IP Address" msgstr "IP 位址" -#: ../panels/network/net-device-ethernet.c:176 +#: ../panels/network/net-device-ethernet.c:172 #: ../panels/network/network-wifi.ui.h:12 msgid "Last used" msgstr "最後使用的" @@ -2572,34 +2582,25 @@ #. * profile. It is also used to display ethernet in the #. * device list. #. -#: ../panels/network/net-device-ethernet.c:286 +#: ../panels/network/net-device-ethernet.c:280 #: ../panels/network/network-ethernet.ui.h:1 #: ../panels/network/network-simple.ui.h:1 msgid "Wired" msgstr "有線" -#: ../panels/network/net-device-ethernet.c:354 -#: ../panels/network/net-device-wifi.c:1621 +#: ../panels/network/net-device-ethernet.c:348 +#: ../panels/network/net-device-wifi.c:1694 #: ../panels/network/network-ethernet.ui.h:3 #: ../panels/network/network-mobile.ui.h:8 #: ../panels/network/network-simple.ui.h:8 ../panels/network/network-vpn.ui.h:7 msgid "Options…" msgstr "選項…" -#: ../panels/network/net-device-ethernet.c:473 -#, c-format -msgid "Profile %d" -msgstr "設定檔 %d" - -#: ../panels/network/net-device-mobile.c:232 +#: ../panels/network/net-device-mobile.c:223 msgid "Add new connection" msgstr "加入新連線" -#: ../panels/network/net-device-team.c:77 -msgid "Team slaves" -msgstr "團隊從屬" - -#: ../panels/network/net-device-wifi.c:1176 +#: ../panels/network/net-device-wifi.c:1205 msgid "" "If you have a connection to the Internet other than wireless, you can set up " "a wireless hotspot to share the connection with others." @@ -2607,44 +2608,44 @@ "如果您有無線網路以外的方式連線到網際網路，您可以使用它來與其他人分享您的網際" "網路連線。" -#: ../panels/network/net-device-wifi.c:1180 +#: ../panels/network/net-device-wifi.c:1209 #, c-format msgid "Switching on the wireless hotspot will disconnect you from %s." msgstr "切換無線網路熱點會讓您從 %s 斷線。" -#: ../panels/network/net-device-wifi.c:1184 +#: ../panels/network/net-device-wifi.c:1213 msgid "" "It is not possible to access the Internet through your wireless while the " "hotspot is active." msgstr "當熱點在使用中時是沒有辦法透過您的無線網路存取網際網路的。" -#: ../panels/network/net-device-wifi.c:1267 +#: ../panels/network/net-device-wifi.c:1296 msgid "Stop hotspot and disconnect any users?" msgstr "停止熱點並中斷任何使用者的連線？" -#: ../panels/network/net-device-wifi.c:1270 +#: ../panels/network/net-device-wifi.c:1299 msgid "_Stop Hotspot" msgstr "停止熱點(_S)" -#: ../panels/network/net-device-wifi.c:1327 +#: ../panels/network/net-device-wifi.c:1397 msgid "System policy prohibits use as a Hotspot" msgstr "系統原則禁止做為熱點" -#: ../panels/network/net-device-wifi.c:1330 +#: ../panels/network/net-device-wifi.c:1400 msgid "Wireless device does not support Hotspot mode" msgstr "無線裝置不支援熱點模式" -#: ../panels/network/net-device-wifi.c:1459 +#: ../panels/network/net-device-wifi.c:1532 msgid "" "Network details for the selected networks, including passwords and any " "custom configuration will be lost." msgstr "選取網路的詳細資料包含密碼及任何自訂的設定都會消失。" -#: ../panels/network/net-device-wifi.c:1774 +#: ../panels/network/net-device-wifi.c:1842 msgid "History" msgstr "歷史紀錄" -#: ../panels/network/net-device-wifi.c:1778 +#: ../panels/network/net-device-wifi.c:1846 #: ../panels/printers/options-dialog.ui.h:2 #: ../panels/wacom/button-mapping.ui.h:2 ../panels/wacom/cc-wacom-page.c:525 #: ../panels/wacom/gnome-wacom-properties.ui.h:5 @@ -2652,7 +2653,7 @@ msgstr "關閉(_C)" #. translators: This is the label for the "Forget wireless network" functionality -#: ../panels/network/net-device-wifi.c:1786 +#: ../panels/network/net-device-wifi.c:1854 msgctxt "Wi-Fi Network" msgid "_Forget" msgstr "遺忘(_F)" @@ -2687,6 +2688,10 @@ msgid "Provider" msgstr "供應商" +#: ../panels/network/network-mobile.ui.h:7 +msgid "Network" +msgstr "網路" + #: ../panels/network/network-proxy.ui.h:1 msgctxt "proxy method" msgid "None" @@ -2793,15 +2798,11 @@ #: ../panels/network/wireless-security/ws-leap.ui.h:2 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:1 #: ../panels/sharing/sharing.ui.h:9 -#: ../panels/user-accounts/data/account-dialog.ui.h:9 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 msgid "_Password" msgstr "密碼(_P)" -#: ../panels/network/network-wifi.ui.h:20 -msgid "None" -msgstr "沒有" - #: ../panels/network/network-wifi.ui.h:21 msgid "Show P_assword" msgstr "顯示密碼(_A)" @@ -2891,7 +2892,6 @@ msgstr "連接到隱藏的網路(_C)…" #: ../panels/network/network-wifi.ui.h:58 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:13 msgid "_History" msgstr "歷史紀錄(_H)" @@ -2913,359 +2913,336 @@ #: ../panels/network/network-wifi.ui.h:63 #: ../panels/printers/authentication-dialog.ui.h:5 -#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/account-dialog.ui.h:9 msgid "Password" msgstr "密碼" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:131 +#: ../panels/network/panel-common.c:127 msgid "Ad-hoc" msgstr "Ad-hoc" #. TRANSLATORS: AP type -#: ../panels/network/panel-common.c:135 +#: ../panels/network/panel-common.c:131 msgid "Infrastructure" msgstr "基礎架構" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:151 ../panels/network/panel-common.c:205 +#: ../panels/network/panel-common.c:147 ../panels/network/panel-common.c:201 msgid "Status unknown" msgstr "狀態不明" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:155 +#: ../panels/network/panel-common.c:151 msgid "Unmanaged" msgstr "未管理" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:159 +#: ../panels/network/panel-common.c:155 msgid "Unavailable" msgstr "無法使用" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 +#: ../panels/network/panel-common.c:165 ../panels/network/panel-common.c:207 msgid "Connecting" msgstr "連線中" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 +#: ../panels/network/panel-common.c:169 ../panels/network/panel-common.c:211 msgid "Authentication required" msgstr "需要核對" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:177 ../panels/network/panel-common.c:219 +#: ../panels/network/panel-common.c:173 ../panels/network/panel-common.c:215 msgid "Connected" msgstr "已連線" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:181 +#: ../panels/network/panel-common.c:177 msgid "Disconnecting" msgstr "斷線" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:223 +#: ../panels/network/panel-common.c:181 ../panels/network/panel-common.c:219 msgid "Connection failed" msgstr "連線失敗" #. TRANSLATORS: device status #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:189 ../panels/network/panel-common.c:231 +#: ../panels/network/panel-common.c:185 ../panels/network/panel-common.c:227 msgid "Status unknown (missing)" msgstr "狀態不詳（缺乏）" #. TRANSLATORS: VPN status -#: ../panels/network/panel-common.c:227 +#: ../panels/network/panel-common.c:223 msgid "Not connected" msgstr "未連線" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:252 +#: ../panels/network/panel-common.c:248 msgid "Configuration failed" msgstr "設定失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:256 +#: ../panels/network/panel-common.c:252 msgid "IP configuration failed" msgstr "IP 設定失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:260 +#: ../panels/network/panel-common.c:256 msgid "IP configuration expired" msgstr "IP 設定過期" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:264 +#: ../panels/network/panel-common.c:260 msgid "Secrets were required, but not provided" msgstr "需要機密，但沒有提供" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:268 +#: ../panels/network/panel-common.c:264 msgid "802.1x supplicant disconnected" msgstr "802.1x 請求已斷線" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:272 +#: ../panels/network/panel-common.c:268 msgid "802.1x supplicant configuration failed" msgstr "802.1x 請求設定失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:276 +#: ../panels/network/panel-common.c:272 msgid "802.1x supplicant failed" msgstr "802.1x 請求已失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:280 +#: ../panels/network/panel-common.c:276 msgid "802.1x supplicant took too long to authenticate" msgstr "802.1x 請求花了太長時間核對" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:284 +#: ../panels/network/panel-common.c:280 msgid "PPP service failed to start" msgstr "無法啟動 PPP 服務" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:288 +#: ../panels/network/panel-common.c:284 msgid "PPP service disconnected" msgstr "PPP 服務已斷線" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:292 +#: ../panels/network/panel-common.c:288 msgid "PPP failed" msgstr "PPP 失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:296 +#: ../panels/network/panel-common.c:292 msgid "DHCP client failed to start" msgstr "DHCP 客戶端啟動失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:300 +#: ../panels/network/panel-common.c:296 msgid "DHCP client error" msgstr "DHCP 客戶端錯誤" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:304 +#: ../panels/network/panel-common.c:300 msgid "DHCP client failed" msgstr "DHCP 客戶端失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:308 +#: ../panels/network/panel-common.c:304 msgid "Shared connection service failed to start" msgstr "分享的連線服務啟動失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:312 +#: ../panels/network/panel-common.c:308 msgid "Shared connection service failed" msgstr "分享的連線服務失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:316 +#: ../panels/network/panel-common.c:312 msgid "AutoIP service failed to start" msgstr "無法啟動 AutoIP 服務" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:320 +#: ../panels/network/panel-common.c:316 msgid "AutoIP service error" msgstr "AutoIP 服務錯誤" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:324 +#: ../panels/network/panel-common.c:320 msgid "AutoIP service failed" msgstr "AutoIP 服務失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:328 +#: ../panels/network/panel-common.c:324 msgid "Line busy" msgstr "線路忙碌" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:332 +#: ../panels/network/panel-common.c:328 msgid "No dial tone" msgstr "沒有撥號音" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:336 +#: ../panels/network/panel-common.c:332 msgid "No carrier could be established" msgstr "無法建立載體" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:340 +#: ../panels/network/panel-common.c:336 msgid "Dialing request timed out" msgstr "撥號要求逾時" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:344 +#: ../panels/network/panel-common.c:340 msgid "Dialing attempt failed" msgstr "嘗試撥號失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:348 +#: ../panels/network/panel-common.c:344 msgid "Modem initialization failed" msgstr "數據機初始化失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:352 +#: ../panels/network/panel-common.c:348 msgid "Failed to select the specified APN" msgstr "無法選擇指定的 APN" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:356 +#: ../panels/network/panel-common.c:352 msgid "Not searching for networks" msgstr "不要搜尋網路" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:360 +#: ../panels/network/panel-common.c:356 msgid "Network registration denied" msgstr "網路登記被禁止" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:364 +#: ../panels/network/panel-common.c:360 msgid "Network registration timed out" msgstr "網路登記逾時" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:368 +#: ../panels/network/panel-common.c:364 msgid "Failed to register with the requested network" msgstr "無法向要求的網路登記" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:372 +#: ../panels/network/panel-common.c:368 msgid "PIN check failed" msgstr "PIN 檢查失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:376 +#: ../panels/network/panel-common.c:372 msgid "Firmware for the device may be missing" msgstr "可能缺少裝置的韌體" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:380 +#: ../panels/network/panel-common.c:376 msgid "Connection disappeared" msgstr "連線已消失" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:384 +#: ../panels/network/panel-common.c:380 msgid "Existing connection was assumed" msgstr "優先使用現有的連線" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:388 +#: ../panels/network/panel-common.c:384 msgid "Modem not found" msgstr "找不到數據機" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:392 +#: ../panels/network/panel-common.c:388 msgid "Bluetooth connection failed" msgstr "藍牙連線失敗" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:396 +#: ../panels/network/panel-common.c:392 msgid "SIM Card not inserted" msgstr "SIM 卡尚未插入" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:400 +#: ../panels/network/panel-common.c:396 msgid "SIM Pin required" msgstr "需要 SIM PIN 碼" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:404 +#: ../panels/network/panel-common.c:400 msgid "SIM Puk required" msgstr "需要 SIM PUK 碼" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:408 +#: ../panels/network/panel-common.c:404 msgid "SIM wrong" msgstr "SIM 錯誤" #. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:412 -msgid "InfiniBand device does not support connected mode" -msgstr "InfiniBand 裝置不支援已連接模式" - -#. TRANSLATORS: device status reason -#: ../panels/network/panel-common.c:416 +#: ../panels/network/panel-common.c:408 msgid "Connection dependency failed" msgstr "連線相依性解析失敗" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:440 +#: ../panels/network/panel-common.c:433 msgid "Firmware missing" msgstr "缺少韌體" #. TRANSLATORS: device status -#: ../panels/network/panel-common.c:444 ../panels/network/panel-common.c:447 +#: ../panels/network/panel-common.c:437 msgid "Cable unplugged" msgstr "纜線已拔除" -#: ../panels/network/wireless-security/eap-method.c:275 -msgid "No Certificate Authority certificate chosen" -msgstr "未選擇任何憑證授權單位(CA)憑證" +#: ../panels/network/wireless-security/eap-method.c:69 +msgid "undefined error in 802.1x security (wpa-eap)" +msgstr "802.1x 加密的未定義錯誤 (wpa-eap)" + +#: ../panels/network/wireless-security/eap-method.c:245 +msgid "no file selected" +msgstr "未選取檔案" #: ../panels/network/wireless-security/eap-method.c:276 -msgid "" -"Not using a Certificate Authority (CA) certificate can result in connections " -"to insecure, rogue Wi-Fi networks. Would you like to choose a Certificate " -"Authority certificate?" -msgstr "" -"不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一個憑" -"證中心的憑證？" - -#: ../panels/network/wireless-security/eap-method.c:281 -msgid "Ignore" -msgstr "忽略" - -#: ../panels/network/wireless-security/eap-method.c:285 -msgid "Choose CA Certificate" -msgstr "選擇 CA 憑證" - -#: ../panels/network/wireless-security/eap-method.c:645 -msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)" -msgstr "DER、PEM、或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12)" +msgid "unspecified error validating eap-method file" +msgstr "驗證 eap-method 檔案時未指定的錯誤" -#: ../panels/network/wireless-security/eap-method.c:648 +#: ../panels/network/wireless-security/eap-method.c:480 +msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" +msgstr "DER, PEM, 或 PKCS#12 私密金鑰 (*.der, *.pem, *.p12, *.key)" + +#: ../panels/network/wireless-security/eap-method.c:483 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)" -#: ../panels/network/wireless-security/eap-method-fast.c:271 -#: ../panels/network/wireless-security/eap-method-peap.c:280 +#: ../panels/network/wireless-security/eap-method-fast.c:72 +msgid "missing EAP-FAST PAC file" +msgstr "缺少 EAP-FAST PAC 檔案" + +#: ../panels/network/wireless-security/eap-method-fast.c:268 +#: ../panels/network/wireless-security/eap-method-peap.c:302 +#: ../panels/network/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../panels/network/wireless-security/eap-method-fast.c:287 -#: ../panels/network/wireless-security/eap-method-peap.c:246 -#: ../panels/network/wireless-security/eap-method-ttls.c:263 +#: ../panels/network/wireless-security/eap-method-fast.c:283 +#: ../panels/network/wireless-security/eap-method-peap.c:272 +#: ../panels/network/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" msgstr "MSCHAPv2" -#: ../panels/network/wireless-security/eap-method-fast.c:409 +#: ../panels/network/wireless-security/eap-method-fast.c:406 msgid "Choose a PAC file" msgstr "選擇一個 PAC 檔案" -#: ../panels/network/wireless-security/eap-method-fast.c:416 +#: ../panels/network/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "PAC 檔案 (*.pac)" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 -msgid "PAC _file" -msgstr "PAC 檔案(_F)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 -#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 -#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 -msgid "_Inner authentication" -msgstr "內部核對(_I)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 -msgid "PAC pro_visioning" -msgstr "允許自動供應 PAC(_V)" - -#: ../panels/network/wireless-security/eap-method-fast.ui.h:5 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:1 #: ../panels/network/wireless-security/eap-method-peap.ui.h:1 #: ../panels/network/wireless-security/eap-method-ttls.ui.h:1 #: ../panels/network/wireless-security/ws-dynamic-wep.ui.h:1 @@ -3274,41 +3251,73 @@ msgid " " msgstr " " -#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:2 msgid "Anonymous" msgstr "匿名" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:3 msgid "Authenticated" msgstr "已核對" -#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +#: ../panels/network/wireless-security/eap-method-fast.ui.h:4 msgid "Both" msgstr "兩者" +#: ../panels/network/wireless-security/eap-method-fast.ui.h:6 +msgid "PAC _file" +msgstr "PAC 檔案(_F)" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:7 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:5 +msgid "_Inner authentication" +msgstr "內部核對(_I)" + +#: ../panels/network/wireless-security/eap-method-fast.ui.h:8 +msgid "Allow automatic PAC pro_visioning" +msgstr "允許自動供應 PAC (_V)" + +#: ../panels/network/wireless-security/eap-method-leap.c:65 +msgid "missing EAP-LEAP username" +msgstr "缺少 EAP-LEAP 使用者名稱" + +#: ../panels/network/wireless-security/eap-method-leap.c:74 +msgid "missing EAP-LEAP password" +msgstr "缺少 EAP-LEAP 密碼" + #: ../panels/network/wireless-security/eap-method-leap.ui.h:1 #: ../panels/network/wireless-security/eap-method-simple.ui.h:1 #: ../panels/network/wireless-security/ws-leap.ui.h:1 -#: ../panels/user-accounts/data/account-dialog.ui.h:3 +#: ../panels/user-accounts/data/account-dialog.ui.h:4 msgid "_Username" msgstr "使用者名稱(_U)" #: ../panels/network/wireless-security/eap-method-leap.ui.h:3 -#: ../panels/network/wireless-security/eap-method-simple.ui.h:4 -#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 +#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:7 #: ../panels/network/wireless-security/ws-leap.ui.h:3 #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:3 msgid "Sho_w password" msgstr "顯示密碼(_W)" -#: ../panels/network/wireless-security/eap-method-peap.c:263 -#: ../panels/network/wireless-security/wireless-security.c:385 +#: ../panels/network/wireless-security/eap-method-peap.c:63 +#, c-format +msgid "invalid EAP-PEAP CA certificate: %s" +msgstr "無效的 EAP-PEAP CA 憑證：%s" + +#: ../panels/network/wireless-security/eap-method-peap.c:68 +msgid "invalid EAP-PEAP CA certificate: no certificate specified" +msgstr "無效的 EAP-PEAP CA 憑證：沒有指定憑證" + +#: ../panels/network/wireless-security/eap-method-peap.c:287 +#: ../panels/network/wireless-security/eap-method-ttls.c:318 +#: ../panels/network/wireless-security/wireless-security.c:439 msgid "MD5" msgstr "MD5" -#: ../panels/network/wireless-security/eap-method-peap.c:350 -#: ../panels/network/wireless-security/eap-method-tls.c:456 -#: ../panels/network/wireless-security/eap-method-ttls.c:350 +#: ../panels/network/wireless-security/eap-method-peap.c:381 +#: ../panels/network/wireless-security/eap-method-tls.c:501 +#: ../panels/network/wireless-security/eap-method-ttls.c:412 msgid "Choose a Certificate Authority certificate" msgstr "選擇憑證授權單位 (CA) 憑證" @@ -3326,19 +3335,57 @@ msgid "C_A certificate" msgstr "憑證(_A)" -#: ../panels/network/wireless-security/eap-method-peap.ui.h:8 +#: ../panels/network/wireless-security/eap-method-peap.ui.h:7 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-ttls.ui.h:4 +#, fuzzy +msgid "No CA certificate is _required" +msgstr "所有的 CA 憑證檔案" + +#: ../panels/network/wireless-security/eap-method-peap.ui.h:9 msgid "PEAP _version" msgstr "PEAP 版本(_V)" -#: ../panels/network/wireless-security/eap-method-simple.ui.h:3 -msgid "As_k for this password every time" -msgstr "每次都詢問密碼(_K)" +#: ../panels/network/wireless-security/eap-method-simple.c:74 +msgid "missing EAP username" +msgstr "缺少 EAP 使用者名稱" + +#: ../panels/network/wireless-security/eap-method-simple.c:87 +msgid "missing EAP password" +msgstr "缺少 EAP 密碼" + +#: ../panels/network/wireless-security/eap-method-tls.c:68 +msgid "missing EAP-TLS identity" +msgstr "缺少 EAP-TLS 身分" + +#: ../panels/network/wireless-security/eap-method-tls.c:77 +#, c-format +msgid "invalid EAP-TLS CA certificate: %s" +msgstr "無效的 EAP-TLS CA 憑證：%s" + +#: ../panels/network/wireless-security/eap-method-tls.c:84 +msgid "invalid EAP-TLS CA certificate: no certificate specified" +msgstr "無效的 EAP-TLS CA 憑證：沒有指定憑證" + +#: ../panels/network/wireless-security/eap-method-tls.c:95 +msgid "invalid EAP-TLS password: missing" +msgstr "無效的 EAP-TLS 密碼：缺少" -#: ../panels/network/wireless-security/eap-method-tls.c:282 +#: ../panels/network/wireless-security/eap-method-tls.c:109 +#, c-format +msgid "invalid EAP-TLS private-key: %s" +msgstr "無效的 EAP-TLS 私鑰：%s" + +#: ../panels/network/wireless-security/eap-method-tls.c:119 +#, c-format +msgid "invalid EAP-TLS user-certificate: %s" +msgstr "無效的 EAP-TLS 使用者憑證：%s" + +#: ../panels/network/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "未加密的私密金鑰是不安全的" -#: ../panels/network/wireless-security/eap-method-tls.c:285 +#: ../panels/network/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3351,11 +3398,11 @@ "\n" "(您可以使用 openssl 來加密您的私密金鑰)" -#: ../panels/network/wireless-security/eap-method-tls.c:450 +#: ../panels/network/wireless-security/eap-method-tls.c:495 msgid "Choose your personal certificate" msgstr "選擇您的個人憑證" -#: ../panels/network/wireless-security/eap-method-tls.c:462 +#: ../panels/network/wireless-security/eap-method-tls.c:507 msgid "Choose your private key" msgstr "選擇您的私密金鑰" @@ -3367,51 +3414,56 @@ msgid "_User certificate" msgstr "使用者憑證(_U)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:4 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 msgid "Private _key" msgstr "私鑰(_K)" -#: ../panels/network/wireless-security/eap-method-tls.ui.h:5 +#: ../panels/network/wireless-security/eap-method-tls.ui.h:6 msgid "_Private key password" msgstr "私密金鑰密碼(_P)" -#: ../panels/network/wireless-security/eap-method-ttls.c:230 +#: ../panels/network/wireless-security/eap-method-ttls.c:63 +#, c-format +msgid "invalid EAP-TTLS CA certificate: %s" +msgstr "無效的 EAP-TTLS CA 憑證：%s" + +#: ../panels/network/wireless-security/eap-method-ttls.c:68 +msgid "invalid EAP-TTLS CA certificate: no certificate specified" +msgstr "無效的 EAP-TTLS CA 憑證：沒有指定憑證" + +#: ../panels/network/wireless-security/eap-method-ttls.c:258 msgid "PAP" msgstr "PAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:247 +#: ../panels/network/wireless-security/eap-method-ttls.c:273 msgid "MSCHAP" msgstr "MSCHAP" -#: ../panels/network/wireless-security/eap-method-ttls.c:280 +#: ../panels/network/wireless-security/eap-method-ttls.c:303 msgid "CHAP" msgstr "CHAP" -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:1 -msgid "Don't _warn me again" -msgstr "不要再警告我(_W)" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:2 -msgid "No" -msgstr "否" - -#: ../panels/network/wireless-security/nag-user-dialog.ui.h:3 -msgid "Yes" -msgstr "是" +#: ../panels/network/wireless-security/wireless-security.c:87 +msgid "Unknown error validating 802.1x security" +msgstr "驗證 802.1x 加密的未知錯誤" -#: ../panels/network/wireless-security/wireless-security.c:397 +#: ../panels/network/wireless-security/wireless-security.c:451 msgid "TLS" msgstr "TLS" -#: ../panels/network/wireless-security/wireless-security.c:421 +#: ../panels/network/wireless-security/wireless-security.c:475 +msgid "PWD" +msgstr "PWD" + +#: ../panels/network/wireless-security/wireless-security.c:486 msgid "FAST" msgstr "FAST" -#: ../panels/network/wireless-security/wireless-security.c:432 +#: ../panels/network/wireless-security/wireless-security.c:497 msgid "Tunneled TLS" msgstr "穿隧式 TLS" -#: ../panels/network/wireless-security/wireless-security.c:443 +#: ../panels/network/wireless-security/wireless-security.c:508 msgid "Protected EAP (PEAP)" msgstr "保護式 EAP (PEAP)" @@ -3421,6 +3473,46 @@ msgid "Au_thentication" msgstr "核對(_T)" +#: ../panels/network/wireless-security/ws-leap.c:63 +msgid "missing leap-username" +msgstr "缺少 leap 使用者名稱" + +#: ../panels/network/wireless-security/ws-leap.c:74 +msgid "missing leap-password" +msgstr "缺少 leap 密碼" + +#: ../panels/network/wireless-security/ws-wep-key.c:107 +msgid "missing wep-key" +msgstr "缺少 wep-key" + +#: ../panels/network/wireless-security/ws-wep-key.c:116 +#, c-format +msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +msgstr "無效的 wep-key：長度為 %zu 的金鑰只能包含十六進位數字" + +#: ../panels/network/wireless-security/ws-wep-key.c:124 +#, c-format +msgid "" +"invalid wep-key: key with a length of %zu must contain only ascii characters" +msgstr "無效的 wep-key：長度為 %zu 的金鑰只能包含 ascii 字元" + +#: ../panels/network/wireless-security/ws-wep-key.c:130 +#, c-format +msgid "" +"invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " +"(ascii) or 10/26 (hex)" +msgstr "" +"無效的 wep-key：錯誤的金鑰長度 %zu。金鑰長度必須為 5/13 (ascii) 或 10/26 (十" +"六進位)" + +#: ../panels/network/wireless-security/ws-wep-key.c:137 +msgid "invalid wep-key: passphrase must be non-empty" +msgstr "無效的 wep-key︰密語必須為非空" + +#: ../panels/network/wireless-security/ws-wep-key.c:139 +msgid "invalid wep-key: passphrase must be shorter than 64 characters" +msgstr "無效的 wep-key︰密語必須少於 64 個字元" + #: ../panels/network/wireless-security/ws-wep-key.ui.h:1 msgid "1 (Default)" msgstr "1 (預設值)" @@ -3457,19 +3549,30 @@ msgid "WEP inde_x" msgstr "WEP 索引(_X)" +#: ../panels/network/wireless-security/ws-wpa-psk.c:70 +#, c-format +msgid "" +"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " +"digits" +msgstr "無效的 wpa-psk：無效的長度 %zu。必須為 [8,63] 位元組或 64 十六進位數字" + +#: ../panels/network/wireless-security/ws-wpa-psk.c:79 +msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +msgstr "無效的 wpa-psk：不能將 64 位元組金鑰轉譯為十六進位" + #: ../panels/network/wireless-security/ws-wpa-psk.ui.h:2 msgid "_Type" msgstr "類型(_T)" #: ../panels/notifications/cc-notifications-panel.c:257 -#: ../panels/power/cc-power-panel.c:1933 ../panels/power/cc-power-panel.c:1940 -#: ../panels/privacy/cc-privacy-panel.c:172 -#: ../panels/privacy/cc-privacy-panel.c:239 +#: ../panels/power/cc-power-panel.c:1974 ../panels/power/cc-power-panel.c:1981 +#: ../panels/privacy/cc-privacy-panel.c:190 +#: ../panels/privacy/cc-privacy-panel.c:257 #: ../panels/universal-access/cc-ua-panel.c:269 -#: ../panels/universal-access/cc-ua-panel.c:582 -#: ../panels/universal-access/cc-ua-panel.c:595 -#: ../panels/universal-access/cc-ua-panel.c:607 -#: ../panels/universal-access/cc-ua-panel.c:778 +#: ../panels/universal-access/cc-ua-panel.c:590 +#: ../panels/universal-access/cc-ua-panel.c:603 +#: ../panels/universal-access/cc-ua-panel.c:615 +#: ../panels/universal-access/cc-ua-panel.c:786 msgid "On" msgstr "開啟" @@ -3506,16 +3609,17 @@ msgid "Show Message C_ontent on Lock Screen" msgstr "在鎖定畫面中顯示訊息內容(_O)" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:1 -msgid "Notifications" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +msgid "No­ti­fi­ca­tions" msgstr "通知" -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:2 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:3 msgid "Control which notifications are displayed and what they show" msgstr "控制要顯示哪種通知及要顯示什麼" #. Translators: those are keywords for the notifications control-center panel -#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:4 +#: ../panels/notifications/gnome-notifications-panel.desktop.in.in.h:5 msgid "Notifications;Banner;Message;Tray;Popup;" msgstr "Notifications;Banner;Message;Tray;Popup;通知;橫幅;訊息;匣;彈出;" @@ -3533,79 +3637,68 @@ msgid "Applications" msgstr "程式集" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:168 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:170 msgctxt "Online Account" msgid "Other" msgstr "其他" #. translators: This is the title of the "Add Account" dialog. -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:289 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:291 #: ../panels/online-accounts/online-accounts.ui.h:2 msgid "Add Account" msgstr "加入帳號" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:326 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:328 msgid "Mail" msgstr "郵件" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:332 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:334 +msgid "Calendar" +msgstr "行事曆" + +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:340 msgid "Contacts" msgstr "連絡人" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:338 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:346 msgid "Chat" msgstr "聊天" -#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:344 +#: ../panels/online-accounts/cc-online-accounts-add-account-dialog.c:352 msgid "Resources" msgstr "資源" -#: ../panels/online-accounts/cc-online-accounts-panel.c:422 -msgid "Error logging into the account" -msgstr "登入帳號時發生錯誤" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:492 -msgid "Credentials have expired." -msgstr "憑證已經過期。" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:496 -msgid "Sign in to enable this account." -msgstr "登入以啟用這個帳號。" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:501 -msgid "_Sign In" -msgstr "登入(_S)" - -#: ../panels/online-accounts/cc-online-accounts-panel.c:748 +#: ../panels/online-accounts/cc-online-accounts-panel.c:640 msgid "Error creating account" msgstr "建立帳號時發生錯誤" -#: ../panels/online-accounts/cc-online-accounts-panel.c:808 +#: ../panels/online-accounts/cc-online-accounts-panel.c:700 msgid "Error removing account" msgstr "移除帳號時發生錯誤" -#: ../panels/online-accounts/cc-online-accounts-panel.c:844 +#: ../panels/online-accounts/cc-online-accounts-panel.c:736 msgid "Are you sure you want to remove the account?" msgstr "確定要刪除這個帳號？" -#: ../panels/online-accounts/cc-online-accounts-panel.c:846 +#: ../panels/online-accounts/cc-online-accounts-panel.c:738 msgid "This will not remove the account on the server." msgstr "這不會移除伺服器上的帳號。" -#: ../panels/online-accounts/cc-online-accounts-panel.c:847 +#: ../panels/online-accounts/cc-online-accounts-panel.c:739 msgid "_Remove" msgstr "移除(_R)" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:1 -msgid "Online Accounts" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +msgid "On­line Accounts" msgstr "線上帳號" -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:2 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:3 msgid "Connect to your online accounts and decide what to use them for" msgstr "連接到您的線上帳號並決定要用它們來做什麼" #. For ReadItLater and Pocket, see http://en.wikipedia.org/wiki/Pocket_(application) -#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:4 +#: ../panels/online-accounts/gnome-online-accounts-panel.desktop.in.in.h:5 msgid "" "Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact;ownCloud;" "Kerberos;IMAP;SMTP;Pocket;ReadItLater;" @@ -3619,6 +3712,7 @@ msgstr "尚未設定線上帳號" #: ../panels/online-accounts/online-accounts.ui.h:3 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 msgid "Remove Account" msgstr "移除帳號" @@ -3757,7 +3851,7 @@ #. TRANSLATORS: secondary battery, misc #: ../panels/power/cc-power-panel.c:561 ../panels/power/cc-power-panel.c:801 -#: ../panels/power/cc-power-panel.c:2252 +#: ../panels/power/cc-power-panel.c:2366 msgid "Battery" msgstr "電池" @@ -3805,101 +3899,102 @@ msgid "When _idle" msgstr "閒置時(_I)" -#: ../panels/power/cc-power-panel.c:1640 +#: ../panels/power/cc-power-panel.c:1681 msgid "Power Saving" msgstr "節省電源" -#: ../panels/power/cc-power-panel.c:1675 +#: ../panels/power/cc-power-panel.c:1716 msgid "_Screen brightness" msgstr "螢幕亮度(_S)" -#: ../panels/power/cc-power-panel.c:1694 +#: ../panels/power/cc-power-panel.c:1735 msgid "Automatic brightness" msgstr "自動亮度" -#: ../panels/power/cc-power-panel.c:1714 +#: ../panels/power/cc-power-panel.c:1755 msgid "_Keyboard brightness" msgstr "鍵盤亮度(_K)" -#: ../panels/power/cc-power-panel.c:1724 +#: ../panels/power/cc-power-panel.c:1765 msgid "_Dim screen when inactive" msgstr "當不活動後降低螢幕亮度(_D)" -#: ../panels/power/cc-power-panel.c:1749 +#: ../panels/power/cc-power-panel.c:1790 msgid "_Blank screen" msgstr "螢幕轉黑(_B)" -#: ../panels/power/cc-power-panel.c:1786 +#: ../panels/power/cc-power-panel.c:1827 msgid "_Wi-Fi" msgstr "_Wi-Fi" -#: ../panels/power/cc-power-panel.c:1791 +#: ../panels/power/cc-power-panel.c:1832 msgid "Turn off Wi-Fi to save power." msgstr "關閉 Wi-Fi 以節省電源。" -#: ../panels/power/cc-power-panel.c:1816 +#: ../panels/power/cc-power-panel.c:1857 msgid "_Mobile broadband" msgstr "行動寬頻(_M)" -#: ../panels/power/cc-power-panel.c:1821 +#: ../panels/power/cc-power-panel.c:1862 msgid "Turn off mobile broadband (3G, 4G, LTE, etc.) to save power." msgstr "關閉行動寬頻 (3G、4G、LTE 等等) 以節省電源。" -#: ../panels/power/cc-power-panel.c:1873 +#: ../panels/power/cc-power-panel.c:1907 msgid "_Bluetooth" msgstr "藍牙(_B)" -#: ../panels/power/cc-power-panel.c:1929 +#: ../panels/power/cc-power-panel.c:1970 msgid "When on battery power" msgstr "使用電池電源時" -#: ../panels/power/cc-power-panel.c:1931 +#: ../panels/power/cc-power-panel.c:1972 msgid "When plugged in" msgstr "當插入電源線時" -#: ../panels/power/cc-power-panel.c:2023 +#: ../panels/power/cc-power-panel.c:2067 msgid "Suspend" msgstr "暫停" -#: ../panels/power/cc-power-panel.c:2024 +#: ../panels/power/cc-power-panel.c:2068 msgid "Hibernate" msgstr "休眠" -#: ../panels/power/cc-power-panel.c:2025 +#: ../panels/power/cc-power-panel.c:2069 msgid "Nothing" msgstr "沒有" #. Frame header -#: ../panels/power/cc-power-panel.c:2074 +#: ../panels/power/cc-power-panel.c:2183 msgid "Suspend & Power Button" msgstr "暫停和電源按鈕" -#: ../panels/power/cc-power-panel.c:2115 +#: ../panels/power/cc-power-panel.c:2226 msgid "_Automatic suspend" msgstr "自動暫停(_A)" -#: ../panels/power/cc-power-panel.c:2116 +#: ../panels/power/cc-power-panel.c:2227 msgid "Automatic suspend" msgstr "自動暫停" -#: ../panels/power/cc-power-panel.c:2180 +#: ../panels/power/cc-power-panel.c:2294 msgid "_When the Power Button is pressed" msgstr "當按下電源按鈕(_W)" -#: ../panels/power/cc-power-panel.c:2306 +#: ../panels/power/cc-power-panel.c:2420 ../shell/alt/cc-window.c:270 msgid "Devices" msgstr "裝置" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:1 -msgid "Power" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +msgid "Po­wer" msgstr "電源" -#: ../panels/power/gnome-power-panel.desktop.in.in.h:2 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:3 msgid "View your battery status and change power saving settings" msgstr "檢視您的電池狀態並改變電源節省設定值" #. Translators: those are keywords for the power control-center panel -#: ../panels/power/gnome-power-panel.desktop.in.in.h:4 +#: ../panels/power/gnome-power-panel.desktop.in.in.h:5 msgid "" "Power;Sleep;Suspend;Hibernate;Battery;Brightness;Dim;Blank;Monitor;DPMS;Idle;" msgstr "" @@ -3978,11 +4073,6 @@ msgid "Delay" msgstr "延遲" -#: ../panels/printers/authentication-dialog.ui.h:2 -#: ../panels/printers/ppd-selection-dialog.ui.h:2 -msgid "Cancel" -msgstr "取消" - #: ../panels/printers/authentication-dialog.ui.h:3 msgid "Authenticate" msgstr "核對" @@ -3992,200 +4082,197 @@ msgstr "要求核對" #. Translators: The printer is low on toner -#: ../panels/printers/cc-printers-panel.c:678 +#: ../panels/printers/cc-printers-panel.c:684 msgid "Low on toner" msgstr "碳粉不足" #. Translators: The printer has no toner left -#: ../panels/printers/cc-printers-panel.c:680 +#: ../panels/printers/cc-printers-panel.c:686 msgid "Out of toner" msgstr "碳粉用完" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:683 +#: ../panels/printers/cc-printers-panel.c:689 msgid "Low on developer" msgstr "顯像劑不足" #. Translators: "Developer" is a chemical for photo development, #. * http://en.wikipedia.org/wiki/Photographic_developer -#: ../panels/printers/cc-printers-panel.c:686 +#: ../panels/printers/cc-printers-panel.c:692 msgid "Out of developer" msgstr "顯像劑用完" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:688 +#: ../panels/printers/cc-printers-panel.c:694 msgid "Low on a marker supply" msgstr "墨水匣不足" #. Translators: "marker" is one color bin of the printer -#: ../panels/printers/cc-printers-panel.c:690 +#: ../panels/printers/cc-printers-panel.c:696 msgid "Out of a marker supply" msgstr "墨水匣用完" #. Translators: One or more covers on the printer are open -#: ../panels/printers/cc-printers-panel.c:692 +#: ../panels/printers/cc-printers-panel.c:698 msgid "Open cover" msgstr "外殼開啟" #. Translators: One or more doors on the printer are open -#: ../panels/printers/cc-printers-panel.c:694 +#: ../panels/printers/cc-printers-panel.c:700 msgid "Open door" msgstr "紙匣門開啟" #. Translators: At least one input tray is low on media -#: ../panels/printers/cc-printers-panel.c:696 +#: ../panels/printers/cc-printers-panel.c:702 msgid "Low on paper" msgstr "紙張不足。" #. Translators: At least one input tray is empty -#: ../panels/printers/cc-printers-panel.c:698 +#: ../panels/printers/cc-printers-panel.c:704 msgid "Out of paper" msgstr "紙張用完" #. Translators: The printer is offline -#: ../panels/printers/cc-printers-panel.c:700 +#: ../panels/printers/cc-printers-panel.c:706 msgctxt "printer state" msgid "Offline" msgstr "離線" #. Translators: Someone has stopped the Printer #. Translators: Printer's state (no jobs can be processed) -#: ../panels/printers/cc-printers-panel.c:702 -#: ../panels/printers/cc-printers-panel.c:893 +#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:898 msgctxt "printer state" msgid "Stopped" msgstr "已停止" #. Translators: The printer marker supply waste receptacle is almost full -#: ../panels/printers/cc-printers-panel.c:704 +#: ../panels/printers/cc-printers-panel.c:710 msgid "Waste receptacle almost full" msgstr "廢墨收集器將滿" #. Translators: The printer marker supply waste receptacle is full -#: ../panels/printers/cc-printers-panel.c:706 +#: ../panels/printers/cc-printers-panel.c:712 msgid "Waste receptacle full" msgstr "廢墨收集器已滿" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:708 +#: ../panels/printers/cc-printers-panel.c:714 msgid "The optical photo conductor is near end of life" msgstr "感光鼓接近使用壽命" #. Translators: Optical photo conductors are used in laser printers -#: ../panels/printers/cc-printers-panel.c:710 +#: ../panels/printers/cc-printers-panel.c:716 msgid "The optical photo conductor is no longer functioning" msgstr "感光鼓已無法使用" #. Translators: Printer's state (printer is being configured right now) -#: ../panels/printers/cc-printers-panel.c:820 +#: ../panels/printers/cc-printers-panel.c:825 msgctxt "printer state" msgid "Configuring" msgstr "正在設定" #. Translators: Printer's state (can start new job without waiting) -#: ../panels/printers/cc-printers-panel.c:879 +#: ../panels/printers/cc-printers-panel.c:884 msgctxt "printer state" msgid "Ready" msgstr "準備就緒" #. Translators: Printer's state (printer is ready but doesn't accept new jobs) -#: ../panels/printers/cc-printers-panel.c:884 +#: ../panels/printers/cc-printers-panel.c:889 msgctxt "printer state" msgid "Does not accept jobs" msgstr "不接受工作" #. Translators: Printer's state (jobs are processing) -#: ../panels/printers/cc-printers-panel.c:889 +#: ../panels/printers/cc-printers-panel.c:894 msgctxt "printer state" msgid "Processing" msgstr "處理中" #. Translators: Toner supply -#: ../panels/printers/cc-printers-panel.c:1009 +#: ../panels/printers/cc-printers-panel.c:1014 msgid "Toner Level" msgstr "碳粉匣等級" #. Translators: Ink supply -#: ../panels/printers/cc-printers-panel.c:1012 +#: ../panels/printers/cc-printers-panel.c:1017 msgid "Ink Level" msgstr "墨水等級" #. Translators: By supply we mean ink, toner, staples, water, ... -#: ../panels/printers/cc-printers-panel.c:1015 +#: ../panels/printers/cc-printers-panel.c:1020 msgid "Supply Level" msgstr "耗材等級" #. Translators: Printer's state (printer is being installed right now) -#: ../panels/printers/cc-printers-panel.c:1033 +#: ../panels/printers/cc-printers-panel.c:1038 msgctxt "printer state" msgid "Installing" msgstr "正在安裝" #. Translators: there is n active print jobs on this printer -#: ../panels/printers/cc-printers-panel.c:1541 +#: ../panels/printers/cc-printers-panel.c:1552 #, c-format msgid "%u active" msgid_plural "%u active" msgstr[0] "%u 使用中" #. Translators: Addition of the new printer failed. -#: ../panels/printers/cc-printers-panel.c:1882 +#: ../panels/printers/cc-printers-panel.c:1893 msgid "Failed to add new printer." msgstr "無法加入新的印表機。" -#: ../panels/printers/cc-printers-panel.c:2049 +#: ../panels/printers/cc-printers-panel.c:2074 msgid "Select PPD File" msgstr "選擇 PPD 檔案" -#: ../panels/printers/cc-printers-panel.c:2058 +#: ../panels/printers/cc-printers-panel.c:2083 msgid "" "PostScript Printer Description files (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *." "PPD.GZ)" msgstr "PostScript 印表機描述檔 (*.ppd, *.PPD, *.ppd.gz, *.PPD.gz, *.PPD.GZ)" -#: ../panels/printers/cc-printers-panel.c:2365 +#: ../panels/printers/cc-printers-panel.c:2390 msgid "No suitable driver found" msgstr "找不到合適的驅動程式" -#: ../panels/printers/cc-printers-panel.c:2436 +#: ../panels/printers/cc-printers-panel.c:2461 msgid "Searching for preferred drivers…" msgstr "正在搜尋偏好的驅動程式…" -#: ../panels/printers/cc-printers-panel.c:2457 +#: ../panels/printers/cc-printers-panel.c:2482 msgid "Select from database…" msgstr "從資料庫搜尋…" -#: ../panels/printers/cc-printers-panel.c:2466 +#: ../panels/printers/cc-printers-panel.c:2491 msgid "Provide PPD File…" msgstr "提供 PPD 檔案…" #. Translators: Name of job which makes printer to print test page -#: ../panels/printers/cc-printers-panel.c:2617 -#: ../panels/printers/cc-printers-panel.c:2640 +#: ../panels/printers/cc-printers-panel.c:2638 +#: ../panels/printers/cc-printers-panel.c:2661 msgid "Test page" msgstr "測試頁" -#: ../panels/printers/cc-printers-panel.c:2753 -msgid "No printers" -msgstr "沒有印表機" - #. Translators: The XML file containing user interface can not be loaded -#: ../panels/printers/cc-printers-panel.c:3099 +#: ../panels/printers/cc-printers-panel.c:3116 #, c-format msgid "Could not load ui: %s" msgstr "無法載入 ui：%s" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:1 -msgid "Printers" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +msgid "Prin­ters" msgstr "印表機" -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:2 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:3 msgid "Add printers, view printer jobs and decide how you want to print" msgstr "加入印表機、檢視印表機工作並決定您要如何列印" #. Translators: those are keywords for the printing control-center panel -#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:4 +#: ../panels/printers/gnome-printers-panel.desktop.in.in.h:5 msgid "Printer;Queue;Print;Paper;Ink;Toner;" msgstr "Printer;Queue;Print;Paper;Ink;Toner;印表機;佇列;列印;紙張;墨水;碳粉;" @@ -4347,6 +4434,11 @@ msgid "Parallel Port" msgstr "串列埠" +#. Translators: The found device is a printer connected via Bluetooth +#: ../panels/printers/pp-new-printer-dialog.c:1676 +msgid "Bluetooth" +msgstr "藍牙" + #. Translators: Location of found network printer (e.g. Kitchen, Reception) #: ../panels/printers/pp-new-printer-dialog.c:1713 #, c-format @@ -4557,13 +4649,17 @@ msgid "_Options" msgstr "選項(_O)" +#: ../panels/printers/printers.ui.h:23 +msgid "No printers" +msgstr "沒有印表機" + #. Translators: This button adds new printer. -#: ../panels/printers/printers.ui.h:24 +#: ../panels/printers/printers.ui.h:25 msgid "Add a Printer" msgstr "加入印表機" #. Translators: The CUPS server is not running (we can not connect to it). -#: ../panels/printers/printers.ui.h:26 +#: ../panels/printers/printers.ui.h:27 msgid "" "Sorry! The system printing service\n" "doesn't seem to be available." @@ -4571,70 +4667,70 @@ "抱歉！系統列印服務\n" "似乎無法使用。" -#: ../panels/privacy/cc-privacy-panel.c:369 ../panels/privacy/privacy.ui.h:24 +#: ../panels/privacy/cc-privacy-panel.c:387 ../panels/privacy/privacy.ui.h:24 msgid "Screen Lock" msgstr "螢幕鎖定" -#: ../panels/privacy/cc-privacy-panel.c:420 +#: ../panels/privacy/cc-privacy-panel.c:438 msgid "In use" msgstr "使用中" -#: ../panels/privacy/cc-privacy-panel.c:425 +#: ../panels/privacy/cc-privacy-panel.c:443 msgctxt "Location services status" msgid "On" msgstr "開" -#: ../panels/privacy/cc-privacy-panel.c:426 +#: ../panels/privacy/cc-privacy-panel.c:444 msgctxt "Location services status" msgid "Off" msgstr "關" -#: ../panels/privacy/cc-privacy-panel.c:762 ../panels/privacy/privacy.ui.h:42 +#: ../panels/privacy/cc-privacy-panel.c:823 ../panels/privacy/privacy.ui.h:42 msgid "Location Services" msgstr "位置服務" -#: ../panels/privacy/cc-privacy-panel.c:876 ../panels/privacy/privacy.ui.h:19 +#: ../panels/privacy/cc-privacy-panel.c:942 ../panels/privacy/privacy.ui.h:19 msgid "Usage & History" msgstr "使用與歷史紀錄" -#: ../panels/privacy/cc-privacy-panel.c:1001 +#: ../panels/privacy/cc-privacy-panel.c:1067 msgid "Empty all items from Trash?" msgstr "要清除回收筒中所有的項目？" -#: ../panels/privacy/cc-privacy-panel.c:1002 +#: ../panels/privacy/cc-privacy-panel.c:1068 msgid "All items in the Trash will be permanently deleted." msgstr "所有在回收筒中的項目會永遠刪除。" -#: ../panels/privacy/cc-privacy-panel.c:1003 ../panels/privacy/privacy.ui.h:34 +#: ../panels/privacy/cc-privacy-panel.c:1069 ../panels/privacy/privacy.ui.h:34 msgid "_Empty Trash" msgstr "清理回收筒(_E)" -#: ../panels/privacy/cc-privacy-panel.c:1026 +#: ../panels/privacy/cc-privacy-panel.c:1092 msgid "Delete all the temporary files?" msgstr "刪除所有暫存檔案？" -#: ../panels/privacy/cc-privacy-panel.c:1027 +#: ../panels/privacy/cc-privacy-panel.c:1093 msgid "All the temporary files will be permanently deleted." msgstr "所有的暫存檔案會永遠刪除。" -#: ../panels/privacy/cc-privacy-panel.c:1028 ../panels/privacy/privacy.ui.h:35 +#: ../panels/privacy/cc-privacy-panel.c:1094 ../panels/privacy/privacy.ui.h:35 msgid "_Purge Temporary Files" msgstr "清理暫存檔案(_P)" -#: ../panels/privacy/cc-privacy-panel.c:1050 ../panels/privacy/privacy.ui.h:29 +#: ../panels/privacy/cc-privacy-panel.c:1116 ../panels/privacy/privacy.ui.h:29 msgid "Purge Trash & Temporary Files" msgstr "清除回收筒與暫存檔案" -#: ../panels/privacy/cc-privacy-panel.c:1090 ../panels/privacy/privacy.ui.h:36 +#: ../panels/privacy/cc-privacy-panel.c:1156 ../panels/privacy/privacy.ui.h:36 msgid "Software Usage" msgstr "軟體使用率" -#: ../panels/privacy/cc-privacy-panel.c:1131 ../panels/privacy/privacy.ui.h:46 +#: ../panels/privacy/cc-privacy-panel.c:1197 ../panels/privacy/privacy.ui.h:46 msgid "Problem Reporting" msgstr "問題回報" #. translators: '%s' is the distributor's name, such as 'Fedora' -#: ../panels/privacy/cc-privacy-panel.c:1145 +#: ../panels/privacy/cc-privacy-panel.c:1211 #, c-format msgid "" "Sending reports of technical problems helps us improve %s. Reports are sent " @@ -4643,20 +4739,21 @@ "傳送技術問題的報告有助於我們改進 %s。報告是以匿名方式傳送，並且會消除個人資" "料。" -#: ../panels/privacy/cc-privacy-panel.c:1157 ../panels/privacy/privacy.ui.h:41 +#: ../panels/privacy/cc-privacy-panel.c:1223 ../panels/privacy/privacy.ui.h:41 msgid "Privacy Policy" msgstr "隱私權原則" -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:1 -msgid "Privacy" -msgstr "隱私" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:2 +msgid "Pri­va­cy" +msgstr "隱私權" + +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:3 msgid "Protect your personal information and control what others might see" msgstr "保護您的個人資訊並控制其他人能看到什麼" #. Translators: those are keywords for the privacy control-center panel -#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:4 +#: ../panels/privacy/gnome-privacy-panel.desktop.in.in.h:5 msgid "" "screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;" "network;identity;" @@ -4823,21 +4920,21 @@ msgid "Other" msgstr "其他" -#: ../panels/region/cc-region-panel.c:248 -#: ../panels/user-accounts/um-user-panel.c:1069 +#: ../panels/region/cc-region-panel.c:247 +#: ../panels/user-accounts/um-user-panel.c:1087 msgid "Your session needs to be restarted for changes to take effect" msgstr "您的作業階段需要重新啟動以讓變更生效" -#: ../panels/region/cc-region-panel.c:252 -#: ../panels/user-accounts/um-user-panel.c:1073 +#: ../panels/region/cc-region-panel.c:251 +#: ../panels/user-accounts/um-user-panel.c:1091 msgid "Restart Now" msgstr "立刻重新啟動" -#: ../panels/region/cc-region-panel.c:889 +#: ../panels/region/cc-region-panel.c:888 msgid "No input source selected" msgstr "尚未選擇輸入來源" -#: ../panels/region/cc-region-panel.c:1807 +#: ../panels/region/cc-region-panel.c:1779 msgid "Login _Screen" msgstr "登入畫面(_S)" @@ -4869,17 +4966,18 @@ msgid "Paper" msgstr "紙張" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:1 -msgid "Region & Language" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +msgid "Re­gion & Lan­guage" msgstr "地區和語言" -#: ../panels/region/gnome-region-panel.desktop.in.in.h:2 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:3 msgid "" "Select your display language, formats, keyboard layouts and input sources" msgstr "選擇您的顯示語言、格式、鍵盤配置和輸入來源" #. Translators: those are keywords for the region control-center panel -#: ../panels/region/gnome-region-panel.desktop.in.in.h:4 +#: ../panels/region/gnome-region-panel.desktop.in.in.h:5 msgid "Language;Layout;Keyboard;Input;" msgstr "Language;Layout;Keyboard;Input;語言;配置;鍵盤;輸入;" @@ -4936,7 +5034,7 @@ msgstr "左+右 Alt" #: ../panels/region/region.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:11 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 msgid "_Language" msgstr "語言(_L)" @@ -4984,26 +5082,11 @@ msgid "Login settings are used by all users when logging into the system" msgstr "登入設定值是所有的使用者在登入系統時會用到的" -#: ../panels/search/cc-search-locations-dialog.c:476 -msgctxt "Search Location" -msgid "Places" -msgstr "位置" - -#: ../panels/search/cc-search-locations-dialog.c:478 -msgctxt "Search Location" -msgid "Bookmarks" -msgstr "書籤" - -#: ../panels/search/cc-search-locations-dialog.c:480 -msgctxt "Search Location" -msgid "Other" -msgstr "其他" - -#: ../panels/search/cc-search-locations-dialog.c:678 +#: ../panels/search/cc-search-locations-dialog.c:634 msgid "Select Location" msgstr "選擇位置" -#: ../panels/search/cc-search-locations-dialog.c:682 +#: ../panels/search/cc-search-locations-dialog.c:638 msgid "_OK" msgstr "確定(_O)" @@ -5011,17 +5094,18 @@ msgid "No applications found" msgstr "找不到應用程式" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:1 +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details +#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 msgid "Search" msgstr "搜尋" -#: ../panels/search/gnome-search-panel.desktop.in.in.h:2 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:3 msgid "" "Control which applications show search results in the Activities Overview" msgstr "控制在活動概覽中哪些應用程式會顯示在搜尋結果中" #. Translators: those are keywords for the search control-center panel -#: ../panels/search/gnome-search-panel.desktop.in.in.h:4 +#: ../panels/search/gnome-search-panel.desktop.in.in.h:5 msgid "Search;Find;Index;Hide;Privacy;Results;" msgstr "Search;Find;Index;Hide;Privacy;Results;搜尋;尋找;索引;隱藏;隱私;結果;" @@ -5029,6 +5113,18 @@ msgid "Search Locations" msgstr "搜尋位置" +#: ../panels/search/search-locations-dialog.ui.h:2 +msgid "Places" +msgstr "位置" + +#: ../panels/search/search-locations-dialog.ui.h:3 +msgid "Bookmarks" +msgstr "書籤" + +#: ../panels/search/search-locations-dialog.ui.h:4 +msgid "Other" +msgstr "其他" + #: ../panels/search/search.ui.h:1 msgid "Move Up" msgstr "往上移" @@ -5041,6 +5137,11 @@ msgid "Preferences" msgstr "偏好設定" +#. Label +#: ../panels/sharing/cc-sharing-networks.c:303 +msgid "No networks selected for sharing" +msgstr "沒有選擇用來分享的網路" + #: ../panels/sharing/cc-sharing-panel.c:263 msgctxt "service is enabled" msgid "On" @@ -5078,35 +5179,41 @@ #: ../panels/sharing/cc-sharing-panel.c:682 #, c-format msgid "" -"Allow remote users to connect using the Secure Shell command:\n" +"When remote login is enabled, remote users can connect using the Secure " +"Shell command:\n" "ssh %s" msgstr "" -"允許遠端使用者使用 SSH 指令連線：\n" +"當啟用遠端登入時，遠端使用者可以使用 SSH 指令連線：\n" "ssh %s" #: ../panels/sharing/cc-sharing-panel.c:684 #, c-format msgid "" -"Allow remote users to view or control your screen by connecting to: vnc://%s" +"Screen sharing allows remote users to view or control your screen by " +"connecting to vnc://%s" msgstr "" -"允許遠端使用者連線到：vnc://%s 檢視或控制您的螢幕" +"螢幕分享允許遠端使用者連線到 vnc://%s 檢視或控制您的" +"螢幕" #: ../panels/sharing/cc-sharing-panel.c:796 msgid "Copy" msgstr "複製" #: ../panels/sharing/cc-sharing-panel.c:1122 -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:1 msgid "Sharing" msgstr "分享" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:2 +msgid "Sha­ring" +msgstr "分享" + +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:3 msgid "Control what you want to share with others" msgstr "控制您想要與其他人分享什麼" #. Translators: those are keywords for the sharing control-center panel -#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:4 +#: ../panels/sharing/gnome-sharing-panel.desktop.in.in.h:5 msgid "" "share;sharing;ssh;host;name;remote;desktop;media;audio;video;pictures;photos;" "movies;server;renderer;" @@ -5115,6 +5222,10 @@ "movies;server;renderer;分享;主機;名稱;遠端;桌面;媒體;音效;影片;圖片;相片;伺服" "器;" +#: ../panels/sharing/networks.ui.h:1 +msgid "Networks" +msgstr "網路" + #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1 msgid "Enable or disable remote login" msgstr "啟用或停用遠端登入" @@ -5123,25 +5234,13 @@ msgid "Authentication is required to enable or disable remote login" msgstr "啟用或停用遠端登入需要核對" -#. Label -#: ../panels/sharing/cc-sharing-networks.c:303 -msgid "No networks selected for sharing" -msgstr "沒有選擇用來分享的網路" - -#. -#. * vim: sw=2 ts=8 cindent noai bs=2 -#. -#: ../panels/sharing/networks.ui.h:1 -msgid "Networks" -msgstr "網路" - #: ../panels/sharing/sharing.ui.h:1 msgid "_Computer Name" msgstr "電腦名稱(_C)" #: ../panels/sharing/sharing.ui.h:2 -msgid "_Personal File Sharing" -msgstr "個人檔案分享(_P)" +msgid "_File Sharing" +msgstr "檔案分享(_F)" #: ../panels/sharing/sharing.ui.h:3 msgid "_Screen Sharing" @@ -5160,8 +5259,8 @@ msgstr "由於沒有網路存取，某些服務已停用。" #: ../panels/sharing/sharing.ui.h:7 -msgid "Personal File Sharing" -msgstr "個人檔案分享" +msgid "File Sharing" +msgstr "檔案分享" #: ../panels/sharing/sharing.ui.h:8 msgid "_Require Password" @@ -5176,8 +5275,8 @@ msgstr "螢幕分享" #: ../panels/sharing/sharing.ui.h:12 -msgid "_Allow Remote Control" -msgstr "允許遙控(_A)" +msgid "_Allow connections to control the screen" +msgstr "允許連線控制螢幕(_A)" #: ../panels/sharing/sharing.ui.h:13 msgid "_Password:" @@ -5204,9 +5303,8 @@ msgstr "媒體分享" #: ../panels/sharing/sharing.ui.h:19 -msgid "" -"Media sharing allows you to share music, photos and videos over the network." -msgstr "媒體分享允許您透過網路分享音樂、相片和影片。" +msgid "Share music, photos and videos over the network." +msgstr "透過網路分享音樂、相片和影片。" #: ../panels/sharing/sharing.ui.h:20 msgid "Folders" @@ -5336,11 +5434,6 @@ msgid "Peak detect" msgstr "峰值檢測" -#: ../panels/sound/gvc-mixer-dialog.c:1493 -#: ../panels/sound/gvc-sound-theme-chooser.c:564 -msgid "Name" -msgstr "名稱" - #: ../panels/sound/gvc-mixer-dialog.c:1512 msgid "Device" msgstr "裝置" @@ -5435,16 +5528,21 @@ msgid "Subwoofer" msgstr "重低音" -#: ../panels/sound/sound-theme-file-utils.c:290 +#: ../panels/sound/sound-theme-file-utils.c:304 msgid "Custom" msgstr "自訂" +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:2 +msgid "Uni­ver­sal Access" +msgstr "無障礙功能" + +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:3 msgid "Make it easier to see, hear, type, point and click" msgstr "讓電腦更容易看、聽、輸入、指向與點選" #. Translators: those are keywords for the universal access control-center panel -#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:4 +#: ../panels/universal-access/gnome-universal-access-panel.desktop.in.in.h:5 msgid "" "Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen;Reader;text;font;size;" "AccessX;Sticky;Keys;Slow;Bounce;Mouse;" @@ -5543,7 +5641,7 @@ msgstr "聲音按鍵" #: ../panels/universal-access/uap.ui.h:25 -msgid "Beep when Num Lock or Caps Lock are turned on." +msgid "Beep when Num Lock or Caps Lock are turned on or off." msgstr "當 Num Lock 或 Caps Lock 開啟時發出聲響。" #: ../panels/universal-access/uap.ui.h:26 @@ -5925,93 +6023,66 @@ msgstr "顏色效果" #: ../panels/user-accounts/data/account-dialog.ui.h:1 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 -#: ../panels/user-accounts/um-account-type.c:34 -msgctxt "Account type" +#: ../panels/user-accounts/data/join-dialog.ui.h:1 +msgid "Add User" +msgstr "加入使用者" + +#: ../panels/user-accounts/data/account-dialog.ui.h:5 +msgid "_Full Name" +msgstr "全名(_F)" + +#: ../panels/user-accounts/data/account-dialog.ui.h:6 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 msgid "Standard" msgstr "標準" -#: ../panels/user-accounts/data/account-dialog.ui.h:2 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:2 -#: ../panels/user-accounts/um-account-type.c:36 -msgctxt "Account type" +#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 msgid "Administrator" msgstr "管理員" -#: ../panels/user-accounts/data/account-dialog.ui.h:4 -msgid "_Full Name" -msgstr "全名(_F)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:5 -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:5 +#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 msgid "Account _Type" msgstr "帳號類型(_T)" -#: ../panels/user-accounts/data/account-dialog.ui.h:7 +#: ../panels/user-accounts/data/account-dialog.ui.h:10 msgid "Allow user to set a password when they next _login" msgstr "允許使用者在下次登入時設定密碼(_L)" -#: ../panels/user-accounts/data/account-dialog.ui.h:8 +#: ../panels/user-accounts/data/account-dialog.ui.h:11 msgid "Set a password _now" msgstr "立刻設定密碼(_N)" -#: ../panels/user-accounts/data/account-dialog.ui.h:10 -msgid "_Verify" -msgstr "驗證(_V)" +#: ../panels/user-accounts/data/account-dialog.ui.h:13 +msgid "_Confirm" +msgstr "確認(_C)" -#: ../panels/user-accounts/data/account-dialog.ui.h:11 +#: ../panels/user-accounts/data/account-dialog.ui.h:14 msgid "" "Enterprise login allows an existing centrally managed user account to be " -"used on this device." -msgstr "企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。" - -#: ../panels/user-accounts/data/account-dialog.ui.h:12 -msgid "_Domain" -msgstr "網域(_O)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:13 -msgid "" -"Go online to add\n" -"enterprise login accounts." +"used on this device. You can also use this account to access company " +"resources on the internet." msgstr "" -"請上線以加入\n" -"企業登入帳號。" +"企業登入允許現有的集中管理式使用者帳號能用在這個裝置上。您也可以使用這個帳號" +"來存取網際網路上的公司資源。" #: ../panels/user-accounts/data/account-dialog.ui.h:15 -msgid "_Enterprise Login" -msgstr "企業登入(_E)" +#: ../panels/user-accounts/data/join-dialog.ui.h:9 +msgid "_Domain" +msgstr "網域(_O)" #: ../panels/user-accounts/data/account-dialog.ui.h:16 -#: ../panels/user-accounts/um-account-dialog.c:1466 -msgid "Add User" -msgstr "加入使用者" - -#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. -#: ../panels/user-accounts/data/account-dialog.ui.h:19 -msgid "_Enroll" -msgstr "登錄(_E)" - -#: ../panels/user-accounts/data/account-dialog.ui.h:20 -msgid "Domain Administrator Login" -msgstr "網域管理員登入" - -#: ../panels/user-accounts/data/account-dialog.ui.h:21 -msgid "" -"In order to use enterprise logins, this computer needs to be\n" -"enrolled in the domain. Please have your network administrator\n" -"type their domain password here." -msgstr "" -"為了使用企業登入，這個電腦需要\n" -"加入網域。請網路管理員在這裡\n" -"輸入網域密碼。" +msgid "You are Offline" +msgstr "您已離線" -#: ../panels/user-accounts/data/account-dialog.ui.h:24 -msgid "Administrator _Name" -msgstr "管理員名稱(_N)" +#: ../panels/user-accounts/data/account-dialog.ui.h:17 +msgid "You must be online in order to add enterprise users." +msgstr "請上線以加入企業登入使用者。" -#: ../panels/user-accounts/data/account-dialog.ui.h:25 -msgid "Administrator Password" -msgstr "管理員密碼" +#: ../panels/user-accounts/data/account-dialog.ui.h:18 +msgid "_Enterprise Login" +msgstr "企業登入(_E)" #: ../panels/user-accounts/data/account-fingerprint.ui.h:1 msgid "Left thumb" @@ -6046,7 +6117,7 @@ msgstr "右手小指" #: ../panels/user-accounts/data/account-fingerprint.ui.h:9 -#: ../panels/user-accounts/um-fingerprint-dialog.c:686 +#: ../panels/user-accounts/um-fingerprint-dialog.c:687 msgid "Enable Fingerprint Login" msgstr "啟用指紋登入" @@ -6083,9 +6154,32 @@ "Login;Name;Fingerprint;Avatar;Logo;Face;Password;登入;姓名;指紋;大頭貼;標誌;" "臉;密碼;" -#: ../panels/user-accounts/data/history-dialog.ui.h:1 -msgid "Login History" -msgstr "登入歷史紀錄" +#. Translators: This button enrolls the computer in the domain in order to use enterprise logins. +#: ../panels/user-accounts/data/join-dialog.ui.h:4 +msgid "_Enroll" +msgstr "登錄(_E)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:5 +msgid "Domain Administrator Login" +msgstr "網域管理員登入" + +#: ../panels/user-accounts/data/join-dialog.ui.h:6 +msgid "" +"In order to use enterprise logins, this computer needs to be\n" +"enrolled in the domain. Please have your network administrator\n" +"type their domain password here." +msgstr "" +"為了使用企業登入，這個電腦需要\n" +"加入網域。請網路管理員在這裡\n" +"輸入網域密碼。" + +#: ../panels/user-accounts/data/join-dialog.ui.h:10 +msgid "Administrator _Name" +msgstr "管理員名稱(_N)" + +#: ../panels/user-accounts/data/join-dialog.ui.h:11 +msgid "Administrator Password" +msgstr "管理員密碼" #: ../panels/user-accounts/data/password-dialog.ui.h:1 msgid "Change Password" @@ -6108,38 +6202,30 @@ msgstr "目前的密碼(_P)" #: ../panels/user-accounts/data/password-dialog.ui.h:7 -msgid "Allow user to set a password when they next login" -msgstr "允許使用者在下次登入時選擇密碼" +msgid "Allow user to change their password on next login" +msgstr "允許使用者在下次登入時改變他們的密碼" #: ../panels/user-accounts/data/password-dialog.ui.h:8 msgid "Set a password now" msgstr "立刻設定密碼" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:3 -msgid "Add User Account" -msgstr "加入使用者帳號" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:4 -msgid "Remove User Account" -msgstr "移除使用者帳號" +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:1 +msgid "_Add User…" +msgstr "加入使用者(_A)…" #: ../panels/user-accounts/data/user-accounts-dialog.ui.h:6 -msgid "Login Options" -msgstr "登入選項" - -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "A_utomatic Login" msgstr "自動登入(_U)：" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:9 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:7 msgid "_Fingerprint Login" msgstr "指紋登入(_F)" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:8 msgid "User Icon" msgstr "使用者圖示" -#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:12 +#: ../panels/user-accounts/data/user-accounts-dialog.ui.h:10 msgid "Last Login" msgstr "上次登入" @@ -6240,8 +6326,8 @@ #: ../panels/user-accounts/pw-utils.c:117 msgctxt "Password hint" -msgid "Mix uppercase and lowercase and use a number or two." -msgstr "混合大寫與小寫字元並使用一到兩個數字。" +msgid "Mix uppercase and lowercase and try to use a number or two." +msgstr "混合大寫與小寫字元並嘗試使用一到兩個數字。" #: ../panels/user-accounts/pw-utils.c:119 msgctxt "Password hint" @@ -6330,32 +6416,32 @@ msgstr "不明的錯誤" #: ../panels/user-accounts/um-account-dialog.c:34 -msgid "Should match the web address of your account provider." -msgstr "應符合您帳號提供者的網路位址。" +msgid "Should match the web address of your login provider." +msgstr "應符合您的登入提供者的網路位址。" #: ../panels/user-accounts/um-account-dialog.c:228 msgid "Failed to add account" msgstr "無法加入到帳號" -#: ../panels/user-accounts/um-account-dialog.c:452 +#: ../panels/user-accounts/um-account-dialog.c:448 msgid "Passwords do not match." msgstr "密碼不相符。" -#: ../panels/user-accounts/um-account-dialog.c:733 -#: ../panels/user-accounts/um-account-dialog.c:779 -#: ../panels/user-accounts/um-account-dialog.c:800 +#: ../panels/user-accounts/um-account-dialog.c:702 +#: ../panels/user-accounts/um-account-dialog.c:748 +#: ../panels/user-accounts/um-account-dialog.c:769 msgid "Failed to register account" msgstr "無法註冊帳號" -#: ../panels/user-accounts/um-account-dialog.c:923 +#: ../panels/user-accounts/um-account-dialog.c:892 msgid "No supported way to authenticate with this domain" msgstr "沒有支援這個網域核對的方式" -#: ../panels/user-accounts/um-account-dialog.c:982 +#: ../panels/user-accounts/um-account-dialog.c:965 msgid "Failed to join domain" msgstr "無法加入網域" -#: ../panels/user-accounts/um-account-dialog.c:1043 +#: ../panels/user-accounts/um-account-dialog.c:1026 msgid "" "That login name didn't work.\n" "Please try again." @@ -6363,7 +6449,7 @@ "登入名稱沒有用。\n" "請再試一次。" -#: ../panels/user-accounts/um-account-dialog.c:1050 +#: ../panels/user-accounts/um-account-dialog.c:1033 msgid "" "That login password didn't work.\n" "Please try again." @@ -6371,14 +6457,24 @@ "登入密碼沒有用。\n" "請再試一次。" -#: ../panels/user-accounts/um-account-dialog.c:1058 +#: ../panels/user-accounts/um-account-dialog.c:1041 msgid "Failed to log into domain" msgstr "無法登入到網域" -#: ../panels/user-accounts/um-account-dialog.c:1116 +#: ../panels/user-accounts/um-account-dialog.c:1099 msgid "Unable find the domain. Maybe you misspelled it?" msgstr "找不到網域。也許您拼錯字了？" +#: ../panels/user-accounts/um-account-type.c:34 +msgctxt "Account type" +msgid "Standard" +msgstr "標準" + +#: ../panels/user-accounts/um-account-type.c:36 +msgctxt "Account type" +msgid "Administrator" +msgstr "管理員" + #: ../panels/user-accounts/um-fingerprint-dialog.c:138 msgid "" "You are not allowed to access the device. Contact your system administrator." @@ -6396,29 +6492,29 @@ msgid "Enabled" msgstr "已啟用" -#: ../panels/user-accounts/um-fingerprint-dialog.c:263 +#: ../panels/user-accounts/um-fingerprint-dialog.c:264 msgid "Delete registered fingerprints?" msgstr "是否刪除已註冊的指紋？" -#: ../panels/user-accounts/um-fingerprint-dialog.c:267 +#: ../panels/user-accounts/um-fingerprint-dialog.c:268 msgid "_Delete Fingerprints" msgstr "刪除指紋(_D)" -#: ../panels/user-accounts/um-fingerprint-dialog.c:273 +#: ../panels/user-accounts/um-fingerprint-dialog.c:274 msgid "" "Do you want to delete your registered fingerprints so fingerprint login is " "disabled?" msgstr "您確定要刪除已註冊的指紋嗎？這麼一來將會停用指紋登入。" -#: ../panels/user-accounts/um-fingerprint-dialog.c:443 +#: ../panels/user-accounts/um-fingerprint-dialog.c:444 msgid "Done!" msgstr "完成！" #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:504 -#: ../panels/user-accounts/um-fingerprint-dialog.c:546 +#: ../panels/user-accounts/um-fingerprint-dialog.c:505 +#: ../panels/user-accounts/um-fingerprint-dialog.c:547 #, c-format msgid "Could not access '%s' device" msgstr "無法存取「%s」裝置" @@ -6426,16 +6522,16 @@ #. translators: #. * The variable is the name of the device, for example: #. * "Could you not access "Digital Persona U.are.U 4000/4000B" device -#: ../panels/user-accounts/um-fingerprint-dialog.c:587 +#: ../panels/user-accounts/um-fingerprint-dialog.c:588 #, c-format msgid "Could not start finger capture on '%s' device" msgstr "無法使用「%s」裝置上的指紋捕捉" -#: ../panels/user-accounts/um-fingerprint-dialog.c:637 +#: ../panels/user-accounts/um-fingerprint-dialog.c:638 msgid "Could not access any fingerprint readers" msgstr "無法存取任何指紋辨識器" -#: ../panels/user-accounts/um-fingerprint-dialog.c:638 +#: ../panels/user-accounts/um-fingerprint-dialog.c:639 msgid "Please contact your system administrator for help." msgstr "請連絡您的管理員來幫忙。" @@ -6444,18 +6540,18 @@ #. * "To enable fingerprint login, you need to save one of your fingerprints, using the #. * 'Digital Persona U.are.U 4000/4000B' device." #. -#: ../panels/user-accounts/um-fingerprint-dialog.c:720 +#: ../panels/user-accounts/um-fingerprint-dialog.c:721 #, c-format msgid "" "To enable fingerprint login, you need to save one of your fingerprints, " "using the '%s' device." msgstr "要啟用指紋登入，您需要使用「%s」裝置儲存您的指紋。" -#: ../panels/user-accounts/um-fingerprint-dialog.c:727 +#: ../panels/user-accounts/um-fingerprint-dialog.c:728 msgid "Selecting finger" msgstr "選擇手指" -#: ../panels/user-accounts/um-fingerprint-dialog.c:728 +#: ../panels/user-accounts/um-fingerprint-dialog.c:729 msgid "Enrolling fingerprints" msgstr "登記指紋" @@ -6509,14 +6605,21 @@ msgid "%s, %s" msgstr "%s，%s" -#: ../panels/user-accounts/um-history-dialog.c:249 +#: ../panels/user-accounts/um-history-dialog.c:250 msgid "Session Ended" msgstr "作業階段結束" -#: ../panels/user-accounts/um-history-dialog.c:255 +#: ../panels/user-accounts/um-history-dialog.c:256 msgid "Session Started" msgstr "作業階段開始" +#. Translators: This is the title of the "Account Activity" dialog. +#. The %s is the user real name. +#: ../panels/user-accounts/um-history-dialog.c:299 +#, fuzzy, c-format +msgid "%s - Account Activity" +msgstr "%s - 帳號活動" + #: ../panels/user-accounts/um-password-dialog.c:145 msgid "Please choose another password." msgstr "請選擇其他密碼。" @@ -6578,7 +6681,7 @@ msgid "Couldn't connect to the %s domain: %s" msgstr "無法連接到 %s 網域：%s" -#: ../panels/user-accounts/um-user-panel.c:237 +#: ../panels/user-accounts/um-user-panel.c:239 msgid "Other Accounts" msgstr "其他帳號" @@ -6654,15 +6757,15 @@ msgid "Logged in" msgstr "已登入" -#: ../panels/user-accounts/um-user-panel.c:1272 +#: ../panels/user-accounts/um-user-panel.c:1290 msgid "Failed to contact the accounts service" msgstr "無法連接帳號服務" -#: ../panels/user-accounts/um-user-panel.c:1274 +#: ../panels/user-accounts/um-user-panel.c:1292 msgid "Please make sure that the AccountService is installed and enabled." msgstr "請確定 AccountService 已經安裝並啟用。" -#: ../panels/user-accounts/um-user-panel.c:1315 +#: ../panels/user-accounts/um-user-panel.c:1334 msgid "" "To make changes,\n" "click the * icon first" @@ -6670,12 +6773,12 @@ "要進行變更，\n" "請先點選 * 圖示" -#: ../panels/user-accounts/um-user-panel.c:1353 +#: ../panels/user-accounts/um-user-panel.c:1374 msgid "Create a user account" msgstr "建立新的使用者帳號" -#: ../panels/user-accounts/um-user-panel.c:1364 -#: ../panels/user-accounts/um-user-panel.c:1676 +#: ../panels/user-accounts/um-user-panel.c:1385 +#: ../panels/user-accounts/um-user-panel.c:1677 msgid "" "To create a user account,\n" "click the * icon first" @@ -6683,12 +6786,12 @@ "要建立使用者帳號，\n" "請先點選 * 圖示" -#: ../panels/user-accounts/um-user-panel.c:1374 +#: ../panels/user-accounts/um-user-panel.c:1395 msgid "Delete the selected user account" msgstr "刪除選取的使用者帳號" -#: ../panels/user-accounts/um-user-panel.c:1386 -#: ../panels/user-accounts/um-user-panel.c:1681 +#: ../panels/user-accounts/um-user-panel.c:1407 +#: ../panels/user-accounts/um-user-panel.c:1682 msgid "" "To delete the selected user account,\n" "click the * icon first" @@ -6696,33 +6799,32 @@ "要刪除選取的使用者帳號，\n" "請先點選 * 圖示" -#: ../panels/user-accounts/um-user-panel.c:1590 +#: ../panels/user-accounts/um-user-panel.c:1591 msgid "My Account" msgstr "我的帳號" #: ../panels/user-accounts/um-utils.c:563 -#, c-format -msgid "A user with the username '%s' already exists." -msgstr "以「%s」為名的使用者已經存在。" +msgid "Sorry, that user name isn't available. Please try another." +msgstr "抱敟，使用者名稱無法使用。請嘗試另一個。" -#: ../panels/user-accounts/um-utils.c:567 +#: ../panels/user-accounts/um-utils.c:566 #, c-format msgid "The username is too long." msgstr "使用者名稱太長。" -#: ../panels/user-accounts/um-utils.c:570 +#: ../panels/user-accounts/um-utils.c:569 msgid "The username cannot start with a '-'." msgstr "使用者名稱不能以「-」字元開頭。" -#: ../panels/user-accounts/um-utils.c:573 +#: ../panels/user-accounts/um-utils.c:572 msgid "" -"The username should only consist of lower and upper case letters from a-z, " -"digits and any of characters '.', '-' and '_'." +"The username should only consist of upper and lower case letters from a-z, " +"digits and the following characters: . - _" msgstr "" -"使用者名稱只能由大小寫字母英文字母 a 到 z、數字，與其他字元如「.」、「-」和" -"「_」構成。" +"使用者名稱只能由大小寫字母英文字母 a 到 z、數字，與其他字元：「.」、「-」、" +"「_」。" -#: ../panels/user-accounts/um-utils.c:577 +#: ../panels/user-accounts/um-utils.c:576 msgid "This will be used to name your home folder and can't be changed." msgstr "這會成為您家目錄資料夾的名稱，並且不能被改變。" @@ -6809,17 +6911,17 @@ msgid "Button" msgstr "按鈕" -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:1 -#: ../panels/wacom/gnome-wacom-properties.ui.h:9 -msgid "Wacom Tablet" -msgstr "Wacom 繪圖板" - +#. Translators: Add soft hyphens to your translations so that the icon view won't clip your translations. See https://bugzilla.gnome.org/show_bug.cgi?id=647087#c13 for details #: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:2 +msgid "Wa­com Tab­let" +msgstr "Wa-com 繪圖板" + +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:3 msgid "Set button mappings and adjust stylus sensitivity for graphics tablets" msgstr "設定繪圖板的按鈕對映與調整觸控筆的靈敏度" #. Translators: those are keywords for the wacom tablet control-center panel -#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:4 +#: ../panels/wacom/gnome-wacom-panel.desktop.in.in.h:5 msgid "Tablet;Wacom;Stylus;Eraser;Mouse;" msgstr "Tablet;Wacom;Stylus;Eraser;Mouse;繪圖板;橡皮擦;滑鼠;" @@ -6851,6 +6953,10 @@ msgid "Bluetooth Settings" msgstr "藍牙設定值" +#: ../panels/wacom/gnome-wacom-properties.ui.h:9 +msgid "Wacom Tablet" +msgstr "Wacom 繪圖板" + #: ../panels/wacom/gnome-wacom-properties.ui.h:10 msgid "Map to Monitor…" msgstr "對應至顯示器..." @@ -7036,6 +7142,11 @@ msgid "Tip Pressure Feel" msgstr "點選壓力感應" +#: ../shell/alt/cc-window.c:765 ../shell/cc-window.c:53 +#: ../shell/cc-window.c:1478 +msgid "All Settings" +msgstr "所有設定值" + #: ../shell/appdata/gnome-control-center.appdata.xml.in.h:1 msgid "GNOME Control Center" msgstr "GNOME 控制中心" @@ -7090,22 +7201,18 @@ msgid "Quit" msgstr "結束" -#: ../shell/cc-window.c:61 ../shell/cc-window.c:1495 -msgid "All Settings" -msgstr "所有設定值" - #. Add categories -#: ../shell/cc-window.c:881 +#: ../shell/cc-window.c:871 msgctxt "category" msgid "Personal" msgstr "個人" -#: ../shell/cc-window.c:882 +#: ../shell/cc-window.c:872 msgctxt "category" msgid "Hardware" msgstr "硬體" -#: ../shell/cc-window.c:883 +#: ../shell/cc-window.c:873 msgctxt "category" msgid "System" msgstr "系統" @@ -7144,6 +7251,177 @@ msgid "Cancel search" msgstr "取消搜尋" +#. translators: This is the default hotspot name, need to be less than 32-bytes +#: ../shell/hostname-helper.c:189 +msgctxt "hotspot" +msgid "Hotspot" +msgstr "熱點" + +#~ msgid "_Name:" +#~ msgstr "名稱(_N)：" + +#~ msgid "Add Shortcut" +#~ msgstr "加入捷徑鍵" + +#~ msgid "Remove Shortcut" +#~ msgstr "移除捷徑鍵" + +#~ msgid "" +#~ "To edit a shortcut, click the row and hold down the new keys or press " +#~ "Backspace to clear." +#~ msgstr "" +#~ "要編輯捷徑鍵，點選相應的列並按下新的按鍵組合，或以 Backspace 鍵來清除。" + +#~ msgid "" +#~ msgstr "<行動設定不詳>" + +#~ msgid "" +#~ "The shortcut \"%s\" cannot be used because it will become impossible to " +#~ "type using this key.\n" +#~ "Please try with a key such as Control, Alt or Shift at the same time." +#~ msgstr "" +#~ "捷徑「%s」無法使用，原因是會無法按下此按鍵。\n" +#~ "請試用其它的按鍵：如同時使用 Control，Alt 或 Shift。" + +#~ msgid "" +#~ "The shortcut \"%s\" is already used for\n" +#~ "\"%s\"" +#~ msgstr "" +#~ "捷徑鍵「%s」己經使用於：\n" +#~ "「%s」" + +#~ msgid "" +#~ "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be " +#~ "disabled." +#~ msgstr "如果您重新指派捷徑鍵為「%s」，「%s」的捷徑鍵就會停用。" + +#~ msgid "_Reassign" +#~ msgstr "重新指派(_R)" + +#~ msgid "" +#~ "The \"%s\" shortcut has an associated \"%s\" shortcut. Do you want to " +#~ "automatically set it to \"%s\"?" +#~ msgstr "捷徑鍵「%s」已指派「%s」捷徑。您想要自動將它設定為「%s」嗎？" + +#~ msgid "" +#~ "\"%s\" is currently associated with \"%s\", this shortcut will be " +#~ "disabled if you move forward." +#~ msgstr "「%s」目前指派為「%s」，如果您繼續這個捷徑鍵就會停用。" + +#~ msgid "_Assign" +#~ msgstr "指派(_R)" + +#~ msgid "Error logging into the account" +#~ msgstr "登入帳號時發生錯誤" + +#~ msgid "Credentials have expired." +#~ msgstr "憑證已經過期。" + +#~ msgid "Sign in to enable this account." +#~ msgstr "登入以啟用這個帳號。" + +#~ msgid "_Sign In" +#~ msgstr "登入(_S)" + +#~ msgid "Login History" +#~ msgstr "登入歷史紀錄" + +#~ msgid "Add User Account" +#~ msgstr "加入使用者帳號" + +#~ msgid "Remove User Account" +#~ msgstr "移除使用者帳號" + +#~ msgid "Color" +#~ msgstr "顏色" + +#~ msgid "Bond" +#~ msgstr "繫結" + +#~ msgid "Team" +#~ msgstr "團隊" + +#~ msgid "Bridge" +#~ msgstr "橋接" + +#~ msgid "VLAN" +#~ msgstr "VLAN" + +#~ msgid "Could not load VPN plugins" +#~ msgstr "無法載入 VPN 外掛程式" + +#~ msgid "Add Network Connection" +#~ msgstr "加入網路連線" + +#~ msgid "Bond slaves" +#~ msgstr "繫結的連線" + +#~ msgid "(none)" +#~ msgstr "(沒有)" + +#~ msgid "Bridge slaves" +#~ msgstr "橋接的連線" + +#~ msgid "Team slaves" +#~ msgstr "團隊從屬" + +#~ msgid "InfiniBand device does not support connected mode" +#~ msgstr "InfiniBand 裝置不支援已連接模式" + +#~ msgid "No Certificate Authority certificate chosen" +#~ msgstr "未選擇任何憑證授權單位(CA)憑證" + +#~ msgid "" +#~ "Not using a Certificate Authority (CA) certificate can result in " +#~ "connections to insecure, rogue Wi-Fi networks. Would you like to choose " +#~ "a Certificate Authority certificate?" +#~ msgstr "" +#~ "不使用憑證中心 (CA) 的憑證會造成連線不安全、流氓 Wi-Fi 網路。是否要選擇一" +#~ "個憑證中心的憑證？" + +#~ msgid "Ignore" +#~ msgstr "忽略" + +#~ msgid "Choose CA Certificate" +#~ msgstr "選擇 CA 憑證" + +#~ msgid "As_k for this password every time" +#~ msgstr "每次都詢問密碼(_K)" + +#~ msgid "Don't _warn me again" +#~ msgstr "不要再警告我(_W)" + +#~ msgid "No" +#~ msgstr "否" + +#~ msgid "Yes" +#~ msgstr "是" + +#~ msgid "Power" +#~ msgstr "電源" + +#~ msgid "Privacy" +#~ msgstr "隱私" + +#~ msgctxt "Search Location" +#~ msgid "Other" +#~ msgstr "其他" + +#~ msgid "Personal File Sharing" +#~ msgstr "個人檔案分享" + +#~ msgid "_Allow Remote Control" +#~ msgstr "允許遙控(_A)" + +#~ msgid "_Verify" +#~ msgstr "驗證(_V)" + +#~ msgid "Login Options" +#~ msgstr "登入選項" + +#~ msgid "A user with the username '%s' already exists." +#~ msgstr "以「%s」為名的使用者已經存在。" + #~ msgid "Used to determine your geographical location" #~ msgstr "用來判斷您所在的地理位置" @@ -7153,11 +7431,6 @@ #~ msgid "Time _Zone" #~ msgstr "時區(_Z)" -#, fuzzy -#~| msgid "Two _finger scroll" -#~ msgid "Two Finger Scrolling" -#~ msgstr "兩指捲動(_F)" - #~ msgid "Active Jobs" #~ msgstr "使用中的工作" @@ -7231,9 +7504,6 @@ #~ msgid "S_peed:" #~ msgstr "速度(_P)：" -#~ msgid "Shortcuts" -#~ msgstr "捷徑鍵" - #~ msgid "Test Your Settings" #~ msgstr "測試您的設定值" @@ -7635,9 +7905,6 @@ #~ msgid "Show Status When _Inactive" #~ msgstr "當不活動後顯示狀態(_I)" -#~ msgid "_Confirm Password" -#~ msgstr "確認密碼(_C)" - #~ msgid "_Login Name" #~ msgstr "登入名稱(_L)" @@ -7660,9 +7927,6 @@ #~ msgid "Domain not found." #~ msgstr "找不到網域。" -#~ msgid "Wrong password" -#~ msgstr "錯誤的密碼" - #~ msgctxt "Password hint" #~ msgid "Try to add more characters." #~ msgstr "試著加入更多字元。" diff -Nru gnome-control-center-3.20.2/po/zu.po gnome-control-center-3.22.1/po/zu.po --- gnome-control-center-3.20.2/po/zu.po 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/po/zu.po 2016-08-12 12:43:57.000000000 +0000 @@ -12,6 +12,7 @@ "PO-Revision-Date: 2004-12-13 19:02+0200\n" "Last-Translator: Zuza Software Foundation \n" "Language-Team: Zulu \n" +"Language: zu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru gnome-control-center-3.20.2/search-provider/Makefile.am gnome-control-center-3.22.1/search-provider/Makefile.am --- gnome-control-center-3.20.2/search-provider/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/search-provider/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ - -DCC_PANEL_LOADER_NO_GTYPES \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ -I$(top_srcdir)/panels/common/ \ @@ -26,8 +25,6 @@ gnome_control_center_search_provider_SOURCES = \ $(BUILT_SOURCES) \ - $(top_srcdir)/shell/cc-panel-loader.c \ - $(top_srcdir)/shell/cc-panel-loader.h \ control-center-search-provider.c \ control-center-search-provider.h \ cc-search-provider.c \ @@ -35,7 +32,8 @@ gnome_control_center_search_provider_LDADD = \ $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/shell/libshell.la \ + $(top_builddir)/shell/libshell.la \ + $(top_builddir)/shell/libpanel_loader.la \ $(SHELL_LIBS) CLEANFILES = $(BUILT_SOURCES) $(service_DATA) diff -Nru gnome-control-center-3.20.2/search-provider/Makefile.in gnome-control-center-3.22.1/search-provider/Makefile.in --- gnome-control-center-3.20.2/search-provider/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/search-provider/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -111,7 +111,6 @@ am__objects_1 = cc-shell-search-provider-generated.$(OBJEXT) am__objects_2 = $(am__objects_1) am_gnome_control_center_search_provider_OBJECTS = $(am__objects_2) \ - cc-panel-loader.$(OBJEXT) \ control-center-search-provider.$(OBJEXT) \ cc-search-provider.$(OBJEXT) gnome_control_center_search_provider_OBJECTS = \ @@ -119,7 +118,8 @@ am__DEPENDENCIES_1 = gnome_control_center_search_provider_DEPENDENCIES = \ $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/shell/libshell.la $(am__DEPENDENCIES_1) + $(top_builddir)/shell/libshell.la \ + $(top_builddir)/shell/libpanel_loader.la $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -321,8 +321,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -455,7 +453,6 @@ AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ - -DCC_PANEL_LOADER_NO_GTYPES \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ -I$(top_srcdir)/panels/common/ \ @@ -464,8 +461,6 @@ BUILT_SOURCES = $(dbus_shell_search_provider_built_sources) gnome_control_center_search_provider_SOURCES = \ $(BUILT_SOURCES) \ - $(top_srcdir)/shell/cc-panel-loader.c \ - $(top_srcdir)/shell/cc-panel-loader.h \ control-center-search-provider.c \ control-center-search-provider.h \ cc-search-provider.c \ @@ -473,7 +468,8 @@ gnome_control_center_search_provider_LDADD = \ $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/shell/libshell.la \ + $(top_builddir)/shell/libshell.la \ + $(top_builddir)/shell/libpanel_loader.la \ $(SHELL_LIBS) CLEANFILES = $(BUILT_SOURCES) $(service_DATA) @@ -579,46 +575,34 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-panel-loader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-search-provider.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-shell-search-provider-generated.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/control-center-search-provider.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -cc-panel-loader.o: $(top_srcdir)/shell/cc-panel-loader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cc-panel-loader.o -MD -MP -MF $(DEPDIR)/cc-panel-loader.Tpo -c -o cc-panel-loader.o `test -f '$(top_srcdir)/shell/cc-panel-loader.c' || echo '$(srcdir)/'`$(top_srcdir)/shell/cc-panel-loader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cc-panel-loader.Tpo $(DEPDIR)/cc-panel-loader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/shell/cc-panel-loader.c' object='cc-panel-loader.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cc-panel-loader.o `test -f '$(top_srcdir)/shell/cc-panel-loader.c' || echo '$(srcdir)/'`$(top_srcdir)/shell/cc-panel-loader.c - -cc-panel-loader.obj: $(top_srcdir)/shell/cc-panel-loader.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cc-panel-loader.obj -MD -MP -MF $(DEPDIR)/cc-panel-loader.Tpo -c -o cc-panel-loader.obj `if test -f '$(top_srcdir)/shell/cc-panel-loader.c'; then $(CYGPATH_W) '$(top_srcdir)/shell/cc-panel-loader.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shell/cc-panel-loader.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/cc-panel-loader.Tpo $(DEPDIR)/cc-panel-loader.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/shell/cc-panel-loader.c' object='cc-panel-loader.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cc-panel-loader.obj `if test -f '$(top_srcdir)/shell/cc-panel-loader.c'; then $(CYGPATH_W) '$(top_srcdir)/shell/cc-panel-loader.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shell/cc-panel-loader.c'; fi` - mostlyclean-libtool: -rm -f *.lo diff -Nru gnome-control-center-3.20.2/shell/alt/cc-panel-list.c gnome-control-center-3.22.1/shell/alt/cc-panel-list.c --- gnome-control-center-3.20.2/shell/alt/cc-panel-list.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/cc-panel-list.c 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,841 @@ +/* cc-panel-list.c + * + * Copyright (C) 2016 Endless, Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Georges Basile Stavracas Neto + */ + +#include "cc-panel-list.h" +#include "cc-util.h" + +typedef struct +{ + GtkWidget *row; + GtkWidget *description_label; + CcPanelCategory category; + gchar *id; + gchar *name; + gchar *description; +} RowData; + +struct _CcPanelList +{ + GtkStack parent; + + GtkWidget *details_listbox; + GtkWidget *devices_listbox; + GtkWidget *main_listbox; + GtkWidget *search_listbox; + + GtkListBoxRow *details_row; + GtkListBoxRow *devices_row; + + GtkWidget *empty_search_placeholder; + + gchar *search_query; + + CcPanelListView previous_view; + CcPanelListView view; + GHashTable *id_to_data; +}; + +G_DEFINE_TYPE (CcPanelList, cc_panel_list, GTK_TYPE_STACK) + +enum +{ + PROP_0, + PROP_SEARCH_MODE, + PROP_SEARCH_QUERY, + PROP_VIEW, + N_PROPS +}; + +enum +{ + SHOW_PANEL, + LAST_SIGNAL +}; + +static GParamSpec *properties [N_PROPS] = { NULL, }; +static gint signals [LAST_SIGNAL] = { 0, }; + +/* + * Auxiliary methods + */ +static GtkWidget* +get_listbox_from_view (CcPanelList *self, + CcPanelListView view) +{ + switch (view) + { + case CC_PANEL_LIST_MAIN: + return self->main_listbox; + + case CC_PANEL_LIST_DETAILS: + return self->details_listbox; + + case CC_PANEL_LIST_DEVICES: + return self->devices_listbox; + + case CC_PANEL_LIST_SEARCH: + return self->search_listbox; + + default: + return NULL; + } +} + +static CcPanelListView +get_view_from_listbox (CcPanelList *self, + GtkWidget *listbox) +{ + if (listbox == self->main_listbox) + return CC_PANEL_LIST_MAIN; + + if (listbox == self->details_listbox) + return CC_PANEL_LIST_DETAILS; + + if (listbox == self->devices_listbox) + return CC_PANEL_LIST_DEVICES; + + return CC_PANEL_LIST_SEARCH; +} + +static void +update_search (CcPanelList *self) +{ + /* + * Only change to the search view is there's a + * search query available. + */ + if (self->search_query && + g_utf8_strlen (self->search_query, -1) > 0) + { + if (self->view == CC_PANEL_LIST_MAIN) + cc_panel_list_set_view (self, CC_PANEL_LIST_SEARCH); + } + else + { + if (self->view == CC_PANEL_LIST_SEARCH) + cc_panel_list_set_view (self, self->previous_view); + } + + gtk_list_box_invalidate_filter (GTK_LIST_BOX (self->search_listbox)); + gtk_list_box_unselect_all (GTK_LIST_BOX (self->search_listbox)); +} + +/* + * RowData functions + */ +static void +row_data_free (RowData *data) +{ + g_free (data->description); + g_free (data->name); + g_free (data); +} + +static RowData* +row_data_new (CcPanelCategory category, + const gchar *id, + const gchar *name, + const gchar *description, + const gchar *icon) +{ + GtkWidget *label, *grid, *image; + RowData *data; + + data = g_new0 (RowData, 1); + data->category = category; + data->row = gtk_list_box_row_new (); + data->id = g_strdup (id); + data->name = g_strdup (name); + data->description = g_strdup (description); + + /* Setup the row */ + grid = g_object_new (GTK_TYPE_GRID, + "visible", TRUE, + "hexpand", TRUE, + "border-width", 12, + "column-spacing", 12, + NULL); + + /* Icon */ + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON); + gtk_style_context_add_class (gtk_widget_get_style_context (image), "dim-label"); + + gtk_grid_attach (GTK_GRID (grid), image, 0, 0, 1, 1); + + gtk_widget_show (image); + + /* Name label */ + label = g_object_new (GTK_TYPE_LABEL, + "label", name, + "visible", TRUE, + "xalign", 0.0, + "hexpand", TRUE, + NULL); + gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1); + + /* Description label */ + label = g_object_new (GTK_TYPE_LABEL, + "label", description, + "visible", FALSE, + "xalign", 0.0, + "hexpand", TRUE, + NULL); + gtk_label_set_max_width_chars (GTK_LABEL (label), 25); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + + gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); + gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1); + + data->description_label = label; + + gtk_container_add (GTK_CONTAINER (data->row), grid); + gtk_widget_show (data->row); + + g_object_set_data_full (G_OBJECT (data->row), "data", data, (GDestroyNotify) row_data_free); + + return data; +} + +/* + * GtkListBox functions + */ +static gboolean +filter_func (GtkListBoxRow *row, + gpointer user_data) +{ + CcPanelList *self; + RowData *data; + gchar *search_text, *panel_text, *panel_description; + gboolean retval; + + self = CC_PANEL_LIST (user_data); + data = g_object_get_data (G_OBJECT (row), "data"); + + if (!self->search_query) + return TRUE; + + panel_text = cc_util_normalize_casefold_and_unaccent (data->name); + search_text = cc_util_normalize_casefold_and_unaccent (self->search_query); + panel_description = cc_util_normalize_casefold_and_unaccent (data->description); + + g_strstrip (panel_text); + g_strstrip (search_text); + g_strstrip (panel_description); + + /* + * The description label is only visible when the search is + * happening. + */ + gtk_widget_set_visible (data->description_label, self->view == CC_PANEL_LIST_SEARCH); + + retval = g_strstr_len (panel_text, -1, search_text) != NULL || + g_strstr_len (panel_description, -1, search_text) != NULL; + + g_free (panel_text); + g_free (search_text); + g_free (panel_description); + + return retval; +} + +static gint +sort_function (GtkListBoxRow *a, + GtkListBoxRow *b, + gpointer user_data) +{ + CcPanelList *self; + RowData *a_data, *b_data; + + self = CC_PANEL_LIST (user_data); + + /* Handle the Devices and the Details rows */ + if (a == self->details_row && b == self->devices_row) + return 1; + if (a == self->devices_row && b == self->details_row) + return -1; + if (a == self->details_row || a == self->devices_row) + return 1; + if (b == self->details_row || b == self->devices_row) + return -1; + + /* + * We can only retrieve the data after assuring that none + * of the rows are Devices and Details. + */ + a_data = g_object_get_data (G_OBJECT (a), "data"); + b_data = g_object_get_data (G_OBJECT (b), "data"); + + if (a_data->category != b_data->category) + return a_data->category - b_data->category; + + return g_strcmp0 (a_data->name, b_data->name); +} + +static gint +search_sort_function (GtkListBoxRow *a, + GtkListBoxRow *b, + gpointer user_data) +{ + CcPanelList *self; + RowData *a_data, *b_data; + gchar *a_name, *b_name, *search, *a_strstr, *b_strstr; + gint a_distance, b_distance; + gint retval; + + self = CC_PANEL_LIST (user_data); + search = NULL; + a_data = g_object_get_data (G_OBJECT (a), "data"); + b_data = g_object_get_data (G_OBJECT (b), "data"); + + a_distance = b_distance = G_MAXINT; + + a_name = cc_util_normalize_casefold_and_unaccent (a_data->name); + b_name = cc_util_normalize_casefold_and_unaccent (b_data->name); + g_strstrip (a_name); + g_strstrip (b_name); + + if (self->search_query) + { + search = cc_util_normalize_casefold_and_unaccent (self->search_query); + g_strstrip (search); + } + + /* Default result for empty search */ + if (!search || g_utf8_strlen (search, -1) == 0) + { + retval = g_strcmp0 (a_name, b_name); + goto out; + } + + a_strstr = g_strstr_len (a_name, -1, search); + b_strstr = g_strstr_len (b_name, -1, search); + + if (a_strstr) + a_distance = g_strstr_len (a_name, -1, search) - a_name; + + if (b_strstr) + b_distance = g_strstr_len (b_name, -1, search) - b_name; + + retval = a_distance - b_distance; + +out: + g_free (a_name); + g_free (b_name); + g_free (search); + + return retval; +} + +static void +header_func (GtkListBoxRow *row, + GtkListBoxRow *before, + gpointer user_data) +{ + CcPanelList *self = CC_PANEL_LIST (user_data); + + if (!before) + return; + + /* The Details row always have the separator */ + if (row == self->details_row) + { + GtkWidget *separator; + + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_hexpand (separator, TRUE); + gtk_widget_show (separator); + + gtk_list_box_row_set_header (row, separator); + } + else + { + RowData *row_data, *before_data; + + if (row == self->devices_row || + before == self->details_row || + before == self->devices_row) + { + return; + } + + /* + * We can only retrieve the data after assuring that none + * of the rows are Devices and Details. + */ + row_data = g_object_get_data (G_OBJECT (row), "data"); + before_data = g_object_get_data (G_OBJECT (before), "data"); + + if (row_data->category != before_data->category) + { + GtkWidget *separator; + + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_hexpand (separator, TRUE); + gtk_widget_show (separator); + + gtk_list_box_row_set_header (row, separator); + } + } +} + +/* + * Callbacks + */ +static void +row_activated_cb (GtkWidget *listbox, + GtkListBoxRow *row, + CcPanelList *self) +{ + RowData *data; + + /* Details */ + if (row == self->details_row) + { + cc_panel_list_set_view (self, CC_PANEL_LIST_DETAILS); + return; + } + + /* Devices */ + if (row == self->devices_row) + { + cc_panel_list_set_view (self, CC_PANEL_LIST_DEVICES); + return; + } + + /* + * When a panel is selected, the previous one should be + * unselected, except when it's search. + */ + if (listbox != self->search_listbox) + { + if (listbox != self->main_listbox) + gtk_list_box_unselect_all (GTK_LIST_BOX (self->main_listbox)); + + if (listbox != self->details_listbox) + gtk_list_box_unselect_all (GTK_LIST_BOX (self->details_listbox)); + + if (listbox != self->devices_listbox) + gtk_list_box_unselect_all (GTK_LIST_BOX (self->devices_listbox)); + } + + /* + * Since we're not sure that the activated row is in the + * current view, set the view here. + */ + cc_panel_list_set_view (self, get_view_from_listbox (self, listbox)); + + data = g_object_get_data (G_OBJECT (row), "data"); + + g_signal_emit (self, signals[SHOW_PANEL], 0, data->id); +} + +static void +search_row_activated_cb (GtkWidget *listbox, + GtkListBoxRow *row, + CcPanelList *self) +{ + GtkWidget *real_listbox; + RowData *data; + GList *children, *l; + + data = g_object_get_data (G_OBJECT (row), "data"); + + if (data->category == CC_CATEGORY_DETAILS) + real_listbox = self->details_listbox; + else if (data->category == CC_CATEGORY_DEVICES) + real_listbox = self->devices_listbox; + else + real_listbox = self->main_listbox; + + /* Select the correct row */ + children = gtk_container_get_children (GTK_CONTAINER (real_listbox)); + + for (l = children; l != NULL; l = l->next) + { + RowData *real_row_data; + + real_row_data = g_object_get_data (l->data, "data"); + + /* + * The main listbox has the Details & Devices rows, and neither + * of them contains "data", so we have to ensure we have valid + * data before going on. + */ + if (!real_row_data) + continue; + + if (g_strcmp0 (real_row_data->id, data->id) == 0) + { + GtkListBoxRow *real_row; + + real_row = GTK_LIST_BOX_ROW (real_row_data->row); + + gtk_list_box_select_row (GTK_LIST_BOX (real_listbox), real_row); + gtk_widget_grab_focus (GTK_WIDGET (real_row)); + + g_signal_emit_by_name (real_row, "activate"); + break; + } + } + + g_list_free (children); +} + +static void +cc_panel_list_finalize (GObject *object) +{ + CcPanelList *self = (CcPanelList *)object; + + g_clear_pointer (&self->search_query, g_free); + g_clear_pointer (&self->id_to_data, g_hash_table_destroy); + + G_OBJECT_CLASS (cc_panel_list_parent_class)->finalize (object); +} + +static void +cc_panel_list_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + CcPanelList *self = CC_PANEL_LIST (object); + + switch (prop_id) + { + case PROP_SEARCH_MODE: + g_value_set_boolean (value, self->view == CC_PANEL_LIST_SEARCH); + break; + + case PROP_SEARCH_QUERY: + g_value_set_string (value, self->search_query); + break; + + case PROP_VIEW: + g_value_set_int (value, self->view); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static void +cc_panel_list_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + CcPanelList *self = CC_PANEL_LIST (object); + + switch (prop_id) + { + case PROP_SEARCH_MODE: + update_search (self); + break; + + case PROP_SEARCH_QUERY: + cc_panel_list_set_search_query (self, g_value_get_string (value)); + break; + + case PROP_VIEW: + cc_panel_list_set_view (self, g_value_get_int (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static void +cc_panel_list_class_init (CcPanelListClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->finalize = cc_panel_list_finalize; + object_class->get_property = cc_panel_list_get_property; + object_class->set_property = cc_panel_list_set_property; + + /** + * CcPanelList:show-panel: + * + * Emited when a panel is selected. + */ + signals[SHOW_PANEL] = g_signal_new ("show-panel", + CC_TYPE_PANEL_LIST, + G_SIGNAL_RUN_LAST, + 0, NULL, NULL, NULL, + G_TYPE_NONE, + 1, + G_TYPE_STRING); + + /** + * CcPanelList:search-mode: + * + * Whether the search is visible or not. + */ + properties[PROP_SEARCH_MODE] = g_param_spec_boolean ("search-mode", + "Search mode", + "Whether it's in search mode or not", + FALSE, + G_PARAM_READWRITE); + + /** + * CcPanelList:search-query: + * + * The search that is being applied to sidelist. + */ + properties[PROP_SEARCH_QUERY] = g_param_spec_string ("search-query", + "Search query", + "The current search query", + NULL, + G_PARAM_READWRITE); + + /** + * CcPanelList:view: + * + * The current view of the sidelist. + */ + properties[PROP_VIEW] = g_param_spec_int ("view", + "View", + "The current view of the sidelist", + CC_PANEL_LIST_MAIN, + CC_PANEL_LIST_SEARCH, + CC_PANEL_LIST_MAIN, + G_PARAM_READWRITE); + + g_object_class_install_properties (object_class, N_PROPS, properties); + + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/panel-list.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcPanelList, details_listbox); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, details_row); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, devices_listbox); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, devices_row); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, empty_search_placeholder); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, main_listbox); + gtk_widget_class_bind_template_child (widget_class, CcPanelList, search_listbox); + + gtk_widget_class_bind_template_callback (widget_class, row_activated_cb); + gtk_widget_class_bind_template_callback (widget_class, search_row_activated_cb); +} + +static void +cc_panel_list_init (CcPanelList *self) +{ + gtk_widget_init_template (GTK_WIDGET (self)); + + self->id_to_data = g_hash_table_new (g_str_hash, g_str_equal); + self->view = CC_PANEL_LIST_MAIN; + + gtk_list_box_set_sort_func (GTK_LIST_BOX (self->main_listbox), + sort_function, + self, + NULL); + + gtk_list_box_set_header_func (GTK_LIST_BOX (self->main_listbox), + header_func, + self, + NULL); + + /* Search listbox */ + gtk_list_box_set_sort_func (GTK_LIST_BOX (self->search_listbox), + search_sort_function, + self, + NULL); + + gtk_list_box_set_filter_func (GTK_LIST_BOX (self->search_listbox), + filter_func, + self, + NULL); + + gtk_list_box_set_placeholder (GTK_LIST_BOX (self->search_listbox), self->empty_search_placeholder); +} + +GtkWidget* +cc_panel_list_new (void) +{ + return g_object_new (CC_TYPE_PANEL_LIST, NULL); +} + +gboolean +cc_panel_list_activate (CcPanelList *self) +{ + GtkListBoxRow *row; + GtkWidget *listbox; + + g_return_val_if_fail (CC_IS_PANEL_LIST (self), FALSE); + + listbox = get_listbox_from_view (self, self->view); + + if (self->view == CC_PANEL_LIST_SEARCH) + row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (listbox), 0); + else + row = gtk_list_box_get_row_at_index (GTK_LIST_BOX (listbox), 0); + + /* If the row is valid, activate it */ + if (row) + { + gtk_list_box_select_row (GTK_LIST_BOX (listbox), row); + gtk_widget_grab_focus (GTK_WIDGET (row)); + + g_signal_emit_by_name (row, "activate"); + } + + return row != NULL; +} + +const gchar* +cc_panel_list_get_search_query (CcPanelList *self) +{ + g_return_val_if_fail (CC_IS_PANEL_LIST (self), NULL); + + return self->search_query; +} + +void +cc_panel_list_set_search_query (CcPanelList *self, + const gchar *search) +{ + g_return_if_fail (CC_IS_PANEL_LIST (self)); + + if (g_strcmp0 (self->search_query, search) != 0) + { + g_clear_pointer (&self->search_query, g_free); + self->search_query = g_strdup (search); + + update_search (self); + + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SEARCH_QUERY]); + + gtk_list_box_invalidate_filter (GTK_LIST_BOX (self->search_listbox)); + gtk_list_box_invalidate_sort (GTK_LIST_BOX (self->search_listbox)); + } +} + +CcPanelListView +cc_panel_list_get_view (CcPanelList *self) +{ + g_return_val_if_fail (CC_IS_PANEL_LIST (self), -1); + + return self->view; +} + +void +cc_panel_list_set_view (CcPanelList *self, + CcPanelListView view) +{ + g_return_if_fail (CC_IS_PANEL_LIST (self)); + + if (self->view != view) + { + GtkWidget *visible_child; + gboolean should_crossfade; + + self->previous_view = self->view; + self->view = view; + + /* + * When changing to or from the search view, the animation should + * be crossfade. Otherwise, it's the previous-forward movement. + */ + should_crossfade = view == CC_PANEL_LIST_SEARCH || + self->previous_view == CC_PANEL_LIST_SEARCH; + + gtk_stack_set_transition_type (GTK_STACK (self), + should_crossfade ? GTK_STACK_TRANSITION_TYPE_CROSSFADE : + GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT); + + visible_child = get_listbox_from_view (self, view); + + gtk_stack_set_visible_child (GTK_STACK (self), visible_child); + + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_VIEW]); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SEARCH_MODE]); + } +} + +void +cc_panel_list_add_panel (CcPanelList *self, + CcPanelCategory category, + const gchar *id, + const gchar *title, + const gchar *description, + const gchar *icon) +{ + GtkWidget *listbox; + RowData *data, *search_data; + + g_return_if_fail (CC_IS_PANEL_LIST (self)); + + /* Add the panel to the proper listbox */ + data = row_data_new (category, id, title, description, icon); + + switch (category) + { + case CC_CATEGORY_DEVICES: + listbox = self->devices_listbox; + break; + + case CC_CATEGORY_DETAILS: + listbox = self->details_listbox; + break; + + default: + listbox = self->main_listbox; + break; + } + + gtk_container_add (GTK_CONTAINER (listbox), data->row); + + /* And add to the search listbox too */ + search_data = row_data_new (category, id, title, description, icon); + gtk_container_add (GTK_CONTAINER (self->search_listbox), search_data->row); + + g_hash_table_insert (self->id_to_data, data->id, data); +} + +/** + * cc_panel_list_set_active_panel: + * @self: a #CcPanelList + * @id: the id of the panel to be activated + * + * Sets the current active panel. + */ +void +cc_panel_list_set_active_panel (CcPanelList *self, + const gchar *id) +{ + GtkWidget *listbox; + RowData *data; + + g_return_if_fail (CC_IS_PANEL_LIST (self)); + + data = g_hash_table_lookup (self->id_to_data, id); + + g_assert (data != NULL); + + listbox = gtk_widget_get_parent (data->row); + + gtk_list_box_select_row (GTK_LIST_BOX (listbox), GTK_LIST_BOX_ROW (data->row)); + gtk_widget_grab_focus (data->row); + + g_signal_emit_by_name (data->row, "activate"); +} diff -Nru gnome-control-center-3.20.2/shell/alt/cc-panel-list.h gnome-control-center-3.22.1/shell/alt/cc-panel-list.h --- gnome-control-center-3.20.2/shell/alt/cc-panel-list.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/cc-panel-list.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,70 @@ +/* cc-panel-list.c + * + * Copyright (C) 2016 Endless, Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author: Georges Basile Stavracas Neto + */ + +#ifndef CC_PANEL_LIST_H +#define CC_PANEL_LIST_H + +#include + +#include "cc-panel.h" +#include "cc-shell-model.h" + +G_BEGIN_DECLS + +typedef enum +{ + CC_PANEL_LIST_MAIN, + CC_PANEL_LIST_DETAILS, + CC_PANEL_LIST_DEVICES, + CC_PANEL_LIST_SEARCH +} CcPanelListView; + +#define CC_TYPE_PANEL_LIST (cc_panel_list_get_type()) + +G_DECLARE_FINAL_TYPE (CcPanelList, cc_panel_list, CC, PANEL_LIST, GtkStack) + +GtkWidget* cc_panel_list_new (void); + +gboolean cc_panel_list_activate (CcPanelList *self); + +const gchar* cc_panel_list_get_search_query (CcPanelList *self); + +void cc_panel_list_set_search_query (CcPanelList *self, + const gchar *search); + +CcPanelListView cc_panel_list_get_view (CcPanelList *self); + +void cc_panel_list_set_view (CcPanelList *self, + CcPanelListView view); + +void cc_panel_list_add_panel (CcPanelList *self, + CcPanelCategory category, + const gchar *id, + const gchar *title, + const gchar *description, + const gchar *icon); + +void cc_panel_list_set_active_panel (CcPanelList *self, + const gchar *id); + +G_END_DECLS + +#endif /* CC_PANEL_LIST_H */ + diff -Nru gnome-control-center-3.20.2/shell/alt/cc-window.c gnome-control-center-3.22.1/shell/alt/cc-window.c --- gnome-control-center-3.20.2/shell/alt/cc-window.c 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/cc-window.c 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,845 @@ +/* + * Copyright (c) 2009, 2010 Intel, Inc. + * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2016 Endless, Inc. + * + * The Control Center is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The Control Center is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the Control Center; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Thomas Wood + */ + +#include + +#include "cc-window.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "cc-panel.h" +#include "cc-shell.h" +#include "cc-shell-category-view.h" +#include "cc-shell-model.h" +#include "cc-panel-list.h" +#include "cc-panel-loader.h" +#include "cc-util.h" + +#define MOUSE_BACK_BUTTON 8 + +#define DEFAULT_WINDOW_ICON_NAME "preferences-system" + +struct _CcWindow +{ + GtkApplicationWindow parent; + + GtkWidget *stack; + GtkWidget *header; + GtkWidget *header_box; + GtkWidget *list_scrolled; + GtkWidget *panel_headerbar; + GtkWidget *search_scrolled; + GtkWidget *panel_list; + GtkWidget *previous_button; + GtkWidget *top_right_box; + GtkWidget *search_button; + GtkWidget *search_bar; + GtkWidget *search_entry; + GtkWidget *lock_button; + GtkWidget *current_panel_box; + GtkWidget *current_panel; + char *current_panel_id; + GQueue *previous_panels; + + GtkSizeGroup *header_sizegroup; + + GPtrArray *custom_widgets; + + GtkListStore *store; + + CcPanel *active_panel; +}; + +static void cc_shell_iface_init (CcShellInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (CcWindow, cc_window, GTK_TYPE_APPLICATION_WINDOW, + G_IMPLEMENT_INTERFACE (CC_TYPE_SHELL, cc_shell_iface_init)) + +enum +{ + PROP_0, + PROP_ACTIVE_PANEL +}; + +static gboolean cc_window_set_active_panel_from_id (CcShell *shell, + const gchar *start_id, + GVariant *parameters, + GError **err); + +static const gchar * +get_icon_name_from_g_icon (GIcon *gicon) +{ + const gchar * const *names; + GtkIconTheme *icon_theme; + int i; + + if (!G_IS_THEMED_ICON (gicon)) + return NULL; + + names = g_themed_icon_get_names (G_THEMED_ICON (gicon)); + icon_theme = gtk_icon_theme_get_default (); + + for (i = 0; names[i] != NULL; i++) + { + if (gtk_icon_theme_has_icon (icon_theme, names[i])) + return names[i]; + } + + return NULL; +} + +static gboolean +activate_panel (CcWindow *self, + const gchar *id, + GVariant *parameters, + const gchar *name, + GIcon *gicon) +{ + GtkWidget *box; + const gchar *icon_name; + + if (!id) + return FALSE; + + self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); + cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel)); + gtk_widget_show (self->current_panel); + + gtk_lock_button_set_permission (GTK_LOCK_BUTTON (self->lock_button), + cc_panel_get_permission (CC_PANEL (self->current_panel))); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + gtk_box_pack_start (GTK_BOX (box), self->current_panel, + TRUE, TRUE, 0); + + gtk_stack_add_named (GTK_STACK (self->stack), box, id); + + /* switch to the new panel */ + gtk_widget_show (box); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), id); + + /* set the title of the window */ + icon_name = get_icon_name_from_g_icon (gicon); + + gtk_window_set_role (GTK_WINDOW (self), id); + gtk_header_bar_set_title (GTK_HEADER_BAR (self->panel_headerbar), name); + gtk_window_set_default_icon_name (icon_name); + gtk_window_set_icon_name (GTK_WINDOW (self), icon_name); + + self->current_panel_box = box; + + return TRUE; +} + +static void +_shell_remove_all_custom_widgets (CcWindow *self) +{ + GtkWidget *widget; + guint i; + + /* remove from the header */ + for (i = 0; i < self->custom_widgets->len; i++) + { + widget = g_ptr_array_index (self->custom_widgets, i); + gtk_container_remove (GTK_CONTAINER (self->top_right_box), widget); + } + g_ptr_array_set_size (self->custom_widgets, 0); +} + +static void +add_current_panel_to_history (CcShell *shell, + const char *start_id) +{ + CcWindow *self; + + g_return_if_fail (start_id != NULL); + + self = CC_WINDOW (shell); + + if (!self->current_panel_id || + g_strcmp0 (self->current_panel_id, start_id) == 0) + return; + + g_queue_push_head (self->previous_panels, g_strdup (self->current_panel_id)); + g_debug ("Added '%s' to the previous panels", self->current_panel_id); +} + +static void +shell_show_overview_page (CcWindow *self) +{ + cc_panel_list_set_view (CC_PANEL_LIST (self->panel_list), CC_PANEL_LIST_MAIN); + cc_panel_list_activate (CC_PANEL_LIST (self->panel_list)); + + if (self->current_panel_box) + gtk_container_remove (GTK_CONTAINER (self->stack), self->current_panel_box); + self->current_panel = NULL; + self->current_panel_box = NULL; + g_clear_pointer (&self->current_panel_id, g_free); + + /* Clear the panel history */ + g_queue_free_full (self->previous_panels, g_free); + self->previous_panels = g_queue_new (); + + /* clear the search text */ + gtk_entry_set_text (GTK_ENTRY (self->search_entry), ""); + if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar))) + gtk_widget_grab_focus (self->search_entry); + + gtk_lock_button_set_permission (GTK_LOCK_BUTTON (self->lock_button), NULL); + + /* reset window title and icon */ + gtk_window_set_role (GTK_WINDOW (self), NULL); + gtk_window_set_default_icon_name (DEFAULT_WINDOW_ICON_NAME); + gtk_window_set_icon_name (GTK_WINDOW (self), DEFAULT_WINDOW_ICON_NAME); + + cc_shell_set_active_panel (CC_SHELL (self), NULL); + + /* clear any custom widgets */ + _shell_remove_all_custom_widgets (self); +} + +void +cc_window_set_overview_page (CcWindow *center) +{ + shell_show_overview_page (center); +} + +void +cc_window_set_search_item (CcWindow *center, + const char *search) +{ + shell_show_overview_page (center); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (center->search_bar), TRUE); + gtk_entry_set_text (GTK_ENTRY (center->search_entry), search); + gtk_editable_set_position (GTK_EDITABLE (center->search_entry), -1); +} + +static void +show_panel_cb (CcPanelList *panel_list, + const gchar *panel_id, + CcWindow *self) +{ + if (panel_id) + cc_window_set_active_panel_from_id (CC_SHELL (self), panel_id, NULL, NULL); + else + shell_show_overview_page (self); +} + +static void +update_list_title (CcWindow *self) +{ + CcPanelListView view; + const gchar *title; + + view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list)); + + switch (view) + { + case CC_PANEL_LIST_DETAILS: + title = _("Details"); + break; + + case CC_PANEL_LIST_DEVICES: + title = _("Devices"); + break; + + case CC_PANEL_LIST_MAIN: + title = _("Settings"); + break; + + case CC_PANEL_LIST_SEARCH: + title = NULL; + break; + } + + if (title) + gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), title); +} + +static void +panel_list_view_changed_cb (CcPanelList *panel_list, + GParamSpec *pspec, + CcWindow *self) +{ + gboolean is_main_view; + + is_main_view = cc_panel_list_get_view (panel_list) == CC_PANEL_LIST_MAIN; + + gtk_widget_set_visible (self->previous_button, !is_main_view); + gtk_widget_set_visible (self->search_button, is_main_view); + + update_list_title (self); +} + +static void +search_entry_activate_cb (GtkEntry *entry, + CcWindow *self) +{ + gboolean changed; + + changed = cc_panel_list_activate (CC_PANEL_LIST (self->panel_list)); + + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), !changed); +} + + +static void +setup_model (CcWindow *shell) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gboolean valid; + + shell->store = (GtkListStore *) cc_shell_model_new (); + model = GTK_TREE_MODEL (shell->store); + + cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store)); + + /* Create a row for each panel */ + valid = gtk_tree_model_get_iter_first (model, &iter); + + while (valid) + { + CcPanelCategory category; + GIcon *icon; + gchar *name, *description, *id, *symbolic_icon; + const gchar *icon_name; + + gtk_tree_model_get (model, &iter, + COL_CATEGORY, &category, + COL_DESCRIPTION, &description, + COL_GICON, &icon, + COL_ID, &id, + COL_NAME, &name, + -1); + + icon_name = get_icon_name_from_g_icon (icon); + symbolic_icon = g_strdup_printf ("%s-symbolic", icon_name); + + cc_panel_list_add_panel (CC_PANEL_LIST (shell->panel_list), + category, + id, + name, + description, + symbolic_icon); + + valid = gtk_tree_model_iter_next (model, &iter); + + g_clear_pointer (&symbolic_icon, g_free); + g_clear_pointer (&description, g_free); + g_clear_pointer (&name, g_free); + g_clear_pointer (&id, g_free); + g_clear_object (&icon); + } +} + +static void +previous_button_clicked_cb (GtkButton *button, + CcWindow *shell) +{ + g_debug ("Num previous panels? %d", g_queue_get_length (shell->previous_panels)); + + /* When in search, simply unsed the search mode */ + if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (shell->search_bar))) + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (shell->search_bar), FALSE); + else + cc_panel_list_set_view (CC_PANEL_LIST (shell->panel_list), CC_PANEL_LIST_MAIN); +} + +static void +sidelist_size_allocate_cb (GtkWidget *box, + GdkRectangle *allocation, + CcWindow *self) +{ + /* Keep the sidelist and the first headerbar synchronized */ + gtk_widget_set_size_request (self->header, allocation->width, -1); +} + +/* CcShell implementation */ +static void +_shell_embed_widget_in_header (CcShell *shell, + GtkWidget *widget) +{ + CcWindow *self = CC_WINDOW (shell); + + /* add to header */ + gtk_box_pack_end (GTK_BOX (self->top_right_box), widget, FALSE, FALSE, 0); + g_ptr_array_add (self->custom_widgets, g_object_ref (widget)); + + gtk_size_group_add_widget (self->header_sizegroup, widget); +} + +/* CcShell implementation */ +static gboolean +cc_window_set_active_panel_from_id (CcShell *shell, + const gchar *start_id, + GVariant *parameters, + GError **err) +{ + GtkTreeIter iter; + gboolean iter_valid; + gchar *name = NULL; + GIcon *gicon = NULL; + CcWindow *self = CC_WINDOW (shell); + GtkWidget *old_panel; + + /* When loading the same panel again, just set its parameters */ + if (g_strcmp0 (self->current_panel_id, start_id) == 0) + { + g_object_set (G_OBJECT (self->current_panel), "parameters", parameters, NULL); + return TRUE; + } + + /* clear any custom widgets */ + _shell_remove_all_custom_widgets (self); + + iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), + &iter); + + /* find the details for this item */ + while (iter_valid) + { + gchar *id; + + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, + COL_NAME, &name, + COL_GICON, &gicon, + COL_ID, &id, + -1); + + if (id && !strcmp (id, start_id)) + { + g_free (id); + break; + } + else + { + g_free (id); + g_free (name); + if (gicon) + g_object_unref (gicon); + + name = NULL; + id = NULL; + gicon = NULL; + } + + iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), + &iter); + } + + old_panel = self->current_panel_box; + + if (!name) + { + g_warning ("Could not find settings panel \"%s\"", start_id); + } + else if (activate_panel (CC_WINDOW (shell), start_id, parameters, + name, gicon) == FALSE) + { + /* Failed to activate the panel for some reason, + * let's keep the old panel around instead */ + } + else + { + /* Successful activation */ + g_free (self->current_panel_id); + self->current_panel_id = g_strdup (start_id); + + if (old_panel) + gtk_container_remove (GTK_CONTAINER (self->stack), old_panel); + + cc_panel_list_set_active_panel (CC_PANEL_LIST (self->panel_list), start_id); + } + + g_free (name); + if (gicon) + g_object_unref (gicon); + + return TRUE; +} + +static gboolean +_shell_set_active_panel_from_id (CcShell *shell, + const gchar *start_id, + GVariant *parameters, + GError **err) +{ + add_current_panel_to_history (shell, start_id); + return cc_window_set_active_panel_from_id (shell, start_id, parameters, err); +} + +static GtkWidget * +_shell_get_toplevel (CcShell *shell) +{ + return GTK_WIDGET (shell); +} + +static void +gdk_window_set_cb (GObject *object, + GParamSpec *pspec, + CcWindow *self) +{ + GdkWindow *window; + gchar *str; + + if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) + return; + + window = gtk_widget_get_window (GTK_WIDGET (self)); + + if (!window) + return; + + str = g_strdup_printf ("%u", (guint) GDK_WINDOW_XID (window)); + g_setenv ("GNOME_CONTROL_CENTER_XID", str, TRUE); + g_free (str); +} + +static gboolean +window_map_event_cb (GtkWidget *widget, + GdkEvent *event, + CcWindow *self) +{ + /* If focus ends up in a category icon view one of the items is + * immediately selected which looks odd when we are starting up, so + * we explicitly unset the focus here. */ + gtk_window_set_focus (GTK_WINDOW (self), NULL); + return GDK_EVENT_PROPAGATE; +} + +/* GObject Implementation */ +static void +cc_window_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + CcWindow *self = CC_WINDOW (object); + + switch (property_id) + { + case PROP_ACTIVE_PANEL: + g_value_set_object (value, self->active_panel); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +set_active_panel (CcWindow *shell, + CcPanel *panel) +{ + g_return_if_fail (CC_IS_SHELL (shell)); + g_return_if_fail (panel == NULL || CC_IS_PANEL (panel)); + + if (panel != shell->active_panel) + { + /* remove the old panel */ + g_clear_object (&shell->active_panel); + + /* set the new panel */ + if (panel) + { + shell->active_panel = g_object_ref (panel); + } + else + { + shell_show_overview_page (shell); + } + g_object_notify (G_OBJECT (shell), "active-panel"); + } +} + +static void +cc_window_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + CcWindow *shell = CC_WINDOW (object); + + switch (property_id) + { + case PROP_ACTIVE_PANEL: + set_active_panel (shell, g_value_get_object (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +cc_window_dispose (GObject *object) +{ + CcWindow *self = CC_WINDOW (object); + + g_free (self->current_panel_id); + self->current_panel_id = NULL; + + if (self->custom_widgets) + { + g_ptr_array_unref (self->custom_widgets); + self->custom_widgets = NULL; + } + + g_clear_object (&self->store); + g_clear_object (&self->active_panel); + + G_OBJECT_CLASS (cc_window_parent_class)->dispose (object); +} + +static void +cc_window_finalize (GObject *object) +{ + CcWindow *self = CC_WINDOW (object); + + if (self->previous_panels) + { + g_queue_free_full (self->previous_panels, g_free); + self->previous_panels = NULL; + } + + G_OBJECT_CLASS (cc_window_parent_class)->finalize (object); +} + +static void +cc_shell_iface_init (CcShellInterface *iface) +{ + iface->set_active_panel_from_id = _shell_set_active_panel_from_id; + iface->embed_widget_in_header = _shell_embed_widget_in_header; + iface->get_toplevel = _shell_get_toplevel; +} + +static void +cc_window_class_init (CcWindowClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->get_property = cc_window_get_property; + object_class->set_property = cc_window_set_property; + object_class->dispose = cc_window_dispose; + object_class->finalize = cc_window_finalize; + + g_object_class_override_property (object_class, PROP_ACTIVE_PANEL, "active-panel"); + + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/window.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcWindow, header); + gtk_widget_class_bind_template_child (widget_class, CcWindow, header_box); + gtk_widget_class_bind_template_child (widget_class, CcWindow, header_sizegroup); + gtk_widget_class_bind_template_child (widget_class, CcWindow, list_scrolled); + gtk_widget_class_bind_template_child (widget_class, CcWindow, lock_button); + gtk_widget_class_bind_template_child (widget_class, CcWindow, panel_headerbar); + gtk_widget_class_bind_template_child (widget_class, CcWindow, previous_button); + gtk_widget_class_bind_template_child (widget_class, CcWindow, search_bar); + gtk_widget_class_bind_template_child (widget_class, CcWindow, search_button); + gtk_widget_class_bind_template_child (widget_class, CcWindow, search_entry); + gtk_widget_class_bind_template_child (widget_class, CcWindow, stack); + gtk_widget_class_bind_template_child (widget_class, CcWindow, top_right_box); + + gtk_widget_class_bind_template_callback (widget_class, previous_button_clicked_cb); + gtk_widget_class_bind_template_callback (widget_class, gdk_window_set_cb); + gtk_widget_class_bind_template_callback (widget_class, search_entry_activate_cb); + gtk_widget_class_bind_template_callback (widget_class, sidelist_size_allocate_cb); + gtk_widget_class_bind_template_callback (widget_class, update_list_title); + gtk_widget_class_bind_template_callback (widget_class, window_map_event_cb); +} + +static gboolean +window_button_release_event (GtkWidget *win, + GdkEventButton *event, + CcWindow *self) +{ + /* back button */ + if (event->button == MOUSE_BACK_BUTTON) + shell_show_overview_page (self); + return FALSE; +} + +static gboolean +window_key_press_event (GtkWidget *win, + GdkEventKey *event, + CcWindow *self) +{ + GdkKeymap *keymap; + gboolean retval; + GdkModifierType state; + CcPanelListView view; + gboolean is_rtl; + + retval = GDK_EVENT_PROPAGATE; + state = event->state; + keymap = gdk_keymap_get_default (); + gdk_keymap_add_virtual_modifiers (keymap, &state); + state = state & gtk_accelerator_get_default_mod_mask (); + is_rtl = gtk_widget_get_direction (win) == GTK_TEXT_DIR_RTL; + view = cc_panel_list_get_view (CC_PANEL_LIST (self->panel_list)); + + /* The search only happens when we're in the MAIN view */ + if (view == CC_PANEL_LIST_MAIN && + gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->search_bar), (GdkEvent*) event) == GDK_EVENT_STOP) + { + return GDK_EVENT_STOP; + } + + if (state == GDK_CONTROL_MASK) + { + switch (event->keyval) + { + case GDK_KEY_s: + case GDK_KEY_S: + case GDK_KEY_f: + case GDK_KEY_F: + /* The search only happens when we're in the MAIN view */ + if (view != CC_PANEL_LIST_MAIN && + view != CC_PANEL_LIST_SEARCH) + { + break; + } + + retval = !gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar)); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), retval); + if (retval) + gtk_widget_grab_focus (self->search_entry); + retval = GDK_EVENT_STOP; + break; + case GDK_KEY_Q: + case GDK_KEY_q: + gtk_widget_destroy (GTK_WIDGET (self)); + retval = GDK_EVENT_STOP; + break; + case GDK_KEY_W: + case GDK_KEY_w: + retval = GDK_EVENT_STOP; + break; + } + } + else if ((!is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Left) || + (is_rtl && state == GDK_MOD1_MASK && event->keyval == GDK_KEY_Right) || + event->keyval == GDK_KEY_Back) + { + previous_button_clicked_cb (NULL, self); + retval = GDK_EVENT_STOP; + } + + return retval; +} + +static void +create_window (CcWindow *self) +{ + AtkObject *accessible; + + /* previous button */ + accessible = gtk_widget_get_accessible (self->previous_button); + atk_object_set_name (accessible, _("All Settings")); + + gtk_window_set_titlebar (GTK_WINDOW (self), self->header_box); + gtk_widget_show_all (self->header_box); + + /* + * We have to create the listbox here because declaring it in window.ui + * and letting GtkBuilder handle it would hit the bug where the focus is + * not tracked. + */ + self->panel_list = cc_panel_list_new (); + + g_signal_connect (self->panel_list, "show-panel", G_CALLBACK (show_panel_cb), self); + g_signal_connect (self->panel_list, "notify::view", G_CALLBACK (panel_list_view_changed_cb), self); + + g_object_bind_property (self->search_bar, + "search-mode-enabled", + self->panel_list, + "search-mode", + G_BINDING_BIDIRECTIONAL); + + g_object_bind_property (self->search_entry, + "text", + self->panel_list, + "search-query", + G_BINDING_DEFAULT); + + gtk_container_add (GTK_CONTAINER (self->list_scrolled), self->panel_list); + gtk_widget_show (self->panel_list); + + setup_model (self); + + /* connect various signals */ + g_signal_connect_after (self, "key_press_event", + G_CALLBACK (window_key_press_event), self); + gtk_widget_add_events (GTK_WIDGET (self), GDK_BUTTON_RELEASE_MASK); + g_signal_connect (self, "button-release-event", + G_CALLBACK (window_button_release_event), self); +} + +static void +cc_window_init (CcWindow *self) +{ + gtk_widget_init_template (GTK_WIDGET (self)); + + create_window (self); + + self->previous_panels = g_queue_new (); + + /* keep a list of custom widgets to unload on panel change */ + self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + + /* After everything is loaded, select the first visible panel */ + cc_panel_list_activate (CC_PANEL_LIST (self->panel_list)); +} + +CcWindow * +cc_window_new (GtkApplication *application) +{ + g_return_val_if_fail (GTK_IS_APPLICATION (application), NULL); + + return g_object_new (CC_TYPE_WINDOW, + "application", application, + "resizable", TRUE, + "title", _("Settings"), + "icon-name", DEFAULT_WINDOW_ICON_NAME, + "window-position", GTK_WIN_POS_CENTER, + NULL); +} + +void +cc_window_present (CcWindow *center) +{ + gtk_window_present (GTK_WINDOW (center)); +} + +void +cc_window_show (CcWindow *center) +{ + gtk_window_present (GTK_WINDOW (center)); +} diff -Nru gnome-control-center-3.20.2/shell/alt/cc-window.h gnome-control-center-3.22.1/shell/alt/cc-window.h --- gnome-control-center-3.20.2/shell/alt/cc-window.h 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/cc-window.h 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010 Intel, Inc. + * + * The Control Center is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * The Control Center is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with the Control Center; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Thomas Wood + */ + +#ifndef _CC_WINDOW_H +#define _CC_WINDOW_H + +#include +#include "cc-shell.h" + +G_BEGIN_DECLS + +#define CC_TYPE_WINDOW (cc_window_get_type ()) + +G_DECLARE_FINAL_TYPE (CcWindow, cc_window, CC, WINDOW, GtkApplicationWindow) + +CcWindow *cc_window_new (GtkApplication *application); + +void cc_window_present (CcWindow *center); + +void cc_window_show (CcWindow *center); + +void cc_window_set_overview_page (CcWindow *center); + +void cc_window_set_search_item (CcWindow *center, + const char *search); + +G_END_DECLS + +#endif /* _CC_WINDOW_H */ diff -Nru gnome-control-center-3.20.2/shell/alt/Makefile.am gnome-control-center-3.22.1/shell/alt/Makefile.am --- gnome-control-center-3.20.2/shell/alt/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,24 @@ +AM_CPPFLAGS = \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ + -DCC_ENABLE_ALT_CATEGORIES \ + -I$(top_srcdir) \ + $(SHELL_CFLAGS) \ + $(CHEESE_CFLAGS) \ + $(WACOM_PANEL_CFLAGS) \ + -I$(top_srcdir)/shell \ + -I$(top_srcdir)/panels/common \ + -I$(top_srcdir)/libgd + +noinst_LTLIBRARIES = libshell_alt.la + +libshell_alt_la_SOURCES = \ + cc-panel-list.c \ + cc-panel-list.h \ + cc-window.c \ + cc-window.h + +libshell_alt_la_LIBADD = $(top_builddir)/libgd/libgd.la + +test: + +-include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/shell/alt/Makefile.in gnome-control-center-3.22.1/shell/alt/Makefile.in --- gnome-control-center-3.20.2/shell/alt/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/alt/Makefile.in 2016-10-11 12:14:09.000000000 +0000 @@ -0,0 +1,726 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = shell/alt +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libshell_alt_la_DEPENDENCIES = $(top_builddir)/libgd/libgd.la +am_libshell_alt_la_OBJECTS = cc-panel-list.lo cc-window.lo +libshell_alt_la_OBJECTS = $(am_libshell_alt_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libshell_alt_la_SOURCES) +DIST_SOURCES = $(libshell_alt_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BACKGROUND_PANEL_CFLAGS = @BACKGROUND_PANEL_CFLAGS@ +BACKGROUND_PANEL_LIBS = @BACKGROUND_PANEL_LIBS@ +BLUETOOTH_CFLAGS = @BLUETOOTH_CFLAGS@ +BLUETOOTH_LIBS = @BLUETOOTH_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CHEESE_CFLAGS = @CHEESE_CFLAGS@ +CHEESE_LIBS = @CHEESE_LIBS@ +COLOR_PANEL_CFLAGS = @COLOR_PANEL_CFLAGS@ +COLOR_PANEL_LIBS = @COLOR_PANEL_LIBS@ +CONTROL_CENTER_VERSION = @CONTROL_CENTER_VERSION@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CUPS_CFLAGS = @CUPS_CFLAGS@ +CUPS_CONFIG = @CUPS_CONFIG@ +CUPS_CPPFLAGS = @CUPS_CPPFLAGS@ +CUPS_LIBS = @CUPS_LIBS@ +CYGPATH_W = @CYGPATH_W@ +DATETIME_PANEL_CFLAGS = @DATETIME_PANEL_CFLAGS@ +DATETIME_PANEL_LIBS = @DATETIME_PANEL_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DEVICES_CFLAGS = @DEVICES_CFLAGS@ +DEVICES_LIBS = @DEVICES_LIBS@ +DISPLAY_PANEL_CFLAGS = @DISPLAY_PANEL_CFLAGS@ +DISPLAY_PANEL_LIBS = @DISPLAY_PANEL_LIBS@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GDESKTOP_PREFIX = @GDESKTOP_PREFIX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GVC_CFLAGS = @GVC_CFLAGS@ +GVC_LIBS = @GVC_LIBS@ +INFO_PANEL_CFLAGS = @INFO_PANEL_CFLAGS@ +INFO_PANEL_LIBS = @INFO_PANEL_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +KEYBOARD_PANEL_CFLAGS = @KEYBOARD_PANEL_CFLAGS@ +KEYBOARD_PANEL_LIBS = @KEYBOARD_PANEL_LIBS@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBGD_CFLAGS = @LIBGD_CFLAGS@ +LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ +LIBGD_LIBS = @LIBGD_LIBS@ +LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ +LIBGD_SOURCES = @LIBGD_SOURCES@ +LIBLANGUAGE_CFLAGS = @LIBLANGUAGE_CFLAGS@ +LIBLANGUAGE_LIBS = @LIBLANGUAGE_LIBS@ +LIBM = @LIBM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBSHORTCUTS_CFLAGS = @LIBSHORTCUTS_CFLAGS@ +LIBSHORTCUTS_LIBS = @LIBSHORTCUTS_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MEDIA_PANEL_CFLAGS = @MEDIA_PANEL_CFLAGS@ +MEDIA_PANEL_LIBS = @MEDIA_PANEL_LIBS@ +MKDIR_P = @MKDIR_P@ +MOUSE_PANEL_CFLAGS = @MOUSE_PANEL_CFLAGS@ +MOUSE_PANEL_LIBS = @MOUSE_PANEL_LIBS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ +NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ +NETWORK_PANEL_CFLAGS = @NETWORK_PANEL_CFLAGS@ +NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ +NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ +NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ +NOTIFICATIONS_PANEL_LIBS = @NOTIFICATIONS_PANEL_LIBS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +ONLINE_ACCOUNTS_PANEL_CFLAGS = @ONLINE_ACCOUNTS_PANEL_CFLAGS@ +ONLINE_ACCOUNTS_PANEL_LIBS = @ONLINE_ACCOUNTS_PANEL_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANEL_CFLAGS = @PANEL_CFLAGS@ +PANEL_LIBS = @PANEL_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POWER_PANEL_CFLAGS = @POWER_PANEL_CFLAGS@ +POWER_PANEL_LIBS = @POWER_PANEL_LIBS@ +PRINTERS_PANEL_CFLAGS = @PRINTERS_PANEL_CFLAGS@ +PRINTERS_PANEL_LIBS = @PRINTERS_PANEL_LIBS@ +PRIVACY_PANEL_CFLAGS = @PRIVACY_PANEL_CFLAGS@ +PRIVACY_PANEL_LIBS = @PRIVACY_PANEL_LIBS@ +RANLIB = @RANLIB@ +REGION_PANEL_CFLAGS = @REGION_PANEL_CFLAGS@ +REGION_PANEL_LIBS = @REGION_PANEL_LIBS@ +REMOTE_LOGIN_HELPER_CFLAGS = @REMOTE_LOGIN_HELPER_CFLAGS@ +REMOTE_LOGIN_HELPER_LIBS = @REMOTE_LOGIN_HELPER_LIBS@ +SCREEN_PANEL_CFLAGS = @SCREEN_PANEL_CFLAGS@ +SCREEN_PANEL_LIBS = @SCREEN_PANEL_LIBS@ +SEARCH_PANEL_CFLAGS = @SEARCH_PANEL_CFLAGS@ +SEARCH_PANEL_LIBS = @SEARCH_PANEL_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHARING_PANEL_CFLAGS = @SHARING_PANEL_CFLAGS@ +SHARING_PANEL_LIBS = @SHARING_PANEL_LIBS@ +SHELL = @SHELL@ +SHELL_CFLAGS = @SHELL_CFLAGS@ +SHELL_LIBS = @SHELL_LIBS@ +SMBCLIENT_CFLAGS = @SMBCLIENT_CFLAGS@ +SMBCLIENT_LIBS = @SMBCLIENT_LIBS@ +SOUND_PANEL_CFLAGS = @SOUND_PANEL_CFLAGS@ +SOUND_PANEL_LIBS = @SOUND_PANEL_LIBS@ +STRIP = @STRIP@ +UDEV_CFLAGS = @UDEV_CFLAGS@ +UDEV_LIBS = @UDEV_LIBS@ +UNIVERSAL_ACCESS_PANEL_CFLAGS = @UNIVERSAL_ACCESS_PANEL_CFLAGS@ +UNIVERSAL_ACCESS_PANEL_LIBS = @UNIVERSAL_ACCESS_PANEL_LIBS@ +UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ +USER_ACCOUNTS_PANEL_CFLAGS = @USER_ACCOUNTS_PANEL_CFLAGS@ +USER_ACCOUNTS_PANEL_LIBS = @USER_ACCOUNTS_PANEL_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WACOM_PANEL_CFLAGS = @WACOM_PANEL_CFLAGS@ +WACOM_PANEL_LIBS = @WACOM_PANEL_LIBS@ +WARN_CFLAGS = @WARN_CFLAGS@ +WAYLAND_CFLAGS = @WAYLAND_CFLAGS@ +WAYLAND_LIBS = @WAYLAND_LIBS@ +XF86MISC_LIBS = @XF86MISC_LIBS@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +XSLTPROC = @XSLTPROC@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ + -DCC_ENABLE_ALT_CATEGORIES \ + -I$(top_srcdir) \ + $(SHELL_CFLAGS) \ + $(CHEESE_CFLAGS) \ + $(WACOM_PANEL_CFLAGS) \ + -I$(top_srcdir)/shell \ + -I$(top_srcdir)/panels/common \ + -I$(top_srcdir)/libgd + +noinst_LTLIBRARIES = libshell_alt.la +libshell_alt_la_SOURCES = \ + cc-panel-list.c \ + cc-panel-list.h \ + cc-window.c \ + cc-window.h + +libshell_alt_la_LIBADD = $(top_builddir)/libgd/libgd.la +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu shell/alt/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu shell/alt/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libshell_alt.la: $(libshell_alt_la_OBJECTS) $(libshell_alt_la_DEPENDENCIES) $(EXTRA_libshell_alt_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libshell_alt_la_OBJECTS) $(libshell_alt_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-panel-list.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-window.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +test: + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru gnome-control-center-3.20.2/shell/appdata/Makefile.am gnome-control-center-3.22.1/shell/appdata/Makefile.am --- gnome-control-center-3.20.2/shell/appdata/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/appdata/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -4,6 +4,8 @@ appdata_in_files = \ gnome-control-center.appdata.xml.in +test: + EXTRA_DIST = $(appdata_in_files) CLEANFILES = \ diff -Nru gnome-control-center-3.20.2/shell/appdata/Makefile.in gnome-control-center-3.22.1/shell/appdata/Makefile.in --- gnome-control-center-3.20.2/shell/appdata/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/shell/appdata/Makefile.in 2016-10-11 12:14:09.000000000 +0000 @@ -260,8 +260,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -616,6 +614,8 @@ @INTLTOOL_XML_RULE@ +test: + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gnome-control-center-3.20.2/shell/cc-panel.h gnome-control-center-3.22.1/shell/cc-panel.h --- gnome-control-center-3.20.2/shell/cc-panel.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/cc-panel.h 2016-08-12 12:43:57.000000000 +0000 @@ -50,6 +50,8 @@ typedef struct _CcPanel CcPanel; typedef struct _CcPanelClass CcPanelClass; +G_DEFINE_AUTOPTR_CLEANUP_FUNC (CcPanel, g_object_unref) + /* cc-shell.h requires CcPanel, so make sure it is defined first */ #include "cc-shell.h" diff -Nru gnome-control-center-3.20.2/shell/cc-panel-loader.c gnome-control-center-3.22.1/shell/cc-panel-loader.c --- gnome-control-center-3.20.2/shell/cc-panel-loader.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/cc-panel-loader.c 2016-08-12 12:43:57.000000000 +0000 @@ -122,22 +122,37 @@ const char *categories; char **split; int retval; - int i; categories = g_desktop_app_info_get_categories (app); split = g_strsplit (categories, ";", -1); retval = -1; - for (i = 0; split[i]; i++) - { - if (strcmp (split[i], "HardwareSettings") == 0) - retval = CC_CATEGORY_HARDWARE; - else if (strcmp (split[i], "X-GNOME-PersonalSettings") == 0) - retval = CC_CATEGORY_PERSONAL; - else if (strcmp (split[i], "X-GNOME-SystemSettings") == 0) - retval = CC_CATEGORY_SYSTEM; - } +#define const_strv(s) ((const gchar* const*) s) + +#ifdef CC_ENABLE_ALT_CATEGORIES + if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings")) + retval = CC_CATEGORY_CONNECTIVITY; + else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalizationSettings")) + retval = CC_CATEGORY_PERSONALIZATION; + else if (g_strv_contains (const_strv (split), "X-GNOME-AccountSettings")) + retval = CC_CATEGORY_ACCOUNT; + else if (g_strv_contains (const_strv (split), "X-GNOME-DevicesSettings")) + retval = CC_CATEGORY_DEVICES; + else if (g_strv_contains (const_strv (split), "X-GNOME-DetailsSettings")) + retval = CC_CATEGORY_DETAILS; + else if (g_strv_contains (const_strv (split), "HardwareSettings")) + retval = CC_CATEGORY_HARDWARE; +#else + if (g_strv_contains (const_strv (split), "HardwareSettings")) + retval = CC_CATEGORY_HARDWARE; + else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings")) + retval = CC_CATEGORY_PERSONAL; + else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings")) + retval = CC_CATEGORY_SYSTEM; +#endif + +#undef const_strv if (retval < 0) { diff -Nru gnome-control-center-3.20.2/shell/cc-shell-model.h gnome-control-center-3.22.1/shell/cc-shell-model.h --- gnome-control-center-3.20.2/shell/cc-shell-model.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/cc-shell-model.h 2016-08-12 12:43:57.000000000 +0000 @@ -53,9 +53,19 @@ typedef struct _CcShellModelPrivate CcShellModelPrivate; typedef enum { - CC_CATEGORY_PERSONAL, +#ifdef CC_ENABLE_ALT_CATEGORIES + CC_CATEGORY_CONNECTIVITY, + CC_CATEGORY_PERSONALIZATION, + CC_CATEGORY_ACCOUNT, CC_CATEGORY_HARDWARE, + CC_CATEGORY_DEVICES, + CC_CATEGORY_DETAILS, +#else + CC_CATEGORY_PERSONAL, CC_CATEGORY_SYSTEM, + CC_CATEGORY_HARDWARE, +#endif + CC_CATEGORY_LAST } CcPanelCategory; diff -Nru gnome-control-center-3.20.2/shell/cc-window.c gnome-control-center-3.22.1/shell/cc-window.c --- gnome-control-center-3.20.2/shell/cc-window.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/cc-window.c 2016-08-12 12:43:57.000000000 +0000 @@ -39,14 +39,6 @@ #include "cc-panel-loader.h" #include "cc-util.h" -static void cc_shell_iface_init (CcShellInterface *iface); - -G_DEFINE_TYPE_WITH_CODE (CcWindow, cc_window, GTK_TYPE_APPLICATION_WINDOW, - G_IMPLEMENT_INTERFACE (CC_TYPE_SHELL, cc_shell_iface_init)) - -#define WINDOW_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_WINDOW, CcWindowPrivate)) - /* Use a fixed width for the shell, since resizing horizontally is more awkward * for the user than resizing vertically * Both sizes are defined in https://live.gnome.org/Design/SystemSettings/ */ @@ -70,8 +62,10 @@ SMALL_SCREEN_FALSE } CcSmallScreen; -struct _CcWindowPrivate +struct _CcWindow { + GtkApplicationWindow parent; + GtkWidget *stack; GtkWidget *header; GtkWidget *main_vbox; @@ -105,6 +99,11 @@ CcSmallScreen small_screen; }; +static void cc_shell_iface_init (CcShellInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (CcWindow, cc_window, GTK_TYPE_APPLICATION_WINDOW, + G_IMPLEMENT_INTERFACE (CC_TYPE_SHELL, cc_shell_iface_init)) + enum { PROP_0, @@ -147,113 +146,110 @@ const gchar *name, GIcon *gicon) { - CcWindowPrivate *priv = self->priv; GtkWidget *box; const gchar *icon_name; if (!id) return FALSE; - priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); - cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); - gtk_widget_show (priv->current_panel); + self->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); + cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (self->current_panel)); + gtk_widget_show (self->current_panel); - gtk_lock_button_set_permission (GTK_LOCK_BUTTON (priv->lock_button), - cc_panel_get_permission (CC_PANEL (priv->current_panel))); + gtk_lock_button_set_permission (GTK_LOCK_BUTTON (self->lock_button), + cc_panel_get_permission (CC_PANEL (self->current_panel))); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (box), priv->current_panel, + gtk_box_pack_start (GTK_BOX (box), self->current_panel, TRUE, TRUE, 0); - gtk_stack_add_named (GTK_STACK (priv->stack), box, id); + gtk_stack_add_named (GTK_STACK (self->stack), box, id); /* switch to the new panel */ gtk_widget_show (box); - gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), id); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), id); /* set the title of the window */ icon_name = get_icon_name_from_g_icon (gicon); gtk_window_set_role (GTK_WINDOW (self), id); - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header), name); + gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), name); gtk_window_set_default_icon_name (icon_name); gtk_window_set_icon_name (GTK_WINDOW (self), icon_name); - priv->current_panel_box = box; + self->current_panel_box = box; return TRUE; } static void -_shell_remove_all_custom_widgets (CcWindowPrivate *priv) +_shell_remove_all_custom_widgets (CcWindow *self) { GtkWidget *widget; guint i; /* remove from the header */ - for (i = 0; i < priv->custom_widgets->len; i++) + for (i = 0; i < self->custom_widgets->len; i++) { - widget = g_ptr_array_index (priv->custom_widgets, i); - gtk_container_remove (GTK_CONTAINER (priv->top_right_box), widget); + widget = g_ptr_array_index (self->custom_widgets, i); + gtk_container_remove (GTK_CONTAINER (self->top_right_box), widget); } - g_ptr_array_set_size (priv->custom_widgets, 0); + g_ptr_array_set_size (self->custom_widgets, 0); } static void add_current_panel_to_history (CcShell *shell, const char *start_id) { - CcWindowPrivate *priv; + CcWindow *self; g_return_if_fail (start_id != NULL); - priv = CC_WINDOW (shell)->priv; + self = CC_WINDOW (shell); - if (!priv->current_panel_id || - g_strcmp0 (priv->current_panel_id, start_id) == 0) + if (!self->current_panel_id || + g_strcmp0 (self->current_panel_id, start_id) == 0) return; - g_queue_push_head (priv->previous_panels, g_strdup (priv->current_panel_id)); - g_debug ("Added '%s' to the previous panels", priv->current_panel_id); + g_queue_push_head (self->previous_panels, g_strdup (self->current_panel_id)); + g_debug ("Added '%s' to the previous panels", self->current_panel_id); } static void shell_show_overview_page (CcWindow *self) { - CcWindowPrivate *priv = self->priv; - - gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), OVERVIEW_PAGE); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), OVERVIEW_PAGE); - if (priv->current_panel_box) - gtk_container_remove (GTK_CONTAINER (priv->stack), priv->current_panel_box); - priv->current_panel = NULL; - priv->current_panel_box = NULL; - g_clear_pointer (&priv->current_panel_id, g_free); + if (self->current_panel_box) + gtk_container_remove (GTK_CONTAINER (self->stack), self->current_panel_box); + self->current_panel = NULL; + self->current_panel_box = NULL; + g_clear_pointer (&self->current_panel_id, g_free); /* Clear the panel history */ - g_queue_free_full (self->priv->previous_panels, g_free); - self->priv->previous_panels = g_queue_new (); + g_queue_free_full (self->previous_panels, g_free); + self->previous_panels = g_queue_new (); /* clear the search text */ - g_free (priv->filter_string); - priv->filter_string = g_strdup (""); - gtk_entry_set_text (GTK_ENTRY (priv->search_entry), ""); - if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->priv->search_bar))) - gtk_widget_grab_focus (priv->search_entry); + g_free (self->filter_string); + self->filter_string = g_strdup (""); + gtk_entry_set_text (GTK_ENTRY (self->search_entry), ""); + if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar))) + gtk_widget_grab_focus (self->search_entry); - gtk_lock_button_set_permission (GTK_LOCK_BUTTON (priv->lock_button), NULL); + gtk_lock_button_set_permission (GTK_LOCK_BUTTON (self->lock_button), NULL); /* reset window title and icon */ gtk_window_set_role (GTK_WINDOW (self), NULL); - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header), _(DEFAULT_WINDOW_TITLE)); + gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE)); gtk_window_set_default_icon_name (DEFAULT_WINDOW_ICON_NAME); gtk_window_set_icon_name (GTK_WINDOW (self), DEFAULT_WINDOW_ICON_NAME); cc_shell_set_active_panel (CC_SHELL (self), NULL); /* clear any custom widgets */ - _shell_remove_all_custom_widgets (priv); + _shell_remove_all_custom_widgets (self); } void @@ -267,9 +263,9 @@ const char *search) { shell_show_overview_page (center); - gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (center->priv->search_bar), TRUE); - gtk_entry_set_text (GTK_ENTRY (center->priv->search_entry), search); - gtk_editable_set_position (GTK_EDITABLE (center->priv->search_entry), -1); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (center->search_bar), TRUE); + gtk_entry_set_text (GTK_ENTRY (center->search_entry), search); + gtk_editable_set_position (GTK_EDITABLE (center->search_entry), -1); } static void @@ -316,7 +312,7 @@ GList *list, *l; GList *res; - list = gtk_container_get_children (GTK_CONTAINER (shell->priv->main_vbox)); + list = gtk_container_get_children (GTK_CONTAINER (shell->main_vbox)); res = NULL; for (l = list; l; l = l->next) { @@ -562,17 +558,17 @@ } static gboolean -model_filter_func (GtkTreeModel *model, - GtkTreeIter *iter, - CcWindowPrivate *priv) +model_filter_func (GtkTreeModel *model, + GtkTreeIter *iter, + CcWindow *self) { char **t; gboolean matches = FALSE; - if (!priv->filter_string || !priv->filter_terms) + if (!self->filter_string || !self->filter_terms) return FALSE; - for (t = priv->filter_terms; *t; t++) + for (t = self->filter_terms; *t; t++) { matches = cc_shell_model_iter_matches_search (CC_SHELL_MODEL (model), iter, @@ -598,43 +594,42 @@ static void search_entry_changed_cb (GtkEntry *entry, - CcWindow *center) + CcWindow *self) { - CcWindowPrivate *priv = center->priv; char *str; /* if the entry text was set manually (not by the user) */ - if (!g_strcmp0 (priv->filter_string, gtk_entry_get_text (entry))) + if (!g_strcmp0 (self->filter_string, gtk_entry_get_text (entry))) { - cc_shell_model_set_sort_terms (CC_SHELL_MODEL (priv->store), NULL); + cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), NULL); return; } /* Don't re-filter for added trailing or leading spaces */ str = cc_util_normalize_casefold_and_unaccent (gtk_entry_get_text (entry)); g_strstrip (str); - if (!g_strcmp0 (str, priv->filter_string)) + if (!g_strcmp0 (str, self->filter_string)) { g_free (str); return; } - g_free (priv->filter_string); - priv->filter_string = str; + g_free (self->filter_string); + self->filter_string = str; - g_strfreev (priv->filter_terms); - priv->filter_terms = g_strsplit (priv->filter_string, " ", -1); + g_strfreev (self->filter_terms); + self->filter_terms = g_strsplit (self->filter_string, " ", -1); - cc_shell_model_set_sort_terms (CC_SHELL_MODEL (priv->store), priv->filter_terms); + cc_shell_model_set_sort_terms (CC_SHELL_MODEL (self->store), self->filter_terms); - if (!g_strcmp0 (priv->filter_string, "")) + if (!g_strcmp0 (self->filter_string, "")) { - shell_show_overview_page (center); + shell_show_overview_page (self); } else { - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->search_filter)); - gtk_stack_set_visible_child_name (GTK_STACK (priv->stack), SEARCH_PAGE); + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (self->search_filter)); + gtk_stack_set_visible_child_name (GTK_STACK (self->stack), SEARCH_PAGE); } } @@ -643,17 +638,15 @@ GdkEventKey *event, CcWindow *self) { - CcWindowPrivate *priv = self->priv; - if (event->keyval == GDK_KEY_Return && - g_strcmp0 (priv->filter_string, "") != 0) + g_strcmp0 (self->filter_string, "") != 0) { GtkTreePath *path; GtkTreeSelection *selection; path = gtk_tree_path_new_first (); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->search_view)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self->search_view)); gtk_tree_selection_select_path (selection, path); if (!gtk_tree_selection_path_is_selected (selection, path)) @@ -662,15 +655,15 @@ return FALSE; } - gtk_tree_view_row_activated (GTK_TREE_VIEW (priv->search_view), path, - gtk_tree_view_get_column (GTK_TREE_VIEW (self->priv->search_view), 0)); + gtk_tree_view_row_activated (GTK_TREE_VIEW (self->search_view), path, + gtk_tree_view_get_column (GTK_TREE_VIEW (self->search_view), 0)); gtk_tree_path_free (path); return TRUE; } if (event->keyval == GDK_KEY_Escape) { - gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), FALSE); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), FALSE); gtk_entry_set_text (entry, ""); return TRUE; } @@ -750,30 +743,29 @@ } static void -setup_search (CcWindow *shell) +setup_search (CcWindow *self) { GtkWidget *search_view; GtkCellRenderer *renderer; GtkTreeViewColumn *column; - CcWindowPrivate *priv = shell->priv; - g_return_if_fail (priv->store != NULL); + g_return_if_fail (self->store != NULL); /* create the search filter */ - priv->search_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store), + self->search_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (self->store), NULL); - gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->search_filter), + gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (self->search_filter), (GtkTreeModelFilterVisibleFunc) model_filter_func, - priv, NULL); + self, NULL); /* set up the search view */ - priv->search_view = search_view = gtk_tree_view_new (); + self->search_view = search_view = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (search_view), FALSE); gtk_tree_view_set_enable_search (GTK_TREE_VIEW (search_view), FALSE); gtk_tree_view_set_model (GTK_TREE_VIEW (search_view), - GTK_TREE_MODEL (priv->search_filter)); + GTK_TREE_MODEL (self->search_filter)); /* This needs to happen after setting the model, otherwise * the search column will be the first string column */ gtk_tree_view_set_search_column (GTK_TREE_VIEW (search_view), -1); @@ -789,7 +781,7 @@ "gicon", COL_GICON, NULL); gtk_tree_view_column_set_expand (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->search_view), column); + gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column); renderer = gtk_cell_renderer_text_new (); g_object_set (renderer, @@ -799,7 +791,7 @@ "text", COL_NAME, NULL); gtk_tree_view_column_set_expand (column, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->search_view), column); + gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column); renderer = gd_styled_text_renderer_new (); gd_styled_text_renderer_add_class (GD_STYLED_TEXT_RENDERER (renderer), "dim-label"); @@ -811,18 +803,18 @@ "text", COL_DESCRIPTION, NULL); gtk_tree_view_column_set_expand (column, TRUE); - gtk_tree_view_append_column (GTK_TREE_VIEW (priv->search_view), column); + gtk_tree_view_append_column (GTK_TREE_VIEW (self->search_view), column); - gtk_container_add (GTK_CONTAINER (priv->search_scrolled), search_view); + gtk_container_add (GTK_CONTAINER (self->search_scrolled), search_view); - g_signal_connect (priv->search_view, "row-activated", - G_CALLBACK (on_search_row_activated), shell); - g_signal_connect (priv->search_view, "button-press-event", - G_CALLBACK (on_search_button_press_event), shell); + g_signal_connect (self->search_view, "row-activated", + G_CALLBACK (on_search_row_activated), self); + g_signal_connect (self->search_view, "button-press-event", + G_CALLBACK (on_search_button_press_event), self); - priv->filter_string = g_strdup (""); + self->filter_string = g_strdup (""); - gtk_widget_show (priv->search_view); + gtk_widget_show (self->search_view); } static void @@ -839,19 +831,19 @@ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_margin_top (separator, 11); gtk_widget_set_margin_bottom (separator, 10); - gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), separator, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (shell->main_vbox), separator, FALSE, FALSE, 0); gtk_widget_show (separator); } /* create new category view for this category */ - filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->priv->store), + filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (shell->store), NULL); gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter), (GtkTreeModelFilterVisibleFunc) category_filter_func, GINT_TO_POINTER (category), NULL); categoryview = cc_shell_category_view_new (name, filter); - gtk_box_pack_start (GTK_BOX (shell->priv->main_vbox), categoryview, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (shell->main_vbox), categoryview, FALSE, TRUE, 0); g_signal_connect (cc_shell_category_view_get_item_view (CC_SHELL_CATEGORY_VIEW (categoryview)), "desktop-item-activated", @@ -873,29 +865,27 @@ static void setup_model (CcWindow *shell) { - CcWindowPrivate *priv = shell->priv; - - priv->store = (GtkListStore *) cc_shell_model_new (); + shell->store = (GtkListStore *) cc_shell_model_new (); /* Add categories */ add_category_view (shell, CC_CATEGORY_PERSONAL, C_("category", "Personal")); add_category_view (shell, CC_CATEGORY_HARDWARE, C_("category", "Hardware")); add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System")); - cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->priv->store)); + cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->store)); } static void previous_button_clicked_cb (GtkButton *button, CcWindow *shell) { - g_debug ("Num previous panels? %d", g_queue_get_length (shell->priv->previous_panels)); - if (g_queue_is_empty (shell->priv->previous_panels)) { + g_debug ("Num previous panels? %d", g_queue_get_length (shell->previous_panels)); + if (g_queue_is_empty (shell->previous_panels)) { shell_show_overview_page (shell); } else { char *panel_name; - panel_name = g_queue_pop_head (shell->priv->previous_panels); + panel_name = g_queue_pop_head (shell->previous_panels); g_debug ("About to go to previous panel '%s'", panel_name); cc_window_set_active_panel_from_id (CC_SHELL (shell), panel_name, NULL, NULL); g_free (panel_name); @@ -907,7 +897,6 @@ GParamSpec *spec, CcWindow *self) { - CcWindowPrivate *priv = self->priv; int nat_height; const char *id; @@ -919,14 +908,14 @@ { gint header_height, maximum_height; - gtk_widget_hide (priv->previous_button); - gtk_widget_show (priv->search_button); - gtk_widget_show (priv->search_bar); - gtk_widget_hide (priv->lock_button); + gtk_widget_hide (self->previous_button); + gtk_widget_show (self->search_button); + gtk_widget_show (self->search_bar); + gtk_widget_hide (self->lock_button); - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->main_vbox), + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->main_vbox), FIXED_WIDTH, NULL, &nat_height); - gtk_widget_get_preferred_height_for_width (GTK_WIDGET (priv->header), + gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self->header), FIXED_WIDTH, NULL, &header_height); /* find the maximum height by using the monitor height minus an allowance @@ -936,19 +925,19 @@ if (maximum_height > 0 && nat_height + header_height > maximum_height) nat_height = maximum_height - header_height; - gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), - priv->small_screen == SMALL_SCREEN_TRUE ? SMALL_SCREEN_FIXED_HEIGHT : nat_height); + gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window), + self->small_screen == SMALL_SCREEN_TRUE ? SMALL_SCREEN_FIXED_HEIGHT : nat_height); } else { - gtk_widget_show (priv->previous_button); - gtk_widget_hide (priv->search_button); - gtk_widget_hide (priv->search_bar); + gtk_widget_show (self->previous_button); + gtk_widget_hide (self->search_button); + gtk_widget_hide (self->search_bar); /* set the scrolled window small so that it doesn't force the window to be larger than this panel */ gtk_widget_get_preferred_height_for_width (GTK_WIDGET (self), FIXED_WIDTH, NULL, &nat_height); - gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (priv->scrolled_window), MIN_ICON_VIEW_HEIGHT); + gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (self->scrolled_window), MIN_ICON_VIEW_HEIGHT); gtk_window_resize (GTK_WINDOW (self), FIXED_WIDTH, nat_height); @@ -960,13 +949,13 @@ _shell_embed_widget_in_header (CcShell *shell, GtkWidget *widget) { - CcWindowPrivate *priv = CC_WINDOW (shell)->priv; + CcWindow *self = CC_WINDOW (shell); /* add to header */ - gtk_box_pack_end (GTK_BOX (priv->top_right_box), widget, FALSE, FALSE, 0); - g_ptr_array_add (priv->custom_widgets, g_object_ref (widget)); + gtk_box_pack_end (GTK_BOX (self->top_right_box), widget, FALSE, FALSE, 0); + g_ptr_array_add (self->custom_widgets, g_object_ref (widget)); - gtk_size_group_add_widget (priv->header_sizegroup, widget); + gtk_size_group_add_widget (self->header_sizegroup, widget); } /* CcShell implementation */ @@ -980,20 +969,20 @@ gboolean iter_valid; gchar *name = NULL; GIcon *gicon = NULL; - CcWindowPrivate *priv = CC_WINDOW (shell)->priv; + CcWindow *self = CC_WINDOW (shell); GtkWidget *old_panel; /* When loading the same panel again, just set its parameters */ - if (g_strcmp0 (priv->current_panel_id, start_id) == 0) + if (g_strcmp0 (self->current_panel_id, start_id) == 0) { - g_object_set (G_OBJECT (priv->current_panel), "parameters", parameters, NULL); + g_object_set (G_OBJECT (self->current_panel), "parameters", parameters, NULL); return TRUE; } /* clear any custom widgets */ - _shell_remove_all_custom_widgets (priv); + _shell_remove_all_custom_widgets (self); - iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->store), + iter_valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter); /* find the details for this item */ @@ -1001,7 +990,7 @@ { gchar *id; - gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (self->store), &iter, COL_NAME, &name, COL_GICON, &gicon, COL_ID, &id, @@ -1024,11 +1013,11 @@ gicon = NULL; } - iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store), + iter_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (self->store), &iter); } - old_panel = priv->current_panel_box; + old_panel = self->current_panel_box; if (!name) { @@ -1043,11 +1032,11 @@ else { /* Successful activation */ - g_free (priv->current_panel_id); - priv->current_panel_id = g_strdup (start_id); + g_free (self->current_panel_id); + self->current_panel_id = g_strdup (start_id); if (old_panel) - gtk_container_remove (GTK_CONTAINER (priv->stack), old_panel); + gtk_container_remove (GTK_CONTAINER (self->stack), old_panel); } g_free (name); @@ -1080,12 +1069,12 @@ GValue *value, GParamSpec *pspec) { - CcWindowPrivate *priv = CC_WINDOW (object)->priv; + CcWindow *self = CC_WINDOW (object); switch (property_id) { case PROP_ACTIVE_PANEL: - g_value_set_object (value, priv->active_panel); + g_value_set_object (value, self->active_panel); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -1099,15 +1088,15 @@ g_return_if_fail (CC_IS_SHELL (shell)); g_return_if_fail (panel == NULL || CC_IS_PANEL (panel)); - if (panel != shell->priv->active_panel) + if (panel != shell->active_panel) { /* remove the old panel */ - g_clear_object (&shell->priv->active_panel); + g_clear_object (&shell->active_panel); /* set the new panel */ if (panel) { - shell->priv->active_panel = g_object_ref (panel); + shell->active_panel = g_object_ref (panel); } else { @@ -1138,34 +1127,34 @@ static void cc_window_dispose (GObject *object) { - CcWindowPrivate *priv = CC_WINDOW (object)->priv; + CcWindow *self = CC_WINDOW (object); /* Avoid receiving notifications about the pages changing * when destroying the children one-by-one */ - if (priv->stack) + if (self->stack) { - g_signal_handlers_disconnect_by_func (priv->stack, stack_page_notify_cb, object); - priv->stack = NULL; + g_signal_handlers_disconnect_by_func (self->stack, stack_page_notify_cb, object); + self->stack = NULL; } - g_free (priv->current_panel_id); - priv->current_panel_id = NULL; + g_free (self->current_panel_id); + self->current_panel_id = NULL; - if (priv->custom_widgets) + if (self->custom_widgets) { - g_ptr_array_unref (priv->custom_widgets); - priv->custom_widgets = NULL; + g_ptr_array_unref (self->custom_widgets); + self->custom_widgets = NULL; } - g_clear_object (&priv->store); - g_clear_object (&priv->search_filter); - g_clear_object (&priv->active_panel); - g_clear_object (&priv->header_sizegroup); + g_clear_object (&self->store); + g_clear_object (&self->search_filter); + g_clear_object (&self->active_panel); + g_clear_object (&self->header_sizegroup); - if (priv->previous_panels) + if (self->previous_panels) { - g_queue_free_full (priv->previous_panels, g_free); - priv->previous_panels = NULL; + g_queue_free_full (self->previous_panels, g_free); + self->previous_panels = NULL; } G_OBJECT_CLASS (cc_window_parent_class)->dispose (object); @@ -1174,10 +1163,10 @@ static void cc_window_finalize (GObject *object) { - CcWindowPrivate *priv = CC_WINDOW (object)->priv; + CcWindow *self = CC_WINDOW (object); - g_free (priv->filter_string); - g_strfreev (priv->filter_terms); + g_free (self->filter_string); + g_strfreev (self->filter_terms); G_OBJECT_CLASS (cc_window_parent_class)->finalize (object); } @@ -1195,8 +1184,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (CcWindowPrivate)); - object_class->get_property = cc_window_get_property; object_class->set_property = cc_window_set_property; object_class->dispose = cc_window_dispose; @@ -1236,12 +1223,12 @@ state = state & gtk_accelerator_get_default_mod_mask (); is_rtl = gtk_widget_get_direction (win) == GTK_TEXT_DIR_RTL; - id = gtk_stack_get_visible_child_name (GTK_STACK (self->priv->stack)); + id = gtk_stack_get_visible_child_name (GTK_STACK (self->stack)); overview = g_str_equal (id, OVERVIEW_PAGE); search = g_str_equal (id, SEARCH_PAGE); if ((overview || search) && - gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->priv->search_bar), (GdkEvent*) event) == GDK_EVENT_STOP) + gtk_search_bar_handle_event (GTK_SEARCH_BAR (self->search_bar), (GdkEvent*) event) == GDK_EVENT_STOP) return GDK_EVENT_STOP; if (state == GDK_CONTROL_MASK) @@ -1254,10 +1241,10 @@ case GDK_KEY_F: if (!overview && !search) break; - retval = !gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->priv->search_bar)); - gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->priv->search_bar), retval); + retval = !gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (self->search_bar)); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (self->search_bar), retval); if (retval) - gtk_widget_grab_focus (self->priv->search_entry); + gtk_widget_grab_focus (self->search_entry); retval = GDK_EVENT_STOP; break; case GDK_KEY_Q: @@ -1295,13 +1282,13 @@ GdkScreen *screen; GdkRectangle rect; - if (self->priv->monitor_num < 0) + if (self->monitor_num < 0) return 0; /* We cannot use workarea here, as this wouldn't * be updated when we read it after a monitors-changed signal */ screen = gtk_widget_get_screen (GTK_WIDGET (self)); - gdk_screen_get_monitor_geometry (screen, self->priv->monitor_num, &rect); + gdk_screen_get_monitor_geometry (screen, self->monitor_num, &rect); return rect.height; } @@ -1320,9 +1307,9 @@ window = gtk_widget_get_window (widget); screen = gtk_widget_get_screen (widget); monitor = gdk_screen_get_monitor_at_window (screen, window); - if (self->priv->monitor_num != monitor) + if (self->monitor_num != monitor) { - self->priv->monitor_num = monitor; + self->monitor_num = monitor; changed = TRUE; } @@ -1349,21 +1336,21 @@ { gtk_window_set_resizable (GTK_WINDOW (self), TRUE); - if (self->priv->small_screen != small) + if (self->small_screen != small) gtk_window_maximize (GTK_WINDOW (self)); } else { - if (self->priv->small_screen != small) + if (self->small_screen != small) gtk_window_unmaximize (GTK_WINDOW (self)); gtk_window_set_resizable (GTK_WINDOW (self), FALSE); } - self->priv->small_screen = small; + self->small_screen = small; /* And update the minimum sizes */ - stack_page_notify_cb (GTK_STACK (self->priv->stack), NULL, self); + stack_page_notify_cb (GTK_STACK (self->stack), NULL, self); } static gboolean @@ -1396,7 +1383,7 @@ { /* We reset small_screen_set to make sure that the * window gets maximised if need be, in update_small_screen_settings() */ - self->priv->small_screen = SMALL_SCREEN_UNSET; + self->small_screen = SMALL_SCREEN_UNSET; update_small_screen_settings (self); } @@ -1436,26 +1423,25 @@ static void create_main_page (CcWindow *self) { - CcWindowPrivate *priv = self->priv; GtkStyleContext *context; - priv->scrolled_window = gtk_scrolled_window_new (NULL, NULL); - context = gtk_widget_get_style_context (priv->scrolled_window); + self->scrolled_window = gtk_scrolled_window_new (NULL, NULL); + context = gtk_widget_get_style_context (self->scrolled_window); gtk_style_context_add_class (context, "view"); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_stack_add_named (GTK_STACK (priv->stack), priv->scrolled_window, OVERVIEW_PAGE); + gtk_stack_add_named (GTK_STACK (self->stack), self->scrolled_window, OVERVIEW_PAGE); - priv->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_set_margin_top (priv->main_vbox, 8); - gtk_widget_set_margin_bottom (priv->main_vbox, 8); - gtk_widget_set_margin_start (priv->main_vbox, 12); - gtk_widget_set_margin_end (priv->main_vbox, 12); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->main_vbox), - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scrolled_window))); - gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->main_vbox); + self->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_margin_top (self->main_vbox, 8); + gtk_widget_set_margin_bottom (self->main_vbox, 8); + gtk_widget_set_margin_start (self->main_vbox, 12); + gtk_widget_set_margin_end (self->main_vbox, 12); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->main_vbox), + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->scrolled_window))); + gtk_container_add (GTK_CONTAINER (self->scrolled_window), self->main_vbox); - gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); + gtk_widget_set_size_request (self->scrolled_window, FIXED_WIDTH, -1); /* load the available settings panels */ setup_model (self); @@ -1464,12 +1450,10 @@ static void create_search_page (CcWindow *self) { - CcWindowPrivate *priv = self->priv; - - priv->search_scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->search_scrolled), + self->search_scrolled = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->search_scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_stack_add_named (GTK_STACK (priv->stack), priv->search_scrolled, SEARCH_PAGE); + gtk_stack_add_named (GTK_STACK (self->stack), self->search_scrolled, SEARCH_PAGE); /* setup search functionality */ setup_search (self); @@ -1478,50 +1462,48 @@ static void create_header (CcWindow *self) { - CcWindowPrivate *priv = self->priv; GtkWidget *image; AtkObject *accessible; - priv->header = gtk_header_bar_new (); - gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (priv->header), TRUE); + self->header = gtk_header_bar_new (); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (self->header), TRUE); - priv->header_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); + self->header_sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); /* previous button */ - priv->previous_button = gtk_button_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_MENU); - gtk_widget_set_valign (priv->previous_button, GTK_ALIGN_CENTER); - gtk_widget_set_no_show_all (priv->previous_button, TRUE); - accessible = gtk_widget_get_accessible (priv->previous_button); + self->previous_button = gtk_button_new_from_icon_name ("go-previous-symbolic", GTK_ICON_SIZE_MENU); + gtk_widget_set_valign (self->previous_button, GTK_ALIGN_CENTER); + gtk_widget_set_no_show_all (self->previous_button, TRUE); + accessible = gtk_widget_get_accessible (self->previous_button); atk_object_set_name (accessible, _("All Settings")); - gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->header), priv->previous_button); - g_signal_connect (priv->previous_button, "clicked", G_CALLBACK (previous_button_clicked_cb), self); - gtk_size_group_add_widget (priv->header_sizegroup, priv->previous_button); + gtk_header_bar_pack_start (GTK_HEADER_BAR (self->header), self->previous_button); + g_signal_connect (self->previous_button, "clicked", G_CALLBACK (previous_button_clicked_cb), self); + gtk_size_group_add_widget (self->header_sizegroup, self->previous_button); /* toggle search button */ - priv->search_button = gtk_toggle_button_new (); + self->search_button = gtk_toggle_button_new (); image = gtk_image_new_from_icon_name ("edit-find-symbolic", GTK_ICON_SIZE_MENU); - gtk_button_set_image (GTK_BUTTON (priv->search_button), image); - gtk_widget_set_valign (priv->search_button, GTK_ALIGN_CENTER); - gtk_style_context_add_class (gtk_widget_get_style_context (priv->search_button), - "image-button"); - gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), priv->search_button); + gtk_button_set_image (GTK_BUTTON (self->search_button), image); + gtk_widget_set_valign (self->search_button, GTK_ALIGN_CENTER); + gtk_style_context_add_class (gtk_widget_get_style_context (self->search_button), + "image-button"); + gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->search_button); - priv->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->header), priv->top_right_box); + self->top_right_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header), self->top_right_box); - priv->lock_button = gtk_lock_button_new (NULL); - gtk_style_context_add_class (gtk_widget_get_style_context (priv->lock_button), + self->lock_button = gtk_lock_button_new (NULL); + gtk_style_context_add_class (gtk_widget_get_style_context (self->lock_button), "text-button"); - gtk_widget_set_valign (priv->lock_button, GTK_ALIGN_CENTER); - gtk_widget_set_no_show_all (priv->lock_button, TRUE); - gtk_container_add (GTK_CONTAINER (priv->top_right_box), priv->lock_button); - gtk_size_group_add_widget (priv->header_sizegroup, priv->lock_button); + gtk_widget_set_valign (self->lock_button, GTK_ALIGN_CENTER); + gtk_widget_set_no_show_all (self->lock_button, TRUE); + gtk_container_add (GTK_CONTAINER (self->top_right_box), self->lock_button); + gtk_size_group_add_widget (self->header_sizegroup, self->lock_button); } static void create_window (CcWindow *self) { - CcWindowPrivate *priv = self->priv; GtkWidget *box; GdkScreen *screen; @@ -1529,27 +1511,27 @@ gtk_container_add (GTK_CONTAINER (self), box); create_header (self); - gtk_window_set_titlebar (GTK_WINDOW (self), priv->header); - gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header), _(DEFAULT_WINDOW_TITLE)); - gtk_widget_show_all (priv->header); + gtk_window_set_titlebar (GTK_WINDOW (self), self->header); + gtk_header_bar_set_title (GTK_HEADER_BAR (self->header), _(DEFAULT_WINDOW_TITLE)); + gtk_widget_show_all (self->header); /* search bar */ - priv->search_bar = gtk_search_bar_new (); - priv->search_entry = gtk_search_entry_new (); - gtk_entry_set_width_chars (GTK_ENTRY (priv->search_entry), 30); - g_signal_connect (priv->search_entry, "search-changed", G_CALLBACK (search_entry_changed_cb), self); - g_signal_connect (priv->search_entry, "key-press-event", G_CALLBACK (search_entry_key_press_event_cb), self); - gtk_container_add (GTK_CONTAINER (priv->search_bar), priv->search_entry); - gtk_container_add (GTK_CONTAINER (box), priv->search_bar); + self->search_bar = gtk_search_bar_new (); + self->search_entry = gtk_search_entry_new (); + gtk_entry_set_width_chars (GTK_ENTRY (self->search_entry), 30); + g_signal_connect (self->search_entry, "search-changed", G_CALLBACK (search_entry_changed_cb), self); + g_signal_connect (self->search_entry, "key-press-event", G_CALLBACK (search_entry_key_press_event_cb), self); + gtk_container_add (GTK_CONTAINER (self->search_bar), self->search_entry); + gtk_container_add (GTK_CONTAINER (box), self->search_bar); - g_object_bind_property (priv->search_button, "active", - priv->search_bar, "search-mode-enabled", + g_object_bind_property (self->search_button, "active", + self->search_bar, "search-mode-enabled", G_BINDING_BIDIRECTIONAL); - priv->stack = gtk_stack_new (); - gtk_stack_set_homogeneous (GTK_STACK (priv->stack), TRUE); - gtk_stack_set_transition_type (GTK_STACK (priv->stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE); - gtk_box_pack_start (GTK_BOX (box), priv->stack, TRUE, TRUE, 0); + self->stack = gtk_stack_new (); + gtk_stack_set_homogeneous (GTK_STACK (self->stack), TRUE); + gtk_stack_set_transition_type (GTK_STACK (self->stack), GTK_STACK_TRANSITION_TYPE_CROSSFADE); + gtk_box_pack_start (GTK_BOX (box), self->stack, TRUE, TRUE, 0); create_main_page (self); create_search_page (self); @@ -1569,7 +1551,7 @@ g_signal_connect (self, "notify::window", G_CALLBACK (gdk_window_set_cb), self); - g_signal_connect (priv->stack, "notify::visible-child", + g_signal_connect (self->stack, "notify::visible-child", G_CALLBACK (stack_page_notify_cb), self); gtk_widget_show_all (box); @@ -1578,21 +1560,17 @@ static void cc_window_init (CcWindow *self) { - CcWindowPrivate *priv; - - priv = self->priv = WINDOW_PRIVATE (self); - - priv->monitor_num = -1; - self->priv->small_screen = SMALL_SCREEN_UNSET; + self->monitor_num = -1; + self->small_screen = SMALL_SCREEN_UNSET; create_window (self); - self->priv->previous_panels = g_queue_new (); + self->previous_panels = g_queue_new (); /* keep a list of custom widgets to unload on panel change */ - priv->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); + self->custom_widgets = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref); - stack_page_notify_cb (GTK_STACK (priv->stack), NULL, self); + stack_page_notify_cb (GTK_STACK (self->stack), NULL, self); } CcWindow * diff -Nru gnome-control-center-3.20.2/shell/cc-window.h gnome-control-center-3.22.1/shell/cc-window.h --- gnome-control-center-3.20.2/shell/cc-window.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/cc-window.h 2016-08-12 12:43:57.000000000 +0000 @@ -26,29 +26,9 @@ G_BEGIN_DECLS -#define CC_TYPE_WINDOW cc_window_get_type() -#define CC_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CC_TYPE_WINDOW, CcWindow)) -#define CC_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CC_TYPE_WINDOW, CcWindowClass)) -#define CC_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CC_TYPE_WINDOW)) -#define CC_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CC_TYPE_WINDOW)) -#define CC_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CC_TYPE_WINDOW, CcWindowClass)) +#define CC_TYPE_WINDOW (cc_window_get_type ()) -typedef struct _CcWindow CcWindow; -typedef struct _CcWindowClass CcWindowClass; -typedef struct _CcWindowPrivate CcWindowPrivate; - -struct _CcWindow -{ - GtkApplicationWindow parent; - CcWindowPrivate *priv; -}; - -struct _CcWindowClass -{ - GtkApplicationWindowClass parent_class; -}; - -GType cc_window_get_type (void) G_GNUC_CONST; +G_DECLARE_FINAL_TYPE (CcWindow, cc_window, CC, WINDOW, GtkApplicationWindow) CcWindow *cc_window_new (GtkApplication *application); diff -Nru gnome-control-center-3.20.2/shell/gnome-control-center.gresource.xml gnome-control-center-3.22.1/shell/gnome-control-center.gresource.xml --- gnome-control-center-3.20.2/shell/gnome-control-center.gresource.xml 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/gnome-control-center.gresource.xml 2016-08-12 12:43:57.000000000 +0000 @@ -2,5 +2,7 @@ help-overlay.ui + panel-list.ui + window.ui diff -Nru gnome-control-center-3.20.2/shell/hostname-helper.c gnome-control-center-3.22.1/shell/hostname-helper.c --- gnome-control-center-3.20.2/shell/hostname-helper.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/hostname-helper.c 2016-08-12 12:43:57.000000000 +0000 @@ -17,6 +17,7 @@ */ #include +#include #include #include "hostname-helper.h" @@ -168,3 +169,50 @@ return g_strdup ("localhost"); } #undef CHECK + +/* Max length of an SSID in bytes */ +#define SSID_MAX_LEN 32 +char * +pretty_hostname_to_ssid (const char *pretty) +{ + const char *p, *prev; + char *ret = NULL; + + if (pretty == NULL) { + pretty = g_get_host_name (); + if (g_strcmp0 (pretty, "localhost") == 0) + pretty = NULL; + } + + if (pretty == NULL) { + /* translators: This is the default hotspot name, need to be less than 32-bytes */ + ret = g_strdup (C_("hotspot", "Hotspot")); + g_assert (strlen (ret) <= 32); + return ret; + } + + g_return_val_if_fail (g_utf8_validate (pretty, -1, NULL), NULL); + + p = pretty; + prev = NULL; + while ((p = g_utf8_find_next_char (p, NULL)) != NULL) { + if (p == prev) + break; + + if (p - pretty > 32) { + ret = g_strndup (pretty, prev - pretty); + break; + } + if (p - pretty == 32) { + ret = g_strndup (pretty, p - pretty); + break; + } + + prev = p; + } + + if (ret == NULL) + ret = g_strdup (pretty); + + return ret; +} diff -Nru gnome-control-center-3.20.2/shell/hostname-helper.h gnome-control-center-3.22.1/shell/hostname-helper.h --- gnome-control-center-3.20.2/shell/hostname-helper.h 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/hostname-helper.h 2016-08-12 12:43:57.000000000 +0000 @@ -18,3 +18,4 @@ char *pretty_hostname_to_static (const char *pretty, gboolean for_display); +char *pretty_hostname_to_ssid (const char *pretty); diff -Nru gnome-control-center-3.20.2/shell/Makefile.am gnome-control-center-3.22.1/shell/Makefile.am --- gnome-control-center-3.20.2/shell/Makefile.am 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/Makefile.am 2016-08-12 12:43:57.000000000 +0000 @@ -1,12 +1,17 @@ -SUBDIRS = appdata +include $(top_srcdir)/Makefile.decl + +SUBDIRS = appdata alt AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ + -DTEST_TOPSRCDIR=\""$(top_srcdir)/"\" \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ $(CHEESE_CFLAGS) \ $(WACOM_PANEL_CFLAGS) \ -I$(top_srcdir)/panels/common/ \ + -I$(top_srcdir)/shell/alt \ -I$(top_srcdir)/libgd all-local: check-local @@ -19,15 +24,15 @@ bin_PROGRAMS = gnome-control-center -gnome_control_center_SOURCES = \ +noinst_PROGRAMS = gnome-control-center-alt + +common_sources = \ $(BUILT_SOURCES) \ main.c \ cc-application.c \ cc-application.h \ cc-shell-log.c \ cc-shell-log.h \ - cc-window.c \ - cc-window.h \ cc-shell-category-view.c \ cc-shell-category-view.h \ cc-shell-item-view.c \ @@ -48,7 +53,22 @@ list-box-helper.c \ $(MARSHAL_FILES) +gnome_control_center_SOURCES = \ + $(common_sources) \ + cc-window.c \ + cc-window.h + +gnome_control_center_alt_SOURCES = \ + $(common_sources) + gnome_control_center_LDFLAGS = -export-dynamic +gnome_control_center_alt_LDFLAGS = -export-dynamic + +# Temporarily add the CC_ENABLE_ALT_CATEGORIES compile-time +# flag to keep the current panels working. +gnome_control_center_alt_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCC_ENABLE_ALT_CATEGORIES gnome_control_center_LDADD = \ libshell.la \ @@ -91,6 +111,24 @@ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la endif +gnome_control_center_alt_LDADD = \ + $(gnome_control_center_LDADD) \ + alt/libshell_alt.la + +# Because it is confusing and somewhat problematic to directly add and compile +# cc-panel-loader.o by another directory (i.e. the shell search provider), we +# have to create a library and link it there, just like libshell.la. +noinst_LTLIBRARIES += libpanel_loader.la + +libpanel_loader_la_SOURCES = \ + cc-panel-loader.c \ + cc-panel-loader.h + +libpanel_loader_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCC_PANEL_LOADER_NO_GTYPES + + # Dbus service file servicefiledir = $(datadir)/dbus-1/services servicefile_in_files = org.gnome.ControlCenter.service.in @@ -121,18 +159,19 @@ $(completion_in_files) \ gnome-control-center.gresource.xml \ help-overlay.ui \ + panel-list.ui \ + window.ui \ $(resource_files) \ list-panel.sh CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA) DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in -noinst_PROGRAMS = test-hostname +TEST_PROGS += test-hostname +noinst_PROGRAMS += test-hostname test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS) -EXTRA_DIST += hostnames-test.txt -check-local: test-hostname - $(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null +EXTRA_DIST += hostnames-test.txt ssids-test.txt -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/shell/Makefile.in gnome-control-center-3.22.1/shell/Makefile.in --- gnome-control-center-3.20.2/shell/Makefile.in 2016-10-11 14:26:41.000000000 +0000 +++ gnome-control-center-3.22.1/shell/Makefile.in 2016-10-11 12:14:08.000000000 +0000 @@ -91,11 +91,12 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = gnome-control-center$(EXEEXT) +noinst_PROGRAMS = gnome-control-center-alt$(EXEEXT) \ + test-hostname$(EXEEXT) @BUILD_WACOM_TRUE@am__append_1 = $(top_builddir)/panels/wacom/libwacom-properties.la @BUILD_PRINTERS_TRUE@am__append_2 = $(top_builddir)/panels/printers/libprinters.la @BUILD_NETWORK_TRUE@am__append_3 = $(top_builddir)/panels/network/libnetwork.la @BUILD_BLUETOOTH_TRUE@am__append_4 = $(top_builddir)/panels/bluetooth/libbluetooth.la -noinst_PROGRAMS = test-hostname$(EXEEXT) subdir = shell ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ @@ -111,24 +112,28 @@ CONFIG_CLEAN_FILES = gnome-control-center.desktop.in CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libshell_la_LIBADD = -am_libshell_la_OBJECTS = cc-shell-model.lo -libshell_la_OBJECTS = $(am_libshell_la_OBJECTS) +libpanel_loader_la_LIBADD = +am_libpanel_loader_la_OBJECTS = libpanel_loader_la-cc-panel-loader.lo +libpanel_loader_la_OBJECTS = $(am_libpanel_loader_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +libshell_la_LIBADD = +am_libshell_la_OBJECTS = cc-shell-model.lo +libshell_la_OBJECTS = $(am_libshell_la_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(completiondir)" \ "$(DESTDIR)$(servicefiledir)" "$(DESTDIR)$(sysdir)" PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__objects_1 = resources.$(OBJEXT) -am_gnome_control_center_OBJECTS = $(am__objects_1) main.$(OBJEXT) \ +am__objects_2 = $(am__objects_1) main.$(OBJEXT) \ cc-application.$(OBJEXT) cc-shell-log.$(OBJEXT) \ - cc-window.$(OBJEXT) cc-shell-category-view.$(OBJEXT) \ - cc-shell-item-view.$(OBJEXT) cc-editable-entry.$(OBJEXT) \ - cc-panel-loader.$(OBJEXT) cc-panel.$(OBJEXT) \ - cc-shell.$(OBJEXT) hostname-helper.$(OBJEXT) \ - cc-hostname-entry.$(OBJEXT) list-box-helper.$(OBJEXT) + cc-shell-category-view.$(OBJEXT) cc-shell-item-view.$(OBJEXT) \ + cc-editable-entry.$(OBJEXT) cc-panel-loader.$(OBJEXT) \ + cc-panel.$(OBJEXT) cc-shell.$(OBJEXT) \ + hostname-helper.$(OBJEXT) cc-hostname-entry.$(OBJEXT) \ + list-box-helper.$(OBJEXT) +am_gnome_control_center_OBJECTS = $(am__objects_2) cc-window.$(OBJEXT) gnome_control_center_OBJECTS = $(am_gnome_control_center_OBJECTS) am__DEPENDENCIES_1 = gnome_control_center_DEPENDENCIES = libshell.la $(am__DEPENDENCIES_1) \ @@ -158,6 +163,52 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(gnome_control_center_LDFLAGS) \ $(LDFLAGS) -o $@ +am__objects_3 = gnome_control_center_alt-resources.$(OBJEXT) +am__objects_4 = $(am__objects_3) \ + gnome_control_center_alt-main.$(OBJEXT) \ + gnome_control_center_alt-cc-application.$(OBJEXT) \ + gnome_control_center_alt-cc-shell-log.$(OBJEXT) \ + gnome_control_center_alt-cc-shell-category-view.$(OBJEXT) \ + gnome_control_center_alt-cc-shell-item-view.$(OBJEXT) \ + gnome_control_center_alt-cc-editable-entry.$(OBJEXT) \ + gnome_control_center_alt-cc-panel-loader.$(OBJEXT) \ + gnome_control_center_alt-cc-panel.$(OBJEXT) \ + gnome_control_center_alt-cc-shell.$(OBJEXT) \ + gnome_control_center_alt-hostname-helper.$(OBJEXT) \ + gnome_control_center_alt-cc-hostname-entry.$(OBJEXT) \ + gnome_control_center_alt-list-box-helper.$(OBJEXT) +am_gnome_control_center_alt_OBJECTS = $(am__objects_4) +gnome_control_center_alt_OBJECTS = \ + $(am_gnome_control_center_alt_OBJECTS) +am__DEPENDENCIES_2 = libshell.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(top_builddir)/libgd/libgd.la \ + $(top_builddir)/panels/common/liblanguage.la \ + $(top_builddir)/panels/common/libdevice.la \ + $(top_builddir)/panels/background/libbackground.la \ + $(top_builddir)/panels/color/libcolor.la \ + $(top_builddir)/panels/datetime/libdate_time.la \ + $(top_builddir)/panels/display/libdisplay.la \ + $(top_builddir)/panels/info/libinfo.la \ + $(top_builddir)/panels/keyboard/libkeyboard.la \ + $(top_builddir)/panels/mouse/libmouse-properties.la \ + $(top_builddir)/panels/notifications/libnotifications.la \ + $(top_builddir)/panels/online-accounts/libonline-accounts.la \ + $(top_builddir)/panels/power/libpower.la \ + $(top_builddir)/panels/privacy/libprivacy.la \ + $(top_builddir)/panels/region/libregion.la \ + $(top_builddir)/panels/search/libsearch.la \ + $(top_builddir)/panels/sharing/libsharing.la \ + $(top_builddir)/panels/sound/libsound.la \ + $(top_builddir)/panels/universal-access/libuniversal-access.la \ + $(top_builddir)/panels/user-accounts/libuser-accounts.la \ + $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) +gnome_control_center_alt_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + alt/libshell_alt.la +gnome_control_center_alt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(gnome_control_center_alt_LDFLAGS) \ + $(LDFLAGS) -o $@ am_test_hostname_OBJECTS = hostname-helper.$(OBJEXT) \ test-hostname.$(OBJEXT) test_hostname_OBJECTS = $(am_test_hostname_OBJECTS) @@ -197,10 +248,12 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(libshell_la_SOURCES) $(gnome_control_center_SOURCES) \ - $(test_hostname_SOURCES) -DIST_SOURCES = $(libshell_la_SOURCES) $(gnome_control_center_SOURCES) \ - $(test_hostname_SOURCES) +SOURCES = $(libpanel_loader_la_SOURCES) $(libshell_la_SOURCES) \ + $(gnome_control_center_SOURCES) \ + $(gnome_control_center_alt_SOURCES) $(test_hostname_SOURCES) +DIST_SOURCES = $(libpanel_loader_la_SOURCES) $(libshell_la_SOURCES) \ + $(gnome_control_center_SOURCES) \ + $(gnome_control_center_alt_SOURCES) $(test_hostname_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -272,7 +325,7 @@ DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(srcdir)/gnome-control-center.desktop.in.in \ - $(top_srcdir)/depcomp TODO + $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -406,8 +459,6 @@ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ -NM_UNSTABLE_CHECK_CFLAGS = @NM_UNSTABLE_CHECK_CFLAGS@ -NM_UNSTABLE_CHECK_LIBS = @NM_UNSTABLE_CHECK_LIBS@ NM_VPN_CONFIG_DIR = @NM_VPN_CONFIG_DIR@ NM_VPN_MODULE_DIR = @NM_VPN_MODULE_DIR@ NOTIFICATIONS_PANEL_CFLAGS = @NOTIFICATIONS_PANEL_CFLAGS@ @@ -534,30 +585,40 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = appdata +GTESTER = gtester # in $PATH for non-GLIB packages +GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages + +# initialize variables for unconditional += appending +TEST_PROGS = test-hostname +SUBDIRS = appdata alt AM_CPPFLAGS = \ -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ + -DTEST_SRCDIR=\""$(srcdir)/"\" \ + -DTEST_TOPSRCDIR=\""$(top_srcdir)/"\" \ -I$(top_srcdir) \ $(SHELL_CFLAGS) \ $(CHEESE_CFLAGS) \ $(WACOM_PANEL_CFLAGS) \ -I$(top_srcdir)/panels/common/ \ + -I$(top_srcdir)/shell/alt \ -I$(top_srcdir)/libgd -noinst_LTLIBRARIES = libshell.la + +# Because it is confusing and somewhat problematic to directly add and compile +# cc-panel-loader.o by another directory (i.e. the shell search provider), we +# have to create a library and link it there, just like libshell.la. +noinst_LTLIBRARIES = libshell.la libpanel_loader.la libshell_la_SOURCES = \ cc-shell-model.c \ cc-shell-model.h -gnome_control_center_SOURCES = \ +common_sources = \ $(BUILT_SOURCES) \ main.c \ cc-application.c \ cc-application.h \ cc-shell-log.c \ cc-shell-log.h \ - cc-window.c \ - cc-window.h \ cc-shell-category-view.c \ cc-shell-category-view.h \ cc-shell-item-view.c \ @@ -578,7 +639,23 @@ list-box-helper.c \ $(MARSHAL_FILES) +gnome_control_center_SOURCES = \ + $(common_sources) \ + cc-window.c \ + cc-window.h + +gnome_control_center_alt_SOURCES = \ + $(common_sources) + gnome_control_center_LDFLAGS = -export-dynamic +gnome_control_center_alt_LDFLAGS = -export-dynamic + +# Temporarily add the CC_ENABLE_ALT_CATEGORIES compile-time +# flag to keep the current panels working. +gnome_control_center_alt_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCC_ENABLE_ALT_CATEGORIES + gnome_control_center_LDADD = libshell.la $(SHELL_LIBS) $(CHEESE_LIBS) \ $(top_builddir)/libgd/libgd.la \ $(top_builddir)/panels/common/liblanguage.la \ @@ -602,6 +679,18 @@ $(top_builddir)/panels/user-accounts/libuser-accounts.la \ $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) +gnome_control_center_alt_LDADD = \ + $(gnome_control_center_LDADD) \ + alt/libshell_alt.la + +libpanel_loader_la_SOURCES = \ + cc-panel-loader.c \ + cc-panel-loader.h + +libpanel_loader_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DCC_PANEL_LOADER_NO_GTYPES + # Dbus service file servicefiledir = $(datadir)/dbus-1/services @@ -618,7 +707,8 @@ EXTRA_DIST = gnome-control-center.desktop.in.in \ $(servicefile_in_files) $(completion_in_files) \ gnome-control-center.gresource.xml help-overlay.ui \ - $(resource_files) list-panel.sh hostnames-test.txt + panel-list.ui window.ui $(resource_files) list-panel.sh \ + hostnames-test.txt ssids-test.txt CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA) DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c @@ -628,7 +718,7 @@ .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.decl $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -648,6 +738,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.decl $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -671,6 +762,9 @@ rm -f $${locs}; \ } +libpanel_loader.la: $(libpanel_loader_la_OBJECTS) $(libpanel_loader_la_DEPENDENCIES) $(EXTRA_libpanel_loader_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libpanel_loader_la_OBJECTS) $(libpanel_loader_la_LIBADD) $(LIBS) + libshell.la: $(libshell_la_OBJECTS) $(libshell_la_DEPENDENCIES) $(EXTRA_libshell_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libshell_la_OBJECTS) $(libshell_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -736,6 +830,10 @@ @rm -f gnome-control-center$(EXEEXT) $(AM_V_CCLD)$(gnome_control_center_LINK) $(gnome_control_center_OBJECTS) $(gnome_control_center_LDADD) $(LIBS) +gnome-control-center-alt$(EXEEXT): $(gnome_control_center_alt_OBJECTS) $(gnome_control_center_alt_DEPENDENCIES) $(EXTRA_gnome_control_center_alt_DEPENDENCIES) + @rm -f gnome-control-center-alt$(EXEEXT) + $(AM_V_CCLD)$(gnome_control_center_alt_LINK) $(gnome_control_center_alt_OBJECTS) $(gnome_control_center_alt_LDADD) $(LIBS) + test-hostname$(EXEEXT): $(test_hostname_OBJECTS) $(test_hostname_DEPENDENCIES) $(EXTRA_test_hostname_DEPENDENCIES) @rm -f test-hostname$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_hostname_OBJECTS) $(test_hostname_LDADD) $(LIBS) @@ -757,33 +855,239 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-shell-model.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-shell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-window.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-application.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-panel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-shell-log.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-cc-shell.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-hostname-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-list-box-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_control_center_alt-resources.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpanel_loader_la-cc-panel-loader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-box-helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resources.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-hostname.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libpanel_loader_la-cc-panel-loader.lo: cc-panel-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpanel_loader_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpanel_loader_la-cc-panel-loader.lo -MD -MP -MF $(DEPDIR)/libpanel_loader_la-cc-panel-loader.Tpo -c -o libpanel_loader_la-cc-panel-loader.lo `test -f 'cc-panel-loader.c' || echo '$(srcdir)/'`cc-panel-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libpanel_loader_la-cc-panel-loader.Tpo $(DEPDIR)/libpanel_loader_la-cc-panel-loader.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-panel-loader.c' object='libpanel_loader_la-cc-panel-loader.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpanel_loader_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libpanel_loader_la-cc-panel-loader.lo `test -f 'cc-panel-loader.c' || echo '$(srcdir)/'`cc-panel-loader.c + +gnome_control_center_alt-resources.o: resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-resources.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-resources.Tpo -c -o gnome_control_center_alt-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-resources.Tpo $(DEPDIR)/gnome_control_center_alt-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='resources.c' object='gnome_control_center_alt-resources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c + +gnome_control_center_alt-resources.obj: resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-resources.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-resources.Tpo -c -o gnome_control_center_alt-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-resources.Tpo $(DEPDIR)/gnome_control_center_alt-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='resources.c' object='gnome_control_center_alt-resources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi` + +gnome_control_center_alt-main.o: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-main.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-main.Tpo -c -o gnome_control_center_alt-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-main.Tpo $(DEPDIR)/gnome_control_center_alt-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_control_center_alt-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + +gnome_control_center_alt-main.obj: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-main.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-main.Tpo -c -o gnome_control_center_alt-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-main.Tpo $(DEPDIR)/gnome_control_center_alt-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='gnome_control_center_alt-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + +gnome_control_center_alt-cc-application.o: cc-application.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-application.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-application.Tpo -c -o gnome_control_center_alt-cc-application.o `test -f 'cc-application.c' || echo '$(srcdir)/'`cc-application.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-application.Tpo $(DEPDIR)/gnome_control_center_alt-cc-application.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-application.c' object='gnome_control_center_alt-cc-application.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-application.o `test -f 'cc-application.c' || echo '$(srcdir)/'`cc-application.c + +gnome_control_center_alt-cc-application.obj: cc-application.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-application.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-application.Tpo -c -o gnome_control_center_alt-cc-application.obj `if test -f 'cc-application.c'; then $(CYGPATH_W) 'cc-application.c'; else $(CYGPATH_W) '$(srcdir)/cc-application.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-application.Tpo $(DEPDIR)/gnome_control_center_alt-cc-application.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-application.c' object='gnome_control_center_alt-cc-application.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-application.obj `if test -f 'cc-application.c'; then $(CYGPATH_W) 'cc-application.c'; else $(CYGPATH_W) '$(srcdir)/cc-application.c'; fi` + +gnome_control_center_alt-cc-shell-log.o: cc-shell-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-log.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Tpo -c -o gnome_control_center_alt-cc-shell-log.o `test -f 'cc-shell-log.c' || echo '$(srcdir)/'`cc-shell-log.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-log.c' object='gnome_control_center_alt-cc-shell-log.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-log.o `test -f 'cc-shell-log.c' || echo '$(srcdir)/'`cc-shell-log.c + +gnome_control_center_alt-cc-shell-log.obj: cc-shell-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-log.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Tpo -c -o gnome_control_center_alt-cc-shell-log.obj `if test -f 'cc-shell-log.c'; then $(CYGPATH_W) 'cc-shell-log.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-log.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-log.c' object='gnome_control_center_alt-cc-shell-log.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-log.obj `if test -f 'cc-shell-log.c'; then $(CYGPATH_W) 'cc-shell-log.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-log.c'; fi` + +gnome_control_center_alt-cc-shell-category-view.o: cc-shell-category-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-category-view.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Tpo -c -o gnome_control_center_alt-cc-shell-category-view.o `test -f 'cc-shell-category-view.c' || echo '$(srcdir)/'`cc-shell-category-view.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-category-view.c' object='gnome_control_center_alt-cc-shell-category-view.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-category-view.o `test -f 'cc-shell-category-view.c' || echo '$(srcdir)/'`cc-shell-category-view.c + +gnome_control_center_alt-cc-shell-category-view.obj: cc-shell-category-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-category-view.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Tpo -c -o gnome_control_center_alt-cc-shell-category-view.obj `if test -f 'cc-shell-category-view.c'; then $(CYGPATH_W) 'cc-shell-category-view.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-category-view.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-category-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-category-view.c' object='gnome_control_center_alt-cc-shell-category-view.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-category-view.obj `if test -f 'cc-shell-category-view.c'; then $(CYGPATH_W) 'cc-shell-category-view.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-category-view.c'; fi` + +gnome_control_center_alt-cc-shell-item-view.o: cc-shell-item-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-item-view.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Tpo -c -o gnome_control_center_alt-cc-shell-item-view.o `test -f 'cc-shell-item-view.c' || echo '$(srcdir)/'`cc-shell-item-view.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-item-view.c' object='gnome_control_center_alt-cc-shell-item-view.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-item-view.o `test -f 'cc-shell-item-view.c' || echo '$(srcdir)/'`cc-shell-item-view.c + +gnome_control_center_alt-cc-shell-item-view.obj: cc-shell-item-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell-item-view.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Tpo -c -o gnome_control_center_alt-cc-shell-item-view.obj `if test -f 'cc-shell-item-view.c'; then $(CYGPATH_W) 'cc-shell-item-view.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-item-view.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell-item-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell-item-view.c' object='gnome_control_center_alt-cc-shell-item-view.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell-item-view.obj `if test -f 'cc-shell-item-view.c'; then $(CYGPATH_W) 'cc-shell-item-view.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell-item-view.c'; fi` + +gnome_control_center_alt-cc-editable-entry.o: cc-editable-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-editable-entry.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Tpo -c -o gnome_control_center_alt-cc-editable-entry.o `test -f 'cc-editable-entry.c' || echo '$(srcdir)/'`cc-editable-entry.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Tpo $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-editable-entry.c' object='gnome_control_center_alt-cc-editable-entry.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-editable-entry.o `test -f 'cc-editable-entry.c' || echo '$(srcdir)/'`cc-editable-entry.c + +gnome_control_center_alt-cc-editable-entry.obj: cc-editable-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-editable-entry.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Tpo -c -o gnome_control_center_alt-cc-editable-entry.obj `if test -f 'cc-editable-entry.c'; then $(CYGPATH_W) 'cc-editable-entry.c'; else $(CYGPATH_W) '$(srcdir)/cc-editable-entry.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Tpo $(DEPDIR)/gnome_control_center_alt-cc-editable-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-editable-entry.c' object='gnome_control_center_alt-cc-editable-entry.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-editable-entry.obj `if test -f 'cc-editable-entry.c'; then $(CYGPATH_W) 'cc-editable-entry.c'; else $(CYGPATH_W) '$(srcdir)/cc-editable-entry.c'; fi` + +gnome_control_center_alt-cc-panel-loader.o: cc-panel-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-panel-loader.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Tpo -c -o gnome_control_center_alt-cc-panel-loader.o `test -f 'cc-panel-loader.c' || echo '$(srcdir)/'`cc-panel-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Tpo $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-panel-loader.c' object='gnome_control_center_alt-cc-panel-loader.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-panel-loader.o `test -f 'cc-panel-loader.c' || echo '$(srcdir)/'`cc-panel-loader.c + +gnome_control_center_alt-cc-panel-loader.obj: cc-panel-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-panel-loader.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Tpo -c -o gnome_control_center_alt-cc-panel-loader.obj `if test -f 'cc-panel-loader.c'; then $(CYGPATH_W) 'cc-panel-loader.c'; else $(CYGPATH_W) '$(srcdir)/cc-panel-loader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Tpo $(DEPDIR)/gnome_control_center_alt-cc-panel-loader.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-panel-loader.c' object='gnome_control_center_alt-cc-panel-loader.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-panel-loader.obj `if test -f 'cc-panel-loader.c'; then $(CYGPATH_W) 'cc-panel-loader.c'; else $(CYGPATH_W) '$(srcdir)/cc-panel-loader.c'; fi` + +gnome_control_center_alt-cc-panel.o: cc-panel.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-panel.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-panel.Tpo -c -o gnome_control_center_alt-cc-panel.o `test -f 'cc-panel.c' || echo '$(srcdir)/'`cc-panel.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-panel.Tpo $(DEPDIR)/gnome_control_center_alt-cc-panel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-panel.c' object='gnome_control_center_alt-cc-panel.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-panel.o `test -f 'cc-panel.c' || echo '$(srcdir)/'`cc-panel.c + +gnome_control_center_alt-cc-panel.obj: cc-panel.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-panel.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-panel.Tpo -c -o gnome_control_center_alt-cc-panel.obj `if test -f 'cc-panel.c'; then $(CYGPATH_W) 'cc-panel.c'; else $(CYGPATH_W) '$(srcdir)/cc-panel.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-panel.Tpo $(DEPDIR)/gnome_control_center_alt-cc-panel.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-panel.c' object='gnome_control_center_alt-cc-panel.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-panel.obj `if test -f 'cc-panel.c'; then $(CYGPATH_W) 'cc-panel.c'; else $(CYGPATH_W) '$(srcdir)/cc-panel.c'; fi` + +gnome_control_center_alt-cc-shell.o: cc-shell.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell.Tpo -c -o gnome_control_center_alt-cc-shell.o `test -f 'cc-shell.c' || echo '$(srcdir)/'`cc-shell.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell.c' object='gnome_control_center_alt-cc-shell.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell.o `test -f 'cc-shell.c' || echo '$(srcdir)/'`cc-shell.c + +gnome_control_center_alt-cc-shell.obj: cc-shell.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-shell.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-shell.Tpo -c -o gnome_control_center_alt-cc-shell.obj `if test -f 'cc-shell.c'; then $(CYGPATH_W) 'cc-shell.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-shell.Tpo $(DEPDIR)/gnome_control_center_alt-cc-shell.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-shell.c' object='gnome_control_center_alt-cc-shell.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-shell.obj `if test -f 'cc-shell.c'; then $(CYGPATH_W) 'cc-shell.c'; else $(CYGPATH_W) '$(srcdir)/cc-shell.c'; fi` + +gnome_control_center_alt-hostname-helper.o: hostname-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-hostname-helper.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-hostname-helper.Tpo -c -o gnome_control_center_alt-hostname-helper.o `test -f 'hostname-helper.c' || echo '$(srcdir)/'`hostname-helper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-hostname-helper.Tpo $(DEPDIR)/gnome_control_center_alt-hostname-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hostname-helper.c' object='gnome_control_center_alt-hostname-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-hostname-helper.o `test -f 'hostname-helper.c' || echo '$(srcdir)/'`hostname-helper.c + +gnome_control_center_alt-hostname-helper.obj: hostname-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-hostname-helper.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-hostname-helper.Tpo -c -o gnome_control_center_alt-hostname-helper.obj `if test -f 'hostname-helper.c'; then $(CYGPATH_W) 'hostname-helper.c'; else $(CYGPATH_W) '$(srcdir)/hostname-helper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-hostname-helper.Tpo $(DEPDIR)/gnome_control_center_alt-hostname-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hostname-helper.c' object='gnome_control_center_alt-hostname-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-hostname-helper.obj `if test -f 'hostname-helper.c'; then $(CYGPATH_W) 'hostname-helper.c'; else $(CYGPATH_W) '$(srcdir)/hostname-helper.c'; fi` + +gnome_control_center_alt-cc-hostname-entry.o: cc-hostname-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-hostname-entry.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Tpo -c -o gnome_control_center_alt-cc-hostname-entry.o `test -f 'cc-hostname-entry.c' || echo '$(srcdir)/'`cc-hostname-entry.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Tpo $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-hostname-entry.c' object='gnome_control_center_alt-cc-hostname-entry.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-hostname-entry.o `test -f 'cc-hostname-entry.c' || echo '$(srcdir)/'`cc-hostname-entry.c + +gnome_control_center_alt-cc-hostname-entry.obj: cc-hostname-entry.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-cc-hostname-entry.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Tpo -c -o gnome_control_center_alt-cc-hostname-entry.obj `if test -f 'cc-hostname-entry.c'; then $(CYGPATH_W) 'cc-hostname-entry.c'; else $(CYGPATH_W) '$(srcdir)/cc-hostname-entry.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Tpo $(DEPDIR)/gnome_control_center_alt-cc-hostname-entry.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cc-hostname-entry.c' object='gnome_control_center_alt-cc-hostname-entry.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-cc-hostname-entry.obj `if test -f 'cc-hostname-entry.c'; then $(CYGPATH_W) 'cc-hostname-entry.c'; else $(CYGPATH_W) '$(srcdir)/cc-hostname-entry.c'; fi` + +gnome_control_center_alt-list-box-helper.o: list-box-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-list-box-helper.o -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-list-box-helper.Tpo -c -o gnome_control_center_alt-list-box-helper.o `test -f 'list-box-helper.c' || echo '$(srcdir)/'`list-box-helper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-list-box-helper.Tpo $(DEPDIR)/gnome_control_center_alt-list-box-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='list-box-helper.c' object='gnome_control_center_alt-list-box-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-list-box-helper.o `test -f 'list-box-helper.c' || echo '$(srcdir)/'`list-box-helper.c + +gnome_control_center_alt-list-box-helper.obj: list-box-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_control_center_alt-list-box-helper.obj -MD -MP -MF $(DEPDIR)/gnome_control_center_alt-list-box-helper.Tpo -c -o gnome_control_center_alt-list-box-helper.obj `if test -f 'list-box-helper.c'; then $(CYGPATH_W) 'list-box-helper.c'; else $(CYGPATH_W) '$(srcdir)/list-box-helper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_control_center_alt-list-box-helper.Tpo $(DEPDIR)/gnome_control_center_alt-list-box-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='list-box-helper.c' object='gnome_control_center_alt-list-box-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_control_center_alt_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_control_center_alt-list-box-helper.obj `if test -f 'list-box-helper.c'; then $(CYGPATH_W) 'list-box-helper.c'; else $(CYGPATH_W) '$(srcdir)/list-box-helper.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1149,6 +1453,54 @@ .PRECIOUS: Makefile +# test: run all tests in cwd and subdirs +test: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '' > $@.xml ; \ + echo '' >> $@.xml ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ + done ; \ + echo >> $@.xml ; \ + echo '' >> $@.xml ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ + } +.PHONY: test test-report perf-report full-report +# run make test as part of make check +check-local: test + all-local: check-local $(servicefile_DATA): $(servicefile_in_files) Makefile $(AM_V_GEN) sed -e 's|[@]bindir[@]|$(bindir)|' $< > $@ @@ -1157,8 +1509,6 @@ $(AM_V_GEN) mkdir -p `dirname $@` && cat $< | sed "s,@PANELS@,`$(srcdir)/list-panel.sh $(top_srcdir)`," > $@ resources.c: gnome-control-center.gresource.xml $(resource_files) $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source $< -check-local: test-hostname - $(builddir)/test-hostname $(srcdir)/hostnames-test.txt > /dev/null -include $(top_srcdir)/git.mk diff -Nru gnome-control-center-3.20.2/shell/panel-list.ui gnome-control-center-3.22.1/shell/panel-list.ui --- gnome-control-center-3.20.2/shell/panel-list.ui 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/panel-list.ui 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,209 @@ + + + + + + True + False + center + center + True + True + 18 + vertical + 6 + + + True + False + 72 + edit-find-symbolic + + + + + + True + False + No results found + + + + + + + + + True + False + Try a different search + + + + + diff -Nru gnome-control-center-3.20.2/shell/resources.c gnome-control-center-3.22.1/shell/resources.c --- gnome-control-center-3.20.2/shell/resources.c 2016-10-11 14:28:05.000000000 +0000 +++ gnome-control-center-3.22.1/shell/resources.c 2016-10-11 12:15:33.000000000 +0000 @@ -6,34 +6,787 @@ # define SECTION #endif -static const SECTION union { const guint8 data[2176]; const double alignment; void * const ptr;} gnome_control_center_resource_data = { { +static const SECTION union { const guint8 data[14192]; const double alignment; void * const ptr;} gnome_control_center_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x06, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x9a, 0x7a, 0x02, 0x79, 0x05, 0x00, 0x00, 0x00, - 0xc8, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0xd8, 0x00, 0x00, 0x00, 0x47, 0x08, 0x00, 0x00, - 0xe1, 0x1d, 0xdb, 0x65, 0x03, 0x00, 0x00, 0x00, - 0x47, 0x08, 0x00, 0x00, 0x0e, 0x00, 0x4c, 0x00, - 0x58, 0x08, 0x00, 0x00, 0x5c, 0x08, 0x00, 0x00, - 0x4b, 0x50, 0x90, 0x0b, 0x04, 0x00, 0x00, 0x00, - 0x5c, 0x08, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x60, 0x08, 0x00, 0x00, 0x64, 0x08, 0x00, 0x00, - 0xb0, 0xb7, 0x24, 0x30, 0x02, 0x00, 0x00, 0x00, - 0x64, 0x08, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0x6c, 0x08, 0x00, 0x00, 0x70, 0x08, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0xb0, 0xb7, 0x24, 0x30, 0x05, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0x08, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, + 0xe1, 0x1d, 0xdb, 0x65, 0x00, 0x00, 0x00, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x4c, 0x00, + 0x1c, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, + 0x5a, 0xf3, 0xa5, 0xd6, 0x07, 0x00, 0x00, 0x00, + 0x20, 0x01, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, + 0x30, 0x01, 0x00, 0x00, 0x4b, 0x18, 0x00, 0x00, + 0x9a, 0x7a, 0x02, 0x79, 0x07, 0x00, 0x00, 0x00, + 0x4b, 0x18, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, + 0x60, 0x18, 0x00, 0x00, 0xcf, 0x1f, 0x00, 0x00, + 0x3b, 0xcb, 0xaf, 0x06, 0x07, 0x00, 0x00, 0x00, + 0xcf, 0x1f, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, + 0xe0, 0x1f, 0x00, 0x00, 0x50, 0x37, 0x00, 0x00, + 0x4b, 0x50, 0x90, 0x0b, 0x06, 0x00, 0x00, 0x00, + 0x50, 0x37, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x54, 0x37, 0x00, 0x00, 0x58, 0x37, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0x70, 0x08, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0x74, 0x08, 0x00, 0x00, 0x78, 0x08, 0x00, 0x00, + 0x58, 0x37, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x5c, 0x37, 0x00, 0x00, 0x60, 0x37, 0x00, 0x00, 0xd6, 0x9c, 0x43, 0xf8, 0x01, 0x00, 0x00, 0x00, - 0x78, 0x08, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x7c, 0x08, 0x00, 0x00, 0x80, 0x08, 0x00, 0x00, - 0x68, 0x65, 0x6c, 0x70, 0x2d, 0x6f, 0x76, 0x65, - 0x72, 0x6c, 0x61, 0x79, 0x2e, 0x75, 0x69, 0x00, + 0x60, 0x37, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x64, 0x37, 0x00, 0x00, 0x70, 0x37, 0x00, 0x00, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x43, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x2f, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x75, + 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0b, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, + 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x33, 0x2e, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x43, 0x63, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x2d, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x37, 0x32, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x2d, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, + 0x22, 0x3e, 0x34, 0x38, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x3a, 0x3a, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x67, + 0x64, 0x6b, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x62, + 0x22, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3d, 0x22, 0x43, 0x63, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, + 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, + 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6d, 0x61, 0x70, 0x2d, 0x65, 0x76, 0x65, 0x6e, + 0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x72, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x5f, 0x6d, 0x61, 0x70, 0x5f, 0x65, + 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, + 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, + 0x22, 0x43, 0x63, 0x57, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, + 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x6d, 0x61, 0x69, 0x6e, 0x5f, + 0x68, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, + 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x69, 0x7a, 0x65, 0x2d, 0x61, 0x6c, + 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x22, 0x20, + 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, + 0x22, 0x73, 0x69, 0x64, 0x65, 0x6c, 0x69, 0x73, + 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x61, + 0x6c, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x65, 0x5f, + 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, 0x57, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x73, 0x77, + 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, + 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x42, 0x61, 0x72, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, + 0x63, 0x68, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x6d, + 0x6f, 0x64, 0x65, 0x5f, 0x65, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x64, 0x22, 0x20, 0x62, 0x69, 0x6e, + 0x64, 0x2d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x20, 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x20, + 0x62, 0x69, 0x6e, 0x64, 0x2d, 0x66, 0x6c, 0x61, + 0x67, 0x73, 0x3d, 0x22, 0x73, 0x79, 0x6e, 0x63, + 0x2d, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x7c, + 0x62, 0x69, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x22, 0x2f, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x70, 0x70, 0x5f, 0x70, 0x61, 0x69, 0x6e, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x5f, 0x63, 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, + 0x32, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x78, + 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x5f, 0x63, + 0x68, 0x61, 0x72, 0x73, 0x22, 0x3e, 0x32, 0x35, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, 0x64, + 0x69, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x64, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x69, 0x63, 0x6f, + 0x6e, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, + 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, + 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x5f, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, + 0x43, 0x63, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, + 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x6f, + 0x74, 0x69, 0x66, 0x79, 0x3a, 0x3a, 0x74, 0x65, + 0x78, 0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x75, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, + 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, + 0x43, 0x63, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, + 0x64, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x69, + 0x73, 0x74, 0x5f, 0x73, 0x63, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x2d, 0x72, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x32, 0x30, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x73, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x62, 0x61, 0x72, 0x5f, 0x70, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0x3e, 0x6e, + 0x65, 0x76, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x65, 0x77, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, + 0x74, 0x61, 0x63, 0x6b, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, + 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x22, 0x3e, 0x63, 0x72, 0x6f, + 0x73, 0x73, 0x66, 0x61, 0x64, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, + 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, + 0x75, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, + 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x6f, + 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, 0x6c, + 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, + 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, + 0x3d, 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, + 0x75, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, + 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, + 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, + 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, + 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x70, + 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x54, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, + 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x6c, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, + 0x64, 0x69, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x64, + 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, + 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, + 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x70, 0x61, 0x6e, 0x65, 0x6c, 0x5f, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x72, 0x69, + 0x67, 0x68, 0x74, 0x5f, 0x62, 0x6f, 0x78, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x6f, 0x63, 0x6b, + 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x73, 0x68, + 0x6f, 0x77, 0x5f, 0x61, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x69, + 0x7a, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x6f, 0x63, 0x6b, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, + 0x64, 0x67, 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x77, 0x69, 0x64, 0x67, + 0x65, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, + 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x68, 0x65, 0x6c, 0x70, 0x2d, + 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x79, 0x2e, + 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, @@ -271,14 +1024,763 @@ 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x43, 0x65, - 0x6e, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, - 0x03, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x67, 0x74, 0x6b, 0x2f, 0x00, 0x00, 0x00, 0x00 + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x70, + 0x61, 0x6e, 0x65, 0x6c, 0x2d, 0x6c, 0x69, 0x73, + 0x74, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0x60, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, + 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x33, 0x2e, 0x32, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x43, 0x63, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x4c, + 0x69, 0x73, 0x74, 0x22, 0x20, 0x70, 0x61, 0x72, + 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x74, 0x61, 0x63, 0x6b, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x68, 0x6f, 0x6d, 0x6f, 0x67, + 0x65, 0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 0x6e, + 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, 0x6c, + 0x69, 0x64, 0x65, 0x2d, 0x6c, 0x65, 0x66, 0x74, + 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, + 0x61, 0x69, 0x6e, 0x5f, 0x6c, 0x69, 0x73, 0x74, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, + 0x77, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, + 0x74, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, + 0x43, 0x63, 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x4c, + 0x69, 0x73, 0x74, 0x22, 0x20, 0x73, 0x77, 0x61, + 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, + 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, + 0x42, 0x6f, 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 0x76, 0x69, + 0x63, 0x65, 0x73, 0x5f, 0x72, 0x6f, 0x77, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x42, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, + 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x2d, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, + 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, + 0x6e, 0x65, 0x78, 0x74, 0x2d, 0x73, 0x79, 0x6d, + 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, + 0x78, 0x52, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, + 0x73, 0x5f, 0x72, 0x6f, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, + 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x61, 0x70, 0x70, + 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x2d, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, + 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, + 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x6e, 0x65, + 0x78, 0x74, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6d, + 0x61, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, + 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x6c, 0x69, + 0x73, 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, + 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x6f, 0x77, 0x2d, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x64, 0x22, 0x20, 0x68, + 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, + 0x72, 0x6f, 0x77, 0x5f, 0x61, 0x63, 0x74, 0x69, + 0x76, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x62, + 0x22, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3d, 0x22, 0x43, 0x63, 0x50, 0x61, 0x6e, 0x65, + 0x6c, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x20, 0x73, + 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, + 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x64, 0x65, 0x76, + 0x69, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 0x74, + 0x61, 0x69, 0x6c, 0x73, 0x5f, 0x6c, 0x69, 0x73, + 0x74, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, + 0x6f, 0x77, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, + 0x6f, 0x77, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, + 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3d, + 0x22, 0x43, 0x63, 0x50, 0x61, 0x6e, 0x65, 0x6c, + 0x4c, 0x69, 0x73, 0x74, 0x22, 0x20, 0x73, 0x77, + 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, + 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, + 0x6d, 0x65, 0x22, 0x3e, 0x64, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x69, 0x73, 0x74, 0x42, 0x6f, 0x78, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, + 0x63, 0x68, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x62, + 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, + 0x2d, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, + 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x65, 0x61, + 0x72, 0x63, 0x68, 0x5f, 0x72, 0x6f, 0x77, 0x5f, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, + 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3d, 0x22, 0x43, 0x63, + 0x50, 0x61, 0x6e, 0x65, 0x6c, 0x4c, 0x69, 0x73, + 0x74, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, + 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x5f, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, + 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x5f, + 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x37, 0x32, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x65, 0x64, + 0x69, 0x74, 0x2d, 0x66, 0x69, 0x6e, 0x64, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, + 0x69, 0x6d, 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x4e, 0x6f, 0x20, 0x72, 0x65, 0x73, 0x75, + 0x6c, 0x74, 0x73, 0x20, 0x66, 0x6f, 0x75, 0x6e, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, + 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, + 0x62, 0x6f, 0x6c, 0x64, 0x22, 0x2f, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x20, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3d, 0x22, 0x31, 0x2e, + 0x34, 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x54, 0x72, 0x79, 0x20, 0x61, 0x20, 0x64, 0x69, + 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x20, + 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x69, 0x6d, + 0x2d, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x6f, 0x72, 0x67, 0x2f, 0x00, 0x00, 0x00, 0x00, + 0x2f, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x67, 0x74, 0x6b, 0x2f, 0x03, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { gnome_control_center_resource_data.data, sizeof (gnome_control_center_resource_data.data), NULL, NULL, NULL }; diff -Nru gnome-control-center-3.20.2/shell/ssids-test.txt gnome-control-center-3.22.1/shell/ssids-test.txt --- gnome-control-center-3.20.2/shell/ssids-test.txt 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/ssids-test.txt 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,3 @@ +GNOME GNOME +0123456789abcdefghijklmnopqrstuvwxyz 0123456789abcdefghijklmnopqrstuv +レナート レナート diff -Nru gnome-control-center-3.20.2/shell/test-hostname.c gnome-control-center-3.22.1/shell/test-hostname.c --- gnome-control-center-3.20.2/shell/test-hostname.c 2016-10-11 14:13:20.000000000 +0000 +++ gnome-control-center-3.22.1/shell/test-hostname.c 2016-08-12 12:43:57.000000000 +0000 @@ -6,36 +6,25 @@ #include "hostname-helper.h" -int main (int argc, char **argv) +static void +test_hostname (void) { + char *contents; char *result; guint i; - char *contents; char **lines; - char *locale; - /* Running in some locales will - * break the tests as "ü" will be transliterated to - * "ue" in de_DE, and 'u"' in the C locale. - * - * Work around that by forcing en_US with UTF-8 in - * our tests - * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ - locale = setlocale (LC_ALL, "en_US.UTF-8"); - if (locale == NULL) { - g_debug("Missing en_US.UTF-8 locale, ignoring test."); - return 0; + if (g_file_get_contents (TEST_SRCDIR "/hostnames-test.txt", &contents, NULL, NULL) == FALSE) { + g_warning ("Failed to load '%s'", TEST_SRCDIR "/hostnames-test.txt"); + g_test_fail (); + return; } - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - if (g_file_get_contents (argv[1], &contents, NULL, NULL) == FALSE) { - g_warning ("Failed to load '%s'", argv[1]); - return 1; - } lines = g_strsplit (contents, "\n", -1); if (lines == NULL) { g_warning ("Test file is empty"); - return 1; + g_test_fail (); + return; } for (i = 0; lines[i] != NULL; i++) { @@ -50,23 +39,27 @@ items = g_strsplit (lines[i], "\t", -1); utf8 = g_locale_from_utf8 (items[0], -1, NULL, NULL, NULL); result = pretty_hostname_to_static (items[0], FALSE); - if (g_strcmp0 (result, items[2]) != 0) + if (g_strcmp0 (result, items[2]) != 0) { g_error ("Result for '%s' doesn't match '%s' (got: '%s')", utf8, items[2], result); - else + g_test_fail (); + } else { g_debug ("Result for '%s' matches '%s'", utf8, result); + } g_free (result); g_free (utf8); result = pretty_hostname_to_static (items[0], TRUE); utf8 = g_locale_from_utf8 (items[0], -1, NULL, NULL, NULL); - if (g_strcmp0 (result, items[1]) != 0) + if (g_strcmp0 (result, items[1]) != 0) { g_error ("Result for '%s' doesn't match '%s' (got: '%s')", utf8, items[1], result); - else + g_test_fail (); + } else { g_debug ("Result for '%s' matches '%s'", utf8, result); + } g_free (result); g_free (utf8); @@ -74,6 +67,70 @@ } g_strfreev (lines); + g_free (contents); +} + +static void +test_ssid (void) +{ + char *contents; + guint i; + char **lines; + + if (g_file_get_contents (TEST_SRCDIR "/ssids-test.txt", &contents, NULL, NULL) == FALSE) { + g_warning ("Failed to load '%s'", TEST_SRCDIR "/ssids-test.txt"); + g_test_fail (); + return; + } + + lines = g_strsplit (contents, "\n", -1); + if (lines == NULL) { + g_warning ("Test file is empty"); + g_test_fail (); + return; + } + + for (i = 0; lines[i] != NULL; i++) { + char *ssid; + char **items; + + if (*lines[i] == '#') + continue; + if (*lines[i] == '\0') + break; + + items = g_strsplit (lines[i], "\t", -1); + ssid = pretty_hostname_to_ssid (items[0]); + g_assert_cmpstr (ssid, ==, items[1]); + g_free (ssid); + g_strfreev (items); + } + + g_strfreev (lines); + g_free (contents); +} + +int main (int argc, char **argv) +{ + char *locale; + + /* Running in some locales will + * break the tests as "ü" will be transliterated to + * "ue" in de_DE, and 'u"' in the C locale. + * + * Work around that by forcing en_US with UTF-8 in + * our tests + * https://bugzilla.gnome.org/show_bug.cgi?id=650342 */ + locale = setlocale (LC_ALL, "en_US.UTF-8"); + if (locale == NULL) { + g_debug("Missing en_US.UTF-8 locale, ignoring test."); + return 0; + } + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/shell/hostname", test_hostname); + g_test_add_func ("/shell/ssid", test_ssid); - return 0; + return g_test_run (); } diff -Nru gnome-control-center-3.20.2/shell/window.ui gnome-control-center-3.22.1/shell/window.ui --- gnome-control-center-3.20.2/shell/window.ui 1970-01-01 00:00:00.000000000 +0000 +++ gnome-control-center-3.22.1/shell/window.ui 2016-08-12 12:43:57.000000000 +0000 @@ -0,0 +1,195 @@ + + + + + + vertical + + + + + + +